added --ratio option for direct manipulation of conf.matchRatio parameter

stamparm · stamparm · commit 057ec8a6b2ba · 2010-08-10T19:53:29.000Z
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -943,7 +943,6 @@ def __setConfAttributes():
     conf.httpHeaders      = []
     conf.hostname         = None
     conf.loggedToOut      = None
-    conf.matchRatio       = None
     conf.md5hash          = None
     conf.multipleTargets  = False
     conf.outputPath       = None
@@ -1136,6 +1135,11 @@ def __basicOptionValidation():
         errMsg = "value for --cpu-throttle (cpuThrottle) option must be in range [0,100]"
         raise sqlmapSyntaxException, errMsg
 
+    if conf.matchRatio is not None and isinstance(conf.matchRatio, float) and (conf.matchRatio > 1 or\
+      conf.cpuThrottle < 0):
+        errMsg = "value for --ratio (matchRatio) option must be in range [0,1]"
+        raise sqlmapSyntaxException, errMsg
+
 def init(inputOptions=advancedDict()):
     """
     Set attributes into both configuration and knowledge base singletons
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -187,6 +187,9 @@ def cmdLineParser():
                              help="Matches to be excluded before "
                                   "comparing page contents")
 
+        injection.add_option("--ratio", dest="matchRatio", type="float",
+                             help="Page comparison treshold value")
+
         injection.add_option("--use-between", dest="useBetween",
                              action="store_true",
                              help="Use operator BETWEEN instead of default '>'")
diff --git a/lib/request/comparison.py b/lib/request/comparison.py
@@ -79,8 +79,8 @@ def comparison(page, headers=None, getSeqMatcher=False):
             logger.debug("setting match ratio to default value 0.900")
             conf.matchRatio = 0.900
 
-        if conf.matchRatio is not None:
-            setMatchRatio()
+    if conf.matchRatio is not None:
+		setMatchRatio()
 
     # If it has been requested to return the ratio and not a comparison
     # response
