PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2026-01-24 23:29:05 +00:00
Code Issues Projects Releases Wiki Activity

Minor refactoring for an Issue #290

Browse Source
This commit is contained in:
stamparm
2013-02-21 14:39:22 +01:00
parent 8e49872d7c
commit 08f0670aca
5 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/controller/checks.py
View File

@@ -1059,22 +1059,24 @@ def identifyWaf():
retVal = False
for function, product, request in kb.wafFunctions:
found = False
if not request:
for function, product in kb.wafFunctions:
try:
found = function(_)
else:
pass
except Exception, ex:
errMsg = "exception occured while running "
errMsg += "WAF script for '%s' ('%s')" % (product, ex)
logger.critical(errMsg)
found = False
if found:
retVal = product
break
if retVal:
warnMsg = "WAF/IDS/IPS identified ('%s'). Please " % retVal
warnMsg += "consider usage of tamper scripts (option '--tamper')"
logger.critical(warnMsg)
errMsg = "WAF/IDS/IPS identified ('%s'). Please " % retVal
errMsg += "consider usage of tamper scripts (option '--tamper')"
logger.critical(errMsg)
else:
warnMsg = "WAF/IDS/IPS product not identified"
logger.warn(warnMsg)

2
lib/core/option.py
View File

@@ -925,7 +925,7 @@ def _setWafFunctions():
errMsg += "in WAF script '%s'" % found
raise SqlmapGenericException(errMsg)
else:
kb.wafFunctions.append((_["detect"], _.get("__product__", filename[:-3]), _.get("__request__")))
kb.wafFunctions.append((_["detect"], _.get("__product__", filename[:-3])))
def _setThreads():
if not isinstance(conf.threads, int) or conf.threads <= 0: