From abe31c1fbf822bd1ca93b31e832b9567504dc57e Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 7 Nov 2019 16:04:32 +0100 Subject: [PATCH] Minor update --- lib/core/settings.py | 2 +- lib/utils/crawler.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index b6729c6fc..21e722f38 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.3.11.15" +VERSION = "1.3.11.16" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) diff --git a/lib/utils/crawler.py b/lib/utils/crawler.py index 492325ca1..877040462 100644 --- a/lib/utils/crawler.py +++ b/lib/utils/crawler.py @@ -46,6 +46,7 @@ def crawl(target): visited = set() threadData = getCurrentThreadData() threadData.shared.value = OrderedSet() + threadData.shared.formsFound = False def crawlThread(): threadData = getCurrentThreadData() @@ -123,7 +124,7 @@ def crawl(target): pass finally: if conf.forms: - findPageForms(content, current, False, True) + threadData.shared.formsFound |= len(findPageForms(content, current, False, True)) > 0 if conf.verbose in (1, 2): threadData.shared.count += 1 @@ -189,8 +190,11 @@ def crawl(target): clearConsoleLine(True) if not threadData.shared.value: - warnMsg = "no usable links found (with GET parameters)" - logger.warn(warnMsg) + if not (conf.forms and threadData.shared.formsFound): + warnMsg = "no usable links found (with GET parameters)" + if conf.forms: + warnMsg += " or forms" + logger.warn(warnMsg) else: for url in threadData.shared.value: kb.targets.add((urldecode(url, kb.pageEncoding), None, None, None, None))