slighlty better, still not optimal

This commit is contained in:
Bernardo Damele 2013-02-06 17:45:52 +00:00
parent 477c66ac4b
commit 2fa2f30d21
2 changed files with 6 additions and 5 deletions

View File

@ -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'" warnMsg += "a switch '--no-cast' and/or switch '--hex'"
singleTimeWarnMessage(warnMsg) singleTimeWarnMessage(warnMsg)
if kb.partRun:
kb.partRun = None
return extractExpectedValue(value, expected) return extractExpectedValue(value, expected)
def goStacked(expression, silent=False): def goStacked(expression, silent=False):

View File

@ -114,9 +114,10 @@ class Task(object):
self.options.taskid = taskid self.options.taskid = taskid
self.options.database = db_filepath 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.batch = True
self.options.disableColoring = True self.options.disableColoring = True
self.options.eta = False
def set_option(self, option, value): def set_option(self, option, value):
self.options[option] = value self.options[option] = value
@ -193,6 +194,9 @@ class StdDbOut(object):
if status == CONTENT_STATUS.COMPLETE and len(output) > 0: if status == CONTENT_STATUS.COMPLETE and len(output) > 0:
conf.database_cursor.execute("DELETE FROM data WHERE id=?", (output[0][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 status == CONTENT_STATUS.IN_PROGRESS:
if len(output) == 0: if len(output) == 0:
conf.database_cursor.execute("INSERT INTO data VALUES(NULL, ?, ?, ?, ?)", 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:") 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 "\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 -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) print "\t$ curl http://%s:%d/scan/:taskid/log\n" % (host, port)