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

properly distinguish stdout from stderr with a separate pipe (tracebacks go to stderr) - issue #297

Browse Source
This commit is contained in:
Bernardo Damele 2013-01-10 00:52:44 +00:00
parent 10f1099944
commit 8093f3950d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/utils/api.py
View File

@ -14,7 +14,6 @@ import tempfile
import types import types
from subprocess import PIPE from subprocess import PIPE
from subprocess import STDOUT
from lib.controller.controller import start from lib.controller.controller import start
from lib.core.common import unArrayizeValue from lib.core.common import unArrayizeValue
@ -276,7 +275,7 @@ def scan_start(taskid):
tasks[taskid]["fdLog"] = pipes[taskid][1] tasks[taskid]["fdLog"] = pipes[taskid][1]
# Launch sqlmap engine # Launch sqlmap engine
procs[taskid] = execute("python sqlmap.py --pickled-options %s" % base64pickle(tasks[taskid]), shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=False) procs[taskid] = execute("python sqlmap.py --pickled-options %s" % base64pickle(tasks[taskid]), shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=False)
return jsonize({"success": True}) return jsonize({"success": True})
@ -291,9 +290,10 @@ def scan_output(taskid):
if taskid not in tasks: if taskid not in tasks:
abort(500, "Invalid task ID") abort(500, "Invalid task ID")
stdout = recv_some(procs[taskid], t=1, e=0) stdout = recv_some(procs[taskid], t=1, e=0, stderr=0)
stderr = recv_some(procs[taskid], t=1, e=0, stderr=1)
return jsonize({"stdout": stdout}) return jsonize({"stdout": stdout, "stderr": stderr})
@get("/scan/<taskid>/delete") @get("/scan/<taskid>/delete")
def scan_delete(taskid): def scan_delete(taskid):