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

Minor display fix (in --hex mode)

Browse Source
This commit is contained in:
Miroslav Stampar 2012-10-28 12:30:21 +01:00
parent 25a5073281
commit b75c52f93c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/techniques/blind/inference.py
View File

@ -60,6 +60,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
abortedFlag = False abortedFlag = False
partialValue = u"" partialValue = u""
finalValue = None finalValue = None
retrievedLength = 0
asciiTbl = getCharset(charsetType) asciiTbl = getCharset(charsetType)
timeBasedCompare = (kb.technique in (PAYLOAD.TECHNIQUE.TIME, PAYLOAD.TECHNIQUE.STACKED)) timeBasedCompare = (kb.technique in (PAYLOAD.TECHNIQUE.TIME, PAYLOAD.TECHNIQUE.STACKED))
retVal = hashDBRetrieve(expression, checkConf=True) retVal = hashDBRetrieve(expression, checkConf=True)
@ -410,7 +411,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
if conf.verbose in (1, 2) and not showEta: if conf.verbose in (1, 2) and not showEta:
output += '_' * (min(length, conf.progressWidth) - len(output)) output += '_' * (min(length, conf.progressWidth) - len(output))
status = ' %d/%d (%d%s)' % (count, length, round(100.0*count/length), '%') status = ' %d/%d (%d%s)' % (count, length, round(100.0*count/length), '%')
output += status if count != length else " "*len(status) output += status if count != length else " " * len(status)
dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), filterControlChars(output))) dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), filterControlChars(output)))
@ -527,6 +528,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
finally: finally:
kb.prependFlag = False kb.prependFlag = False
kb.stickyLevel = None kb.stickyLevel = None
retrievedLength = len(finalValue or "")
if finalValue is not None: if finalValue is not None:
finalValue = decodeHexValue(finalValue) if conf.hexConvert else finalValue finalValue = decodeHexValue(finalValue) if conf.hexConvert else finalValue
@ -534,8 +536,8 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
elif partialValue: elif partialValue:
hashDBWrite(expression, "%s%s" % (PARTIAL_VALUE_MARKER, partialValue)) hashDBWrite(expression, "%s%s" % (PARTIAL_VALUE_MARKER, partialValue))
if conf.hexConvert: if conf.hexConvert and not abortedFlag:
infoMsg = "\r[%s] [INFO] retrieved: %s %s\n" % (time.strftime("%X"), filterControlChars(finalValue), " " * len(finalValue or "")) infoMsg = "\r[%s] [INFO] retrieved: %s %s\n" % (time.strftime("%X"), filterControlChars(finalValue), " " * retrievedLength)
dataToStdout(infoMsg) dataToStdout(infoMsg)
else: else:
if conf.verbose in (1, 2) or showEta: if conf.verbose in (1, 2) or showEta: