Minor update

This commit is contained in:
Miroslav Stampar 2019-11-07 16:04:32 +01:00
parent 8ec0c7a691
commit abe31c1fbf
2 changed files with 8 additions and 4 deletions

View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty.six import unichr as _unichr from thirdparty.six import unichr as _unichr
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.11.15" VERSION = "1.3.11.16"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} 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) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

View File

@ -46,6 +46,7 @@ def crawl(target):
visited = set() visited = set()
threadData = getCurrentThreadData() threadData = getCurrentThreadData()
threadData.shared.value = OrderedSet() threadData.shared.value = OrderedSet()
threadData.shared.formsFound = False
def crawlThread(): def crawlThread():
threadData = getCurrentThreadData() threadData = getCurrentThreadData()
@ -123,7 +124,7 @@ def crawl(target):
pass pass
finally: finally:
if conf.forms: if conf.forms:
findPageForms(content, current, False, True) threadData.shared.formsFound |= len(findPageForms(content, current, False, True)) > 0
if conf.verbose in (1, 2): if conf.verbose in (1, 2):
threadData.shared.count += 1 threadData.shared.count += 1
@ -189,7 +190,10 @@ def crawl(target):
clearConsoleLine(True) clearConsoleLine(True)
if not threadData.shared.value: if not threadData.shared.value:
if not (conf.forms and threadData.shared.formsFound):
warnMsg = "no usable links found (with GET parameters)" warnMsg = "no usable links found (with GET parameters)"
if conf.forms:
warnMsg += " or forms"
logger.warn(warnMsg) logger.warn(warnMsg)
else: else:
for url in threadData.shared.value: for url in threadData.shared.value: