possible fix for regression test stall

bdamele · bdamele · commit 138a846cf1c3 · 2013-02-09T10:50:06.000Z
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
@@ -517,9 +517,6 @@ def _controlMsfCmd(self, proc, func):
                             send_all(proc, "whoami\n" if Backend.isOs(OS.WINDOWS) else "uname -a ; id\n")
                             time.sleep(2)
 
-                        if conf.liveTest:
-                            send_all(proc, "exit\n")
-
                         initialized = True
 
                     elif time.time() - start_time > METASPLOIT_SESSION_TIMEOUT:
@@ -528,6 +525,9 @@ def _controlMsfCmd(self, proc, func):
                         errMsg += "to open a remote session"
                         raise SqlmapGenericException(errMsg)
 
+                elif conf.liveTest and time.time() - start_time > METASPLOIT_SESSION_TIMEOUT:
+                    proc.kill()
+
             except EOFError:
                 returncode = proc.wait()
 
