turning back on time auto-adjustment mechanism (if turned off) after a threshold run of valid chars

stamparm · stamparm · commit d335ec0c345d · 2012-05-26T07:00:26.000Z
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1512,6 +1512,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
     kb.testQueryCount = 0
     kb.threadContinue = True
     kb.threadException = False
+    kb.timeValidCharsRun = 0
     kb.uChar = NULL
     kb.xpCmdshellAvailable = False
 
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -487,3 +487,6 @@
 
 # Generic SQL comment formation
 GENERIC_SQL_COMMENT = "-- "
+
+# Threshold value for turning back on time auto-adjustment mechanism
+VALID_TIME_CHARS_RUN_THRESHOLD = 100
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -43,6 +43,7 @@
 from lib.core.settings import INFERENCE_NOT_EQUALS_CHAR
 from lib.core.settings import MAX_TIME_REVALIDATION_STEPS
 from lib.core.settings import PARTIAL_VALUE_MARKER
+from lib.core.settings import VALID_TIME_CHARS_RUN_THRESHOLD
 from lib.core.threads import getCurrentThreadData
 from lib.core.threads import runThreads
 from lib.core.unescaper import unescaper
@@ -282,13 +283,14 @@ def getChar(idx, charTbl=None, continuousOrder=True, expand=charsetType is None,
                                         errMsg = "invalid character detected. retrying.."
                                         logger.error(errMsg)
 
+                                        kb.timeValidCharsRun = 0
                                         conf.timeSec += 1
 
                                         warnMsg = "increasing time delay to %d second%s " % (conf.timeSec, 's' if conf.timeSec > 1 else '')
                                         logger.warn(warnMsg)
 
                                         if kb.adjustTimeDelay:
-                                            dbgMsg = "turning off auto-adjustment mechanism"
+                                            dbgMsg = "turning off time auto-adjustment mechanism"
                                             logger.debug(dbgMsg)
                                             kb.adjustTimeDelay = False
 
@@ -299,6 +301,13 @@ def getChar(idx, charTbl=None, continuousOrder=True, expand=charsetType is None,
                                         conf.timeSec = kb.originalTimeDelay
                                         return decodeIntToUnicode(retVal)
                                 else:
+                                    if timeBasedCompare:
+                                        kb.timeValidCharsRun += 1
+                                        if not kb.adjustTimeDelay and kb.timeValidCharsRun > VALID_TIME_CHARS_RUN_THRESHOLD:
+                                            dbgMsg = "turning on time auto-adjustment mechanism"
+                                            logger.debug(dbgMsg)
+                                            kb.adjustTimeDelay = True
+                                    
                                     return decodeIntToUnicode(retVal)
                             else:
                                 return None
