[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openvas-cvs
Subject:    [Openvas-commits] r22659 - in trunk/osp-servers/w3af: . ospd_w3af
From:       scm-commit () wald ! intevation ! org
Date:       2015-06-18 12:48:57
Message-ID: 20150618124857.C56069A0161A () wald ! intevation ! org
[Download RAW message or body]

Author: kroosec
Date: 2015-06-18 14:48:57 +0200 (Thu, 18 Jun 2015)
New Revision: 22659

Modified:
   trunk/osp-servers/w3af/ChangeLog
   trunk/osp-servers/w3af/ospd_w3af/wrapper.py
Log:
* ospd_w3af/wrapper.py (OSPDw3af [exec_scan]): Handle pexpect.EOF
exception too.

Modified: trunk/osp-servers/w3af/ChangeLog
===================================================================
--- trunk/osp-servers/w3af/ChangeLog	2015-06-18 11:02:56 UTC (rev 22658)
+++ trunk/osp-servers/w3af/ChangeLog	2015-06-18 12:48:57 UTC (rev 22659)
@@ -1,3 +1,8 @@
+2015-06-18  Hani Benhabiles <hani.benhabiles@greenbone.net>
+
+	* ospd_w3af/wrapper.py (OSPDw3af [exec_scan]): Handle pexpect.EOF
+	exception too.
+
 2015-06-04  Hani Benhabiles <hani.benhabiles@greenbone.net>
 
 	* ospd_w3af/wrapper.py (get_w3af_version): Cleanly close pexpect process on

Modified: trunk/osp-servers/w3af/ospd_w3af/wrapper.py
===================================================================
--- trunk/osp-servers/w3af/ospd_w3af/wrapper.py	2015-06-18 11:02:56 UTC (rev 22658)
+++ trunk/osp-servers/w3af/ospd_w3af/wrapper.py	2015-06-18 12:48:57 UTC (rev 22659)
@@ -195,6 +195,11 @@
                 os.remove(script_file)
             output.close(True)
             return
+        except pexpect.EOF:
+            errmsg = 'Couldn\'t launch w3af_console'
+            logger.debug(errmsg)
+            self.add_scan_error(scan_id, host=target, value=errmsg)
+            return
         try:
             output.close(True)
         except pexpect.ExceptionPexpect:

_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]