From f600a0b2c9b6b03c1c9f41f08068642d45e77e6a Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 2 Oct 2019 13:59:06 +0300
Subject: [PATCH 1/2] Removed unused attack technique from schema

---
 .../cc/services/attack/attack_schema.py        | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/monkey/monkey_island/cc/services/attack/attack_schema.py b/monkey/monkey_island/cc/services/attack/attack_schema.py
index c75678fdc..c107de7c5 100644
--- a/monkey/monkey_island/cc/services/attack/attack_schema.py
+++ b/monkey/monkey_island/cc/services/attack/attack_schema.py
@@ -2,24 +2,6 @@ SCHEMA = {
     "title": "ATT&CK configuration",
     "type": "object",
     "properties": {
-        "initial_access": {
-            "title": "Initial access",
-            "type": "object",
-            "properties": {
-                "T1078": {
-                    "title": "T1078 Valid accounts",
-                    "type": "bool",
-                    "value": True,
-                    "necessary": False,
-                    "description": "Mapped with T1003 Credential dumping because both techniques "
-                                   "require same credential harvesting modules. "
-                                   "Adversaries may steal the credentials of a specific user or service account using "
-                                   "Credential Access techniques or capture credentials earlier in their "
-                                   "reconnaissance process.",
-                    "depends_on": ["T1003"]
-                }
-            }
-        },
         "lateral_movement": {
             "title": "Lateral movement",
             "type": "object",

From 84830015fddb13e3abd79ad31eba2327c875be10 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 2 Oct 2019 14:00:49 +0300
Subject: [PATCH 2/2] Fixed bad is_windows_os import

---
 monkey/infection_monkey/network/network_scanner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monkey/infection_monkey/network/network_scanner.py b/monkey/infection_monkey/network/network_scanner.py
index 9452a3fb8..f0145e843 100644
--- a/monkey/infection_monkey/network/network_scanner.py
+++ b/monkey/infection_monkey/network/network_scanner.py
@@ -6,7 +6,7 @@ from infection_monkey.config import WormConfiguration
 from infection_monkey.model.victim_host_generator import VictimHostGenerator
 from infection_monkey.network.info import local_ips, get_interfaces_ranges
 from infection_monkey.network import TcpScanner, PingScanner
-from infection_monkey.utils import is_windows_os
+from infection_monkey.utils.environment import is_windows_os
 
 if is_windows_os():
     from multiprocessing.dummy import Pool