From 56e71f3120545fab794f562981efc1b67b8073e3 Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Wed, 8 Dec 2021 14:59:35 -0500
Subject: [PATCH] Agent: Remove PingScanner from fingerprinter list

The ping scanner is currently required by the monkey agent in order to
determine the OS of the victim. In the future, scanning can be reworked
to be more configurable under a variety of different scenarios. For the
moment, it's not optional.
---
 monkey/infection_monkey/example.conf                       | 1 -
 .../services/config_schema/definitions/finger_classes.py   | 7 -------
 monkey/monkey_island/cc/services/config_schema/internal.py | 1 -
 .../tests/data_for_tests/monkey_configs/flat_config.json   | 1 -
 .../monkey_configs/monkey_config_standard.json             | 1 -
 5 files changed, 11 deletions(-)

diff --git a/monkey/infection_monkey/example.conf b/monkey/infection_monkey/example.conf
index dcb3b3138..42b37ddf4 100644
--- a/monkey/infection_monkey/example.conf
+++ b/monkey/infection_monkey/example.conf
@@ -36,7 +36,6 @@
   ],
   "finger_classes": [
     "SSHFinger",
-    "PingScanner",
     "HTTPFinger",
     "SMBFinger",
     "MySQLFinger",
diff --git a/monkey/monkey_island/cc/services/config_schema/definitions/finger_classes.py b/monkey/monkey_island/cc/services/config_schema/definitions/finger_classes.py
index 6389f1b13..5daa90672 100644
--- a/monkey/monkey_island/cc/services/config_schema/definitions/finger_classes.py
+++ b/monkey/monkey_island/cc/services/config_schema/definitions/finger_classes.py
@@ -20,13 +20,6 @@ FINGER_CLASSES = {
             "info": "Figures out if SSH is running.",
             "attack_techniques": ["T1210"],
         },
-        {
-            "type": "string",
-            "enum": ["PingScanner"],
-            "title": "Ping Scanner",
-            "safe": True,
-            "info": "Tries to identify if host is alive and which OS it's running by ping scan.",
-        },
         {
             "type": "string",
             "enum": ["HTTPFinger"],
diff --git a/monkey/monkey_island/cc/services/config_schema/internal.py b/monkey/monkey_island/cc/services/config_schema/internal.py
index a145233f9..92bacf669 100644
--- a/monkey/monkey_island/cc/services/config_schema/internal.py
+++ b/monkey/monkey_island/cc/services/config_schema/internal.py
@@ -165,7 +165,6 @@ INTERNAL = {
                     "default": [
                         "SMBFinger",
                         "SSHFinger",
-                        "PingScanner",
                         "HTTPFinger",
                         "MySQLFinger",
                         "MSSQLFinger",
diff --git a/monkey/tests/data_for_tests/monkey_configs/flat_config.json b/monkey/tests/data_for_tests/monkey_configs/flat_config.json
index 8f024b9b9..8edb45a86 100644
--- a/monkey/tests/data_for_tests/monkey_configs/flat_config.json
+++ b/monkey/tests/data_for_tests/monkey_configs/flat_config.json
@@ -65,7 +65,6 @@
     "finger_classes": [
         "SMBFinger",
         "SSHFinger",
-        "PingScanner",
         "HTTPFinger",
         "MySQLFinger",
         "MSSQLFinger",
diff --git a/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json b/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json
index ba16a75ae..107f17e5c 100644
--- a/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json
+++ b/monkey/tests/data_for_tests/monkey_configs/monkey_config_standard.json
@@ -100,7 +100,6 @@
         "finger_classes": [
           "SMBFinger",
           "SSHFinger",
-          "PingScanner",
           "HTTPFinger",
           "MySQLFinger",
           "MSSQLFinger",