From f92e1ebc40f5c415fa972427ece6b64a6b80a65e Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 2 Jul 2018 11:47:47 +0200 Subject: [PATCH] Another trivial style update --- lib/core/settings.py | 2 +- sqlmap.py | 5 ++++- txt/checksum.md5 | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 5cb20b4c6..f573a687f 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 (...) -VERSION = "1.2.7.1" +VERSION = "1.2.7.2" 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/sqlmap.py b/sqlmap.py index 1cbf6001d..98e5eeeae 100755 --- a/sqlmap.py +++ b/sqlmap.py @@ -325,7 +325,10 @@ def main(): file_ = match.group(1) file_ = os.path.relpath(file_, os.path.dirname(__file__)) file_ = file_.replace("\\", '/') - file_ = re.sub(r"\.\./", '/', file_) + if "../" in file_: + file_ = re.sub(r"(\.\./)+", '/', file_) + else: + file_ = file_.lstrip('/') file_ = re.sub(r"/{2,}", '/', file_) excMsg = excMsg.replace(match.group(1), file_) diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 261995c13..83b910191 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -48,7 +48,7 @@ c8c386d644d57c659d74542f5f57f632 lib/core/patch.py 0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py a7db43859b61569b601b97f187dd31c5 lib/core/revision.py fcb74fcc9577523524659ec49e2e964b lib/core/session.py -fecf20f279fc20930aa35b26df99c76d lib/core/settings.py +97ba609b383bae160c47d4b10b9f06a0 lib/core/settings.py dd68a9d02fccb4fa1428b20e15b0db5d lib/core/shell.py a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py 95f04c1c1d8c3998d86e1bdf0e12771c lib/core/target.py @@ -226,7 +226,7 @@ ec2ba8c757ac96425dcd2b97970edd3a shell/stagers/stager.asp_ 0c48ddb1feb7e38a951ef05a0d48e032 shell/stagers/stager.jsp_ 2f9e459a4cf6a58680978cdce5ff7971 shell/stagers/stager.php_ 4eaeef94314956e4517e5310a28d579a sqlmapapi.py -0295b082969b4dc2f164090d8b0c73db sqlmap.py +e59b4cba325d0e5184dce300ef052728 sqlmap.py 1a1e3a78ded58b240c9dbb1b17996acf tamper/0x2char.py 4c3b8a7daa4bff52e01d4168be0eedbe tamper/apostrophemask.py 4115a55b8aba464723d645b7d3156b6e tamper/apostrophenullencode.py