added response time kb attribute

stamparm · stamparm · commit 612ee08a0b0e · 2010-12-03T13:19:34.000Z
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
@@ -734,7 +734,9 @@ def checkConnection(suppressOutput=False):
         logger.info(infoMsg)
 
     try:
+        start = time.time()
         page, _ = Request.queryPage(content=True)
+        kb.responseTime = time.time() - start
         conf.seqMatcher.set_seq1(page)
     except sqlmapConnectionException, errMsg:
         errMsg = getUnicode(errMsg)
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
@@ -265,7 +265,7 @@ def start():
 
             setupTargetEnv()
 
-            if not checkConnection(conf.forms) or not checkString() or not checkRegexp():
+            if not checkConnection(suppressOutput=conf.forms) or not checkString() or not checkRegexp():
                 continue
 
             if conf.nullConnection:
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1290,12 +1290,12 @@ def readXmlFile(xmlFile):
     xfile.close()
     return retVal
 
-def calculateDeltaSeconds(start, epsilon=0.05):
+def calculateDeltaSeconds(start, epsilon=0.1):
     """
     Returns elapsed time from start till now (including expected
     error set by epsilon parameter)
     """
-    return int(time.time() - start + epsilon)
+    return int(time.time() - start - kb.responseTime + epsilon)
 
 def initCommonOutputs():
     kb.commonOutputs = {}
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1170,6 +1170,7 @@ def __setKnowledgeBaseAttributes():
     kb.partRun         = None
     kb.proxyAuthHeader = None
     kb.queryCounter    = 0
+    kb.responseTime    = 0
     kb.resumedQueries  = {}
     kb.retriesCount    = 0
     kb.tamperFunctions = []
