update

stamparm · stamparm · commit daf5662eabb4 · 2011-01-14T15:33:49.000Z
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
@@ -425,8 +425,11 @@ def checkSqlInjection(place, parameter, value):
                         injection.data[stype].matchRatio = kb.matchRatio
 
                         injection.conf.textOnly = conf.textOnly
-                        injection.conf.string = conf.string
-                        injection.conf.regexp = conf.regexp
+                        injection.conf.string   = conf.string
+                        injection.conf.regexp   = conf.regexp
+                        injection.conf.uCols    = conf.uCols
+                        injection.conf.uChar    = conf.uChar
+                        injection.conf.timeSec  = conf.timeSec
 
                         if hasattr(test, "details"):
                             for detailKey, detailValue in test.details.items():
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1946,20 +1946,11 @@ def initTechnique(technique=None):
             kb.matchRatio = data.matchRatio
 
             # Restoring stored conf options
-            if kb.injection.conf.textOnly:
-                conf.textOnly = True
-                debugMsg = "restoring switch --text-only"
-                logger.debug(debugMsg)
-
-            if kb.injection.conf.string:
-                conf.string = kb.injection.conf.string
-                debugMsg = "restoring option --string '%s'" % conf.string
-                logger.debug(debugMsg)
-
-            if kb.injection.conf.regexp:
-                conf.regexp = kb.injection.conf.regexp
-                debugMsg = "restoring option --regexp '%s'" % conf.regexp
-                logger.debug(debugMsg)
+            for key, value in kb.injection.conf.items():
+                if value:
+                    setattr(conf, key, value)
+                    debugMsg = "restoring configuration option '%s' (%s)" % (key, value)
+                    logger.debug(debugMsg)
         else:
             warnMsg = "there is no injection data available for technique "
             warnMsg += "'%s'" % enumValueToNameLookup(PAYLOAD.TECHNIQUE, technique)
