another attempt to fix the stall during regression test

bdamele · bdamele · commit e48181e28d88 · 2013-02-09T12:16:56.000Z
diff --git a/extra/shutils/regressiontest.py b/extra/shutils/regressiontest.py
@@ -77,7 +77,7 @@ def main():
     if stderr:
         failure_email("Update of sqlmap failed with error:\n\n%s" % stderr)
 
-    regressionproc = subprocess.Popen("python /opt/sqlmap/sqlmap.py --live-test", shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    regressionproc = subprocess.Popen("python /opt/sqlmap/sqlmap.py --live-test", shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=False)
     stdout, stderr = regressionproc.communicate()
 
     if stderr:
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
@@ -380,7 +380,7 @@ def _runMsfCliSmbrelay(self):
         logger.info(infoMsg)
 
         logger.debug("executing local command: %s" % self._cliCmd)
-        self._msfCliProc = execute(self._cliCmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+        self._msfCliProc = execute(self._cliCmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=False)
 
     def _runMsfCli(self, exitfunc):
         self._forgeMsfCliCmd(exitfunc)
@@ -390,7 +390,7 @@ def _runMsfCli(self, exitfunc):
         logger.info(infoMsg)
 
         logger.debug("executing local command: %s" % self._cliCmd)
-        self._msfCliProc = execute(self._cliCmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+        self._msfCliProc = execute(self._cliCmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=False)
 
     def _runMsfShellcodeRemote(self):
         infoMsg = "running Metasploit Framework shellcode "
@@ -481,7 +481,7 @@ def _controlMsfCmd(self, proc, func):
                     if len(inp) > 0:
                         try:
                             send_all(proc, inp)
-                        except IOError:
+                        except (EOFError, IOError):
                             # Probably the child has exited
                             pass
                 else:
@@ -490,7 +490,7 @@ def _controlMsfCmd(self, proc, func):
                     if stdin_fd in ready_fds[0]:
                         try:
                             send_all(proc, blockingReadFromFD(stdin_fd))
-                        except IOError:
+                        except (EOFError, IOError):
                             # Probably the child has exited
                             pass
 
@@ -528,10 +528,8 @@ def _controlMsfCmd(self, proc, func):
                 elif conf.liveTest and time.time() - start_time > METASPLOIT_SESSION_TIMEOUT:
                     proc.kill()
 
-            except EOFError:
-                returncode = proc.wait()
-
-                return returncode
+            except (EOFError, IOError):
+                return proc.returncode
 
     def createMsfShellcode(self, exitfunc, format, extra, encode):
         infoMsg = "creating Metasploit Framework multi-stage shellcode "
@@ -545,7 +543,7 @@ def createMsfShellcode(self, exitfunc, format, extra, encode):
         self._forgeMsfPayloadCmd(exitfunc, format, self._shellcodeFilePath, extra)
 
         logger.debug("executing local command: %s" % self._payloadCmd)
-        process = execute(self._payloadCmd, shell=True, stdout=None, stderr=PIPE)
+        process = execute(self._payloadCmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=False)
 
         dataToStdout("\r[%s] [INFO] creation in progress " % time.strftime("%X"))
         pollProcess(process)
