diff --git a/lib/controller/checks.py b/lib/controller/checks.py index a9a41dfe4..467d294fa 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -1300,7 +1300,7 @@ def identifyWaf(): if output and output[0] not in ("Y", "y"): raise SqlmapUserQuitException else: - warnMsg = "WAF/IDS/IPS product hasn't been identified (generic protection response)" + warnMsg = "WAF/IDS/IPS product hasn't been identified" logger.warn(warnMsg) kb.testType = None diff --git a/lib/core/settings.py b/lib/core/settings.py index 05ae5bfda..bb96ceb10 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import OS from lib.core.revision import getRevisionNumber # sqlmap version (...) -VERSION = "1.0.5.73" +VERSION = "1.0.5.74" REVISION = getRevisionNumber() STABLE = VERSION.count('.') <= 2 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev") diff --git a/waf/incapsula.py b/waf/incapsula.py index 51aa320c6..5c146eebc 100644 --- a/waf/incapsula.py +++ b/waf/incapsula.py @@ -16,9 +16,10 @@ def detect(get_page): retval = False for vector in WAF_ATTACK_VECTORS: - _, headers, _ = get_page(get=vector) + page, headers, _ = get_page(get=vector) retval = re.search(r"incap_ses|visid_incap", headers.get(HTTP_HEADER.SET_COOKIE, ""), re.I) is not None retval |= re.search(r"Incapsula", headers.get("X-CDN", ""), re.I) is not None + retval |= "Incapsula incident ID" in (page or "") if retval: break diff --git a/waf/sitelock.py b/waf/sitelock.py new file mode 100644 index 000000000..2deab747c --- /dev/null +++ b/waf/sitelock.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python + +""" +Copyright (c) 2006-2016 sqlmap developers (http://sqlmap.org/) +See the file 'doc/COPYING' for copying permission +""" + +from lib.core.settings import WAF_ATTACK_VECTORS + +__product__ = "TrueShield Web Application Firewall (SiteLock)" + +def detect(get_page): + retval = False + + for vector in WAF_ATTACK_VECTORS: + page, _, _ = get_page(get=vector) + retval = "SiteLock Incident ID" in (page or "") + if retval: + break + + return retval