From b039c35f2b578f7cbe43ad1141f45131a4588c02 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 18 Dec 2020 12:38:15 +0100 Subject: [PATCH] Fixes #4479 --- lib/core/settings.py | 2 +- lib/request/httpshandler.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index e0b26bf59..0842b17d2 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.4.12.29" +VERSION = "1.4.12.30" 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 03e3c3c27..10f3e7892 100644 --- a/lib/request/httpshandler.py +++ b/lib/request/httpshandler.py @@ -61,7 +61,7 @@ class HTTPSConnection(_http_client.HTTPSConnection): # Reference(s): https://docs.python.org/2/library/ssl.html#ssl.SSLContext # https://www.mnot.net/blog/2014/12/27/python_2_and_tls_sni - if re.search(r"\A[\d.]+\Z", self.host) is None and kb.tlsSNI.get(self.host) is not False and hasattr(ssl, "SSLContext"): + if re.search(r"\A[\d.]+\Z", conf.hostname) is None and kb.tlsSNI.get(conf.hostname) is not False and hasattr(ssl, "SSLContext"): for protocol in (_ for _ in _protocols if _ >= ssl.PROTOCOL_TLSv1): try: sock = create_sock() @@ -73,7 +73,7 @@ class HTTPSConnection(_http_client.HTTPSConnection): _contexts[protocol].set_ciphers("DEFAULT@SECLEVEL=1") except ssl.SSLError: pass - result = _contexts[protocol].wrap_socket(sock, do_handshake_on_connect=True, server_hostname=self.host) + result = _contexts[protocol].wrap_socket(sock, do_handshake_on_connect=True, server_hostname=conf.hostname) if result: success = True self.sock = result @@ -86,8 +86,8 @@ class HTTPSConnection(_http_client.HTTPSConnection): self._tunnel_host = None 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 + if kb.tlsSNI.get(conf.hostname) is None: + kb.tlsSNI[conf.hostname] = success if not success: for protocol in _protocols: