From e6c3cdb3611fe4d20158501e8adc48eebddee393 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Fri, 14 Jun 2019 09:09:34 +0300
Subject: [PATCH 1/3] Hook method for exploiters implemented

---
 monkey/infection_monkey/exploit/__init__.py     | 6 ++++++
 monkey/infection_monkey/exploit/hadoop.py       | 2 +-
 monkey/infection_monkey/exploit/mssqlexec.py    | 2 +-
 monkey/infection_monkey/exploit/rdpgrinder.py   | 2 +-
 monkey/infection_monkey/exploit/sambacry.py     | 2 +-
 monkey/infection_monkey/exploit/shellshock.py   | 2 +-
 monkey/infection_monkey/exploit/smbexec.py      | 2 +-
 monkey/infection_monkey/exploit/sshexec.py      | 2 +-
 monkey/infection_monkey/exploit/vsftpd.py       | 2 +-
 monkey/infection_monkey/exploit/web_rce.py      | 2 +-
 monkey/infection_monkey/exploit/win_ms08_067.py | 6 +++---
 monkey/infection_monkey/exploit/wmiexec.py      | 2 +-
 monkey/infection_monkey/monkey.py               | 2 --
 13 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/monkey/infection_monkey/exploit/__init__.py b/monkey/infection_monkey/exploit/__init__.py
index 7353d77bc..ea1909f68 100644
--- a/monkey/infection_monkey/exploit/__init__.py
+++ b/monkey/infection_monkey/exploit/__init__.py
@@ -50,6 +50,12 @@ class HostExploiter(object):
 
     @abstractmethod
     def exploit_host(self):
+        self.set_start_time()
+        self._exploit_host()
+        self.set_finish_time()
+
+    @abstractmethod
+    def _exploit_host(self):
         raise NotImplementedError()
 
     def add_vuln_url(self, url):
diff --git a/monkey/infection_monkey/exploit/hadoop.py b/monkey/infection_monkey/exploit/hadoop.py
index f02c4f3d3..43336420c 100644
--- a/monkey/infection_monkey/exploit/hadoop.py
+++ b/monkey/infection_monkey/exploit/hadoop.py
@@ -31,7 +31,7 @@ class HadoopExploiter(WebRCE):
     def __init__(self, host):
         super(HadoopExploiter, self).__init__(host)
 
-    def exploit_host(self):
+    def _exploit_host(self):
         # Try to get exploitable url
         urls = self.build_potential_urls(self.HADOOP_PORTS)
         self.add_vulnerable_urls(urls, True)
diff --git a/monkey/infection_monkey/exploit/mssqlexec.py b/monkey/infection_monkey/exploit/mssqlexec.py
index c7d29c8c2..3bfda397f 100644
--- a/monkey/infection_monkey/exploit/mssqlexec.py
+++ b/monkey/infection_monkey/exploit/mssqlexec.py
@@ -29,7 +29,7 @@ class MSSQLExploiter(HostExploiter):
     def __init__(self, host):
         super(MSSQLExploiter, self).__init__(host)
 
-    def exploit_host(self):
+    def _exploit_host(self):
         # Brute force to get connection
         username_passwords_pairs_list = self._config.get_exploit_user_password_pairs()
         cursor = self.brute_force(self.host.ip_addr, self.SQL_DEFAULT_TCP_PORT, username_passwords_pairs_list)
diff --git a/monkey/infection_monkey/exploit/rdpgrinder.py b/monkey/infection_monkey/exploit/rdpgrinder.py
index 8e219b5c8..f5b863080 100644
--- a/monkey/infection_monkey/exploit/rdpgrinder.py
+++ b/monkey/infection_monkey/exploit/rdpgrinder.py
@@ -255,7 +255,7 @@ class RdpExploiter(HostExploiter):
                 return True
         return False
 
-    def exploit_host(self):
+    def _exploit_host(self):
         global g_reactor
 
         is_open, _ = check_tcp_port(self.host.ip_addr, RDP_PORT)
diff --git a/monkey/infection_monkey/exploit/sambacry.py b/monkey/infection_monkey/exploit/sambacry.py
index 7c49f51ae..7d9ed1010 100644
--- a/monkey/infection_monkey/exploit/sambacry.py
+++ b/monkey/infection_monkey/exploit/sambacry.py
@@ -57,7 +57,7 @@ class SambaCryExploiter(HostExploiter):
     def __init__(self, host):
         super(SambaCryExploiter, self).__init__(host)
 
-    def exploit_host(self):
+    def _exploit_host(self):
         if not self.is_vulnerable():
             return False
 
diff --git a/monkey/infection_monkey/exploit/shellshock.py b/monkey/infection_monkey/exploit/shellshock.py
index 2f6e3516f..337e0ec03 100644
--- a/monkey/infection_monkey/exploit/shellshock.py
+++ b/monkey/infection_monkey/exploit/shellshock.py
@@ -36,7 +36,7 @@ class ShellShockExploiter(HostExploiter):
                    ) for _ in range(20))
         self.skip_exist = self._config.skip_exploit_if_file_exist
 
-    def exploit_host(self):
+    def _exploit_host(self):
         # start by picking ports
         candidate_services = {
             service: self.host.services[service] for service in self.host.services if
diff --git a/monkey/infection_monkey/exploit/smbexec.py b/monkey/infection_monkey/exploit/smbexec.py
index 1b4071312..d49e66ae8 100644
--- a/monkey/infection_monkey/exploit/smbexec.py
+++ b/monkey/infection_monkey/exploit/smbexec.py
@@ -43,7 +43,7 @@ class SmbExploiter(HostExploiter):
             return self.host.os.get('type') in self._TARGET_OS_TYPE
         return False
 
-    def exploit_host(self):
+    def _exploit_host(self):
         src_path = get_target_monkey(self.host)
 
         if not src_path:
diff --git a/monkey/infection_monkey/exploit/sshexec.py b/monkey/infection_monkey/exploit/sshexec.py
index 09982876d..e8b933589 100644
--- a/monkey/infection_monkey/exploit/sshexec.py
+++ b/monkey/infection_monkey/exploit/sshexec.py
@@ -94,7 +94,7 @@ class SSHExploiter(HostExploiter):
                 continue
         return exploited
 
-    def exploit_host(self):
+    def _exploit_host(self):
         ssh = paramiko.SSHClient()
         ssh.set_missing_host_key_policy(paramiko.WarningPolicy())
 
diff --git a/monkey/infection_monkey/exploit/vsftpd.py b/monkey/infection_monkey/exploit/vsftpd.py
index 3f6a7c304..d60c336ca 100644
--- a/monkey/infection_monkey/exploit/vsftpd.py
+++ b/monkey/infection_monkey/exploit/vsftpd.py
@@ -60,7 +60,7 @@ class VSFTPDExploiter(HostExploiter):
             LOG.error('Failed to send payload to %s', self.host.ip_addr)
         return False
 
-    def exploit_host(self):
+    def _exploit_host(self):
         LOG.info("Attempting to trigger the Backdoor..")
         ftp_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
diff --git a/monkey/infection_monkey/exploit/web_rce.py b/monkey/infection_monkey/exploit/web_rce.py
index 2b08575c3..529af2209 100644
--- a/monkey/infection_monkey/exploit/web_rce.py
+++ b/monkey/infection_monkey/exploit/web_rce.py
@@ -66,7 +66,7 @@ class WebRCE(HostExploiter):
 
         return exploit_config
 
-    def exploit_host(self):
+    def _exploit_host(self):
         """
         Method that contains default exploitation workflow
         :return: True if exploited, False otherwise
diff --git a/monkey/infection_monkey/exploit/win_ms08_067.py b/monkey/infection_monkey/exploit/win_ms08_067.py
index 41b3820d5..557b43970 100644
--- a/monkey/infection_monkey/exploit/win_ms08_067.py
+++ b/monkey/infection_monkey/exploit/win_ms08_067.py
@@ -92,7 +92,7 @@ class SRVSVC_Exploit(object):
 
     def get_telnet_port(self):
         """get_telnet_port()
-        
+
         The port on which the Telnet service will listen.
         """
 
@@ -100,7 +100,7 @@ class SRVSVC_Exploit(object):
 
     def start(self):
         """start() -> socket
-        
+
         Exploit the target machine and return a socket connected to it's
         listening Telnet service.
         """
@@ -174,7 +174,7 @@ class Ms08_067_Exploiter(HostExploiter):
                            self.host.os.get('version') in self._windows_versions.keys()
         return False
 
-    def exploit_host(self):
+    def _exploit_host(self):
         src_path = get_target_monkey(self.host)
 
         if not src_path:
diff --git a/monkey/infection_monkey/exploit/wmiexec.py b/monkey/infection_monkey/exploit/wmiexec.py
index 29bc08981..feff1df70 100644
--- a/monkey/infection_monkey/exploit/wmiexec.py
+++ b/monkey/infection_monkey/exploit/wmiexec.py
@@ -23,7 +23,7 @@ class WmiExploiter(HostExploiter):
         super(WmiExploiter, self).__init__(host)
 
     @WmiTools.dcom_wrap
-    def exploit_host(self):
+    def _exploit_host(self):
         src_path = get_target_monkey(self.host)
 
         if not src_path:
diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py
index b152e58be..ff35be3d9 100644
--- a/monkey/infection_monkey/monkey.py
+++ b/monkey/infection_monkey/monkey.py
@@ -283,9 +283,7 @@ class InfectionMonkey(object):
 
         result = False
         try:
-            exploiter.set_start_time()
             result = exploiter.exploit_host()
-            exploiter.set_finish_time()
             if result:
                 self.successfully_exploited(machine, exploiter)
                 return True

From 09c62b7ccfd87d80953143e3b29416d3c295e2f9 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Fri, 14 Jun 2019 10:17:16 +0300
Subject: [PATCH 2/3] minor bugfix

---
 monkey/infection_monkey/exploit/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/monkey/infection_monkey/exploit/__init__.py b/monkey/infection_monkey/exploit/__init__.py
index ea1909f68..661433b97 100644
--- a/monkey/infection_monkey/exploit/__init__.py
+++ b/monkey/infection_monkey/exploit/__init__.py
@@ -48,7 +48,6 @@ class HostExploiter(object):
         self._exploit_attempts.append({'result': result, 'user': user, 'password': password,
                                        'lm_hash': lm_hash, 'ntlm_hash': ntlm_hash, 'ssh_key': ssh_key})
 
-    @abstractmethod
     def exploit_host(self):
         self.set_start_time()
         self._exploit_host()

From eded13f610f39b4248bf576f2004ae9de0dda873 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Wed, 19 Jun 2019 10:38:59 +0300
Subject: [PATCH 3/3] Refactored HostExploiter to have pre_exploit and
 post_exploit methods

---
 monkey/infection_monkey/exploit/__init__.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/monkey/infection_monkey/exploit/__init__.py b/monkey/infection_monkey/exploit/__init__.py
index 661433b97..126b3f579 100644
--- a/monkey/infection_monkey/exploit/__init__.py
+++ b/monkey/infection_monkey/exploit/__init__.py
@@ -49,8 +49,14 @@ class HostExploiter(object):
                                        'lm_hash': lm_hash, 'ntlm_hash': ntlm_hash, 'ssh_key': ssh_key})
 
     def exploit_host(self):
-        self.set_start_time()
+        self.pre_exploit()
         self._exploit_host()
+        self.post_exploit()
+
+    def pre_exploit(self):
+        self.set_start_time()
+
+    def post_exploit(self):
         self.set_finish_time()
 
     @abstractmethod