sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 17:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix for an Issue #591

Browse Source
This commit is contained in:
Miroslav Stampar 2014-01-02 10:55:40 +01:00
parent 854a55166c
commit 0b4fcb6845
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/utils/api.py
View File

@ -187,8 +187,11 @@ class Task(object):
return None return None
def engine_get_returncode(self): def engine_get_returncode(self):
if self.process:
self.process.poll() self.process.poll()
return self.process.returncode return self.process.returncode
else:
return None
def engine_has_terminated(self): def engine_has_terminated(self):
return isinstance(self.engine_get_returncode(), int) return isinstance(self.engine_get_returncode(), int)
@ -510,6 +513,9 @@ def scan_status(taskid):
logger.warning("[%s] Invalid task ID provided to scan_status()" % taskid) logger.warning("[%s] Invalid task ID provided to scan_status()" % taskid)
return jsonize({"success": False, "message": "Invalid task ID"}) return jsonize({"success": False, "message": "Invalid task ID"})
if DataStore.tasks[taskid].engine_get_returncode() is None:
status = "not running"
else:
status = "terminated" if DataStore.tasks[taskid].engine_has_terminated() is True else "running" status = "terminated" if DataStore.tasks[taskid].engine_has_terminated() is True else "running"
logger.debug("[%s] Retrieved scan status" % taskid) logger.debug("[%s] Retrieved scan status" % taskid)