slighlty better, still not optimal

bdamele · bdamele · commit 2fa2f30d2170 · 2013-02-06T17:45:52.000Z
diff --git a/lib/request/inject.py b/lib/request/inject.py
@@ -413,9 +413,6 @@ def getValue(expression, blind=True, union=True, error=True, time=True, fromUser
         warnMsg += "a switch '--no-cast' and/or switch '--hex'"
         singleTimeWarnMessage(warnMsg)
 
-    if kb.partRun:
-        kb.partRun = None
-
     return extractExpectedValue(value, expected)
 
 def goStacked(expression, silent=False):
diff --git a/lib/utils/api.py b/lib/utils/api.py
@@ -114,9 +114,10 @@ def initialize_options(self, taskid):
         self.options.taskid = taskid
         self.options.database = db_filepath
 
-        # Enforce batch mode and disable coloring
+        # Enforce batch mode and disable coloring and ETA
         self.options.batch = True
         self.options.disableColoring = True
+        self.options.eta = False
 
     def set_option(self, option, value):
         self.options[option] = value
@@ -193,6 +194,9 @@ def write(self, value, status=CONTENT_STATUS.IN_PROGRESS, content_type=None):
             if status == CONTENT_STATUS.COMPLETE and len(output) > 0:
                 conf.database_cursor.execute("DELETE FROM data WHERE id=?", (output[0][0],))
 
+                if kb.partRun:
+                    kb.partRun = None
+
             if status == CONTENT_STATUS.IN_PROGRESS:
                 if len(output) == 0:
                     conf.database_cursor.execute("INSERT INTO data VALUES(NULL, ?, ?, ?, ?)",
@@ -587,5 +591,5 @@ def client(host=RESTAPI_SERVER_HOST, port=RESTAPI_SERVER_PORT):
     logger.error("Not yet implemented, use curl from command line instead for now, for example:")
     print "\n\t$ curl http://%s:%d/task/new" % (host, port)
     print "\t$ curl -H \"Content-Type: application/json\" -X POST -d '{\"url\": \"http://testphp.vulnweb.com/artists.php?artist=1\"}' http://%s:%d/scan/:taskid/start" % (host, port)
-    print "\t$ curl http://%s:%d/scan/:taskid/output" % (host, port)
+    print "\t$ curl http://%s:%d/scan/:taskid/data" % (host, port)
     print "\t$ curl http://%s:%d/scan/:taskid/log\n" % (host, port)
