sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-07-31 18:39:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 105cd225b3 into 0d539a876d

Browse Source
This commit is contained in:
GitHub Merge Button 2012-07-08 05:11:09 -07:00
commit 934e5212f4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/update.py
View File

@ -42,7 +42,7 @@ def update():
logger.debug(debugMsg) logger.debug(debugMsg)
dataToStdout("\r[%s] [INFO] update in progress " % time.strftime("%X")) 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) pollProcess(process, True)
stdout, stderr = process.communicate() stdout, stderr = process.communicate()
success = not process.returncode success = not process.returncode

5
lib/techniques/error/use.py
View File

@ -177,7 +177,10 @@ def __errorFields(expression, expressionFields, expressionFieldsList, expected=N
if kb.fileReadMode and output and output.strip(): if kb.fileReadMode and output and output.strip():
print print
elif output is not None and not (threadData.resumed and kb.suppressResumeInfo): 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))) 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): if isinstance(num, int):
expression = origExpr expression = origExpr

2
lib/techniques/union/use.py
View File

@ -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) 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): 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: if len(status) > width:
status = "%s..." % status[:width - 3] status = "%s..." % status[:width - 3]