From 29ee760021e31e41b383ce4c107a2eb90d5c17ef Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Sun, 17 Apr 2011 07:24:18 +0000 Subject: [PATCH] improving time based data retrieval mechanism --- lib/core/common.py | 3 ++- lib/techniques/blind/inference.py | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index d8dc54958..da20d5715 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1846,7 +1846,8 @@ def adjustTimeDelay(lastQueryDuration, lowerStdLimit): if all([x == candidate for x in kb.delayCandidates]) and candidate < conf.timeSec: print - warnMsg = "adjusting time delay to %d second%s" % (candidate, 's' if candidate > 1 else '') + warnMsg = "adjusting time delay to %d second%s " % (candidate, 's' if candidate > 1 else '') + warnMsg += "(due to good response times)" logger.warn(warnMsg) conf.timeSec = candidate diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py index c87ba8914..c382787b2 100644 --- a/lib/techniques/blind/inference.py +++ b/lib/techniques/blind/inference.py @@ -250,9 +250,14 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None logger.error(errMsg) conf.timeSec += 1 - warnMsg = "adjusting time delay to %d seconds" % conf.timeSec + warnMsg = "increasing time delay to %d second%s " % (conf.timeSec, 's' if conf.timeSec > 1 else '') + warnMsg += "(due to invalid char)" logger.warn(warnMsg) + if kb.adjustTimeDelay: + dbgMsg = "turning off auto-adjustment mechanism" + logger.debug(dbgMsg) + kb.adjustTimeDelay = False return getChar(idx, originalTbl, continuousOrder, expand) else: return decodeIntToUnicode(retVal)