Removing --check-payload (PHPIDS doesn't update rules lately; also, WAF/IDS/IPS is more than just regexes (unencoding, removing junk, etc.))

stamparm · stamparm · commit 6d942f92b549 · 2013-02-01T10:03:06.000+01:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -974,7 +974,6 @@ def setPaths():
     paths.SMALL_DICT = os.path.join(paths.SQLMAP_TXT_PATH, "smalldict.txt")
     paths.USER_AGENTS = os.path.join(paths.SQLMAP_TXT_PATH, "user-agents.txt")
     paths.WORDLIST = os.path.join(paths.SQLMAP_TXT_PATH, "wordlist.zip")
-    paths.PHPIDS_RULES_XML = os.path.join(paths.SQLMAP_XML_PATH, "phpids_rules.xml")
     paths.ERRORS_XML = os.path.join(paths.SQLMAP_XML_PATH, "errors.xml")
     paths.PAYLOADS_XML = os.path.join(paths.SQLMAP_XML_PATH, "payloads.xml")
     paths.INJECTIONS_XML = os.path.join(paths.SQLMAP_XML_PATH, "injections.xml")
diff --git a/lib/core/dicts.py b/lib/core/dicts.py
@@ -205,6 +205,7 @@
 DEPRECATED_OPTIONS = {
                         "--replicate": "use '--dump-format=SQLITE' instead",
                         "--no-unescape": "use '--no-escape' instead",
+                        "--check-payload": None,
                      }
 
 DUMP_DATA_PREPROCESS = {
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
@@ -195,7 +195,6 @@
                                "alert":             "string",
                                "answers":           "string",
                                "beep":              "boolean",
-                               "checkPayload":      "boolean",
                                "checkWaf":          "boolean",
                                "cleanup":           "boolean",
                                "dependencies":      "boolean",
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -612,10 +612,6 @@ def cmdLineParser():
         miscellaneous.add_option("--beep", dest="beep", action="store_true",
                                   help="Make a beep sound when SQL injection is found")
 
-        miscellaneous.add_option("--check-payload", dest="checkPayload",
-                                  action="store_true",
-                                  help="Offline WAF/IPS/IDS payload detection testing")
-
         miscellaneous.add_option("--check-waf", dest="checkWaf",
                                   action="store_true",
                                   help="Check for existence of WAF/IPS/IDS protection")
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -79,7 +79,6 @@
 from lib.request.direct import direct
 from lib.request.comparison import comparison
 from lib.request.methodrequest import MethodRequest
-from lib.utils.checkpayload import checkPayload
 from thirdparty.socks.socks import ProxyError
 from thirdparty.multipart import multipartpost
 
@@ -658,9 +657,6 @@ def queryPage(value=None, place=None, content=False, getRatioValue=False, silent
         if place:
             value = agent.removePayloadDelimiters(value)
 
-        if conf.checkPayload:
-            checkPayload(value)
-
         if PLACE.GET in conf.parameters:
             get = conf.parameters[PLACE.GET] if place != PLACE.GET or not value else value
 
diff --git a/lib/utils/checkpayload.py b/lib/utils/checkpayload.py

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@`
`205`	`205`	`DEPRECATED_OPTIONS = {`
`206`	`206`	`"--replicate": "use '--dump-format=SQLITE' instead",`
`207`	`207`	`"--no-unescape": "use '--no-escape' instead",`
	`208`	`+ "--check-payload": None,`
`208`	`209`	`}`
`209`	`210`
`210`	`211`	`DUMP_DATA_PREPROCESS = {`