From 664a4a3e5801c123e2e2c775beb881a8d87813d3 Mon Sep 17 00:00:00 2001 From: aNiceGuy Date: Sun, 8 Jul 2012 00:08:50 +0100 Subject: [PATCH 1/3] Fix for Issue #72 --- lib/techniques/error/use.py | 2 +- lib/techniques/union/use.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py index 93863c813..0beb7d68d 100644 --- a/lib/techniques/error/use.py +++ b/lib/techniques/error/use.py @@ -177,7 +177,7 @@ def __errorFields(expression, expressionFields, expressionFieldsList, expected=N if kb.fileReadMode and output and output.strip(): print elif output is not None and not (threadData.resumed and kb.suppressResumeInfo): - dataToStdout("[%s] [INFO] %s: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(output))) + dataToStdout("[%s] [INFO] %s #%d: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", num+1, safecharencode(output))) if isinstance(num, int): expression = origExpr diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py index ddc85bf17..f3a9227c5 100644 --- a/lib/techniques/union/use.py +++ b/lib/techniques/union/use.py @@ -317,7 +317,7 @@ def unionUse(expression, unpack=True, dump=False): items = output.replace(kb.chars.start, "").replace(kb.chars.stop, "").split(kb.chars.delimiter) if conf.verbose == 1 and not (threadData.resumed and kb.suppressResumeInfo): - status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join("\"%s\"" % _ for _ in flattenValue(arrayizeValue(items))))) + status = "[%s] [INFO] %s #%d: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", num+1, safecharencode(",".join("\"%s\"" % _ for _ in flattenValue(arrayizeValue(items))))) if len(status) > width: status = "%s..." % status[:width - 3] From 28f16fe07a53d239aa0bb30384c4fb0208a55367 Mon Sep 17 00:00:00 2001 From: aNiceGuy Date: Sun, 8 Jul 2012 00:10:36 +0100 Subject: [PATCH 2/3] fix for --update --- lib/core/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core/update.py b/lib/core/update.py index 2e8ba7ad3..701a83fc2 100644 --- a/lib/core/update.py +++ b/lib/core/update.py @@ -42,7 +42,7 @@ def update(): logger.debug(debugMsg) dataToStdout("\r[%s] [INFO] update in progress " % time.strftime("%X")) - process = execute("git pull %s" % rootDir, shell=True, stdout=PIPE, stderr=PIPE) + process = execute("git pull git://github.com/sqlmapproject/sqlmap.git HEAD", shell=True, stdout=PIPE, stderr=PIPE) pollProcess(process, True) stdout, stderr = process.communicate() success = not process.returncode From 105cd225b3f4d312d1a7e02960b3ad2623739b60 Mon Sep 17 00:00:00 2001 From: aNiceGuy Date: Sun, 8 Jul 2012 13:15:10 +0100 Subject: [PATCH 3/3] Improvement for Issue #71: exception when in fileReadMode --- lib/techniques/error/use.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py index 0beb7d68d..7f7f3b59b 100644 --- a/lib/techniques/error/use.py +++ b/lib/techniques/error/use.py @@ -177,7 +177,10 @@ def __errorFields(expression, expressionFields, expressionFieldsList, expected=N if kb.fileReadMode and output and output.strip(): print elif output is not None and not (threadData.resumed and kb.suppressResumeInfo): - dataToStdout("[%s] [INFO] %s #%d: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", num+1, safecharencode(output))) + if kb.fileReadMode == False: + dataToStdout("[%s] [INFO] %s: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(output))) + else: + dataToStdout("[%s] [INFO] %s #%d: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", num+1, safecharencode(output))) if isinstance(num, int): expression = origExpr