From 87f6db467d8cc0d6281a5fa637fca8ed2d15e835 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 8 Nov 2019 23:45:30 +0100 Subject: [PATCH] Minor patches --- lib/core/common.py | 2 +- lib/core/settings.py | 2 +- lib/request/httpshandler.py | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 8cbb8f56a..7ad0daf50 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -4504,7 +4504,7 @@ def findPageForms(content, url, raise_=False, addToTargets=False): data = data.strip("['\"]") retVal.add((url, HTTPMETHOD.POST, data, conf.cookie, None)) - if not retVal: + if not retVal and not conf.crawlDepth: errMsg = "there were no forms found at the given target URL" if raise_: raise SqlmapGenericException(errMsg) diff --git a/lib/core/settings.py b/lib/core/settings.py index 9e3404e42..736e7d1db 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.22" +VERSION = "1.3.11.23" 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/request/httpshandler.py b/lib/request/httpshandler.py index 375cf61f5..73f1fc651 100644 --- a/lib/request/httpshandler.py +++ b/lib/request/httpshandler.py @@ -27,6 +27,7 @@ except ImportError: pass _protocols = filterNone(getattr(ssl, _, None) for _ in ("PROTOCOL_TLSv1_2", "PROTOCOL_TLSv1_1", "PROTOCOL_TLSv1", "PROTOCOL_SSLv3", "PROTOCOL_SSLv23", "PROTOCOL_SSLv2")) +_lut = dict((getattr(ssl, _), _) for _ in dir(ssl) if _.startswith("PROTOCOL_")) class HTTPSConnection(_http_client.HTTPSConnection): """ @@ -66,7 +67,7 @@ class HTTPSConnection(_http_client.HTTPSConnection): sock.close() except (ssl.SSLError, socket.error, _http_client.BadStatusLine) as ex: self._tunnel_host = None - logger.debug("SSL connection error occurred ('%s')" % getSafeExString(ex)) + logger.debug("SSL connection error occurred for '%s' ('%s')" % (_lut[protocol], getSafeExString(ex))) if kb.tlsSNI.get(self.host) is None: kb.tlsSNI[self.host] = success @@ -86,7 +87,7 @@ class HTTPSConnection(_http_client.HTTPSConnection): sock.close() except (ssl.SSLError, socket.error, _http_client.BadStatusLine) as ex: self._tunnel_host = None - logger.debug("SSL connection error occurred ('%s')" % getSafeExString(ex)) + logger.debug("SSL connection error occurred for '%s' ('%s')" % (_lut[protocol], getSafeExString(ex))) if not success: errMsg = "can't establish SSL connection"