PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-06 12:41:30 +00:00
Code Issues Projects Releases Wiki Activity

Update for an Issue #189 (code refactoring of ProgressBar so it could be ready for usage in non-inference cases out of box)

Browse Source
This commit is contained in:
stamparm
2013-05-09 15:52:18 +02:00
parent fc57b7565d
commit 9fe5a8832f
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
if showEta:
progress = ProgressBar(maxValue=length)
progressTime = []
if timeBasedCompare and conf.threads > 1:
warnMsg = "multi-threading is considered unsafe in time-based data retrieval. Going to switch it off automatically"
@@ -354,18 +353,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
return None
def etaProgressUpdate(charTime, index):
if len(progressTime) <= ((length * 3) / 100):
eta = 0
else:
midTime = sum(progressTime) / len(progressTime)
midTimeWithLatest = (midTime + charTime) / 2
eta = midTimeWithLatest * (length - index) / conf.threads
progressTime.append(charTime)
progress.update(index)
progress.draw(eta)
# Go multi-threading (--threads > 1)
if conf.threads > 1 and isinstance(length, int) and length > 1:
threadData = getCurrentThreadData()
@@ -404,7 +391,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
if kb.threadContinue:
if showEta:
etaProgressUpdate(time.time() - charStart, threadData.shared.index[0])
progress.progress(time.time() - charStart, threadData.shared.index[0], numThreads)
elif conf.verbose >= 1:
startCharIndex = 0
endCharIndex = 0
@@ -496,7 +483,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
# Did we have luck?
if result:
if showEta:
etaProgressUpdate(time.time() - charStart, len(commonValue))
progress.progress(time.time() - charStart, len(commonValue))
elif conf.verbose in (1, 2) or hasattr(conf, "api"):
dataToStdout(filterControlChars(commonValue[index - 1:]))
@@ -546,7 +533,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
partialValue += val
if showEta:
etaProgressUpdate(time.time() - charStart, index)
progress.progress(time.time() - charStart, index)
elif conf.verbose in (1, 2) or hasattr(conf, "api"):
dataToStdout(filterControlChars(val))
@@ -578,7 +565,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
infoMsg = "\r[%s] [INFO] retrieved: %s %s\n" % (time.strftime("%X"), filterControlChars(finalValue), " " * retrievedLength)
dataToStdout(infoMsg)
else:
if conf.verbose in (1, 2) or showEta and not hasattr(conf, "api"):
if conf.verbose in (1, 2) and not showEta and not hasattr(conf, "api"):
dataToStdout("\n")
if (conf.verbose in (1, 2) and showEta) or conf.verbose >= 3: