From 45fb5ab4a57d77b0c598a08d80dc2c299faa9d25 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 28 Mar 2018 15:13:33 +0200
Subject: [PATCH] Patch for cases when http: is immediatelly being redirected
 to https:

---
 lib/controller/checks.py | 10 ++++++++++
 lib/core/settings.py     |  2 +-
 txt/checksum.md5         |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index 06a395bca..adaff389e 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -1539,6 +1539,16 @@ def checkConnection(suppressOutput=False):
         else:
             kb.errorIsNone = True
 
+
+        threadData = getCurrentThreadData()
+
+        if kb.redirectChoice == REDIRECTION.YES and threadData.lastRedirectURL and threadData.lastRedirectURL[0] == threadData.lastRequestUID:
+            if conf.hostname in threadData.lastRedirectURL[1] and threadData.lastRedirectURL[1].startswith("https://"):
+                conf.url = re.sub(r"https?://", "https://", conf.url)
+                match = re.search(r":(\d+)", threadData.lastRedirectURL[1])
+                port = match.group(1) if match else 443
+                conf.url = re.sub(r":\d+/", ":%s/" % port, conf.url)
+
     except SqlmapConnectionException, ex:
         if conf.ipv6:
             warnMsg = "check connection to a provided "
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 0ff4f01f6..467cfde3b 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.2.3.44"
+VERSION = "1.2.3.45"
 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/txt/checksum.md5 b/txt/checksum.md5
index 9534c76a4..1aeffc85e 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -21,7 +21,7 @@ c88d66597f4aab719bde4542b0a1a6e0  extra/shutils/regressiontest.py
 1e5532ede194ac9c083891c2f02bca93  extra/sqlharvest/__init__.py
 b3e60ea4e18a65c48515d04aab28ff68  extra/sqlharvest/sqlharvest.py
 0f581182871148b0456a691ae85b04c0  lib/controller/action.py
-6f0db0b505eec576e28d97cced3ad338  lib/controller/checks.py
+a2369719ca192945945971bfcffb42e9  lib/controller/checks.py
 33689bb1b064d4eebc216934795a595f  lib/controller/controller.py
 c7443613a0a2505b1faec931cee2a6ef  lib/controller/handler.py
 1e5532ede194ac9c083891c2f02bca93  lib/controller/__init__.py
@@ -46,7 +46,7 @@ ffa5f01f39b17c8d73423acca6cfe86a  lib/core/readlineng.py
 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py
 a7db43859b61569b601b97f187dd31c5  lib/core/revision.py
 fcb74fcc9577523524659ec49e2e964b  lib/core/session.py
-3f186f4f5322acd57c659532090d11ba  lib/core/settings.py
+2dba7f74fccee64374b4efde5b8245a4  lib/core/settings.py
 0dfc2ed40adf72e302291f6ecd4406f6  lib/core/shell.py
 a7edc9250d13af36ac0108f259859c19  lib/core/subprocessng.py
 a35efa7bec9f1e6cedf17c9830a79241  lib/core/target.py