sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-02 20:54:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update for #1414

Browse Source
This commit is contained in:
Miroslav Stampar 2015-09-17 16:18:58 +02:00
parent 7cfa90830d
commit aa2112b360
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/utils/api.py
View File

@ -661,7 +661,7 @@ def server(host="0.0.0.0", port=RESTAPI_SERVER_PORT):
def _client(url, options=None): def _client(url, options=None):
logger.debug("Calling " + url) logger.debug("Calling %s" % url)
try: try:
data = None data = None
if options is not None: if options is not None:
@ -671,7 +671,7 @@ def _client(url, options=None):
text = response.read() text = response.read()
except: except:
if options: if options:
logger.error("Failed to load and parse " + url) logger.error("Failed to load and parse %s" % url)
raise raise
return text return text
@ -707,10 +707,10 @@ def client(host=RESTAPI_SERVER_HOST, port=RESTAPI_SERVER_PORT):
if not taskid: if not taskid:
logger.error("No task ID in use") logger.error("No task ID in use")
continue continue
raw = _client(addr + "/scan/" + taskid + "/" + command) raw = _client("%s/scan/%s/%s" % (addr, taskid, command))
res = dejsonize(raw) res = dejsonize(raw)
if not res["success"]: if not res["success"]:
logger.error("Failed to execute command " + command) logger.error("Failed to execute command %s" % command)
dataToStdout("%s\n" % raw) dataToStdout("%s\n" % raw)
elif command.startswith("new"): elif command.startswith("new"):
@ -730,7 +730,7 @@ def client(host=RESTAPI_SERVER_HOST, port=RESTAPI_SERVER_PORT):
if cmdLineOptions[key] is None: if cmdLineOptions[key] is None:
del cmdLineOptions[key] del cmdLineOptions[key]
raw = _client(addr + "/task/new") raw = _client("%s/task/new" % addr)
res = dejsonize(raw) res = dejsonize(raw)
if not res["success"]: if not res["success"]:
logger.error("Failed to create new task") logger.error("Failed to create new task")
@ -738,7 +738,7 @@ def client(host=RESTAPI_SERVER_HOST, port=RESTAPI_SERVER_PORT):
taskid = res["taskid"] taskid = res["taskid"]
logger.info("New task ID is '%s'" % taskid) logger.info("New task ID is '%s'" % taskid)
raw = _client(addr + "/scan/" + taskid + "/start", cmdLineOptions) raw = _client("%s/scan/%s/start" % (addr, taskid), cmdLineOptions)
res = dejsonize(raw) res = dejsonize(raw)
if not res["success"]: if not res["success"]:
logger.error("Failed to start scan") logger.error("Failed to start scan")
@ -758,10 +758,12 @@ def client(host=RESTAPI_SERVER_HOST, port=RESTAPI_SERVER_PORT):
logger.info("Switching to task ID '%s' " % taskid) logger.info("Switching to task ID '%s' " % taskid)
elif command in ("list", "flush"): elif command in ("list", "flush"):
raw = _client(addr + "/admin/0/" + command) raw = _client("%s/admin/%s/%s" % (addr, taskid or 0, command))
res = dejsonize(raw) res = dejsonize(raw)
if not res["success"]: if not res["success"]:
logger.error("Failed to execute command " + command) logger.error("Failed to execute command %s" % command)
elif command == "flush":
taskid = None
dataToStdout("%s\n" % raw) dataToStdout("%s\n" % raw)
elif command in ("exit", "bye", "quit", 'q'): elif command in ("exit", "bye", "quit", 'q'):