From 53eb44304f1fe00f465fa8554c55ccece727d0ab Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 23 Aug 2017 14:08:40 +0200 Subject: [PATCH] Proper patch for #2666 --- lib/core/common.py | 4 ++++ lib/core/settings.py | 2 +- txt/checksum.md5 | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 46fad8669..ddc69f0fc 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1139,6 +1139,8 @@ def checkFile(filename, raiseOnError=True): valid = True + filename = filename.strip('"\'') + try: if filename is None or not os.path.isfile(filename): valid = False @@ -2121,6 +2123,8 @@ def getFileItems(filename, commentPrefix='#', unicode_=True, lowercase=False, un retVal = list() if not unique else OrderedDict() + filename = filename.strip('"\'') + checkFile(filename) try: diff --git a/lib/core/settings.py b/lib/core/settings.py index 037e6222f..7f2e243bc 100755 --- 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.1.8.10" +VERSION = "1.1.8.11" 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 b7f9cd438..dbe853fc7 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -27,7 +27,7 @@ a66093c734c7f94ecdf94d882c2d8b89 lib/controller/controller.py 310efc965c862cfbd7b0da5150a5ad36 lib/controller/__init__.py ca0a4eba91d73c9d7adedabf528ca4f1 lib/core/agent.py 6cc95a117fbd34ef31b9aa25520f0e31 lib/core/bigarray.py -e2e845a52c4ff16035fb8af934076712 lib/core/common.py +23aace48c5c8c4f0d7432ddce0b15abf lib/core/common.py 5065a4242a8cccf72f91e22e1007ae63 lib/core/convert.py a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py 7936d78b1a7f1f008ff92bf2f88574ba lib/core/datatype.py @@ -46,7 +46,7 @@ a44d7a4cc6c9a67a72d6af2f25f4ddac lib/core/exception.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -5d28ad5c82cd4cfaa60e5baaeb73d9a4 lib/core/settings.py +3ee3f63b52ad369f400cc4a0a9aade53 lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py 4a6ecdd8a6e44bb4737bd9bc7f9b5743 lib/core/target.py