minor improvement for --tamper (now standard tamper scripts can be used like --tamper=randomcase)

stamparm · stamparm · commit 9832fc42d4eb · 2011-05-18T21:47:40.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -902,6 +902,7 @@ def setPaths():
     # sqlmap paths
     paths.SQLMAP_EXTRAS_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "extra")
     paths.SQLMAP_SHELL_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "shell")
+    paths.SQLMAP_TAMPER_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "tamper")
     paths.SQLMAP_TXT_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "txt")
     paths.SQLMAP_UDF_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "udf")
     paths.SQLMAP_XML_PATH = os.path.join(paths.SQLMAP_ROOT_PATH, "xml")
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -721,14 +721,17 @@ def __setTamperingFunctions():
         resolve_priorities = False
         priorities = []
 
-        for tfile in conf.tamper.split(','):
+        for tfile in re.split(r'[,|;]', conf.tamper):
             found = False
 
             tfile = tfile.strip()
 
             if not tfile:
                 continue
 
+            elif os.path.exists(os.path.join(paths.SQLMAP_TAMPER_PATH, tfile if tfile.endswith('.py') else "%s.py" % tfile)):
+                tfile = os.path.join(paths.SQLMAP_TAMPER_PATH, tfile if tfile.endswith('.py') else "%s.py" % tfile)
+
             elif not os.path.exists(tfile):
                 errMsg = "tamper script '%s' does not exist" % tfile
                 raise sqlmapFilePathException, errMsg
