From 839070d6ee41ef65bebbc59c09c3ab7b49307dc8 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 10 Nov 2017 13:03:24 +0100 Subject: [PATCH] Minor refactoring --- lib/core/option.py | 6 +++--- lib/core/settings.py | 2 +- lib/utils/brute.py | 2 +- lib/utils/hash.py | 6 +++--- txt/checksum.md5 | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/core/option.py b/lib/core/option.py index 841f52437..37e56f77a 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -2097,11 +2097,11 @@ def _useWizardInterface(): choice = readInput(message, default='1') if choice == '2': - map(lambda x: conf.__setitem__(x, True), WIZARD.INTERMEDIATE) + map(lambda _: conf.__setitem__(_, True), WIZARD.INTERMEDIATE) elif choice == '3': - map(lambda x: conf.__setitem__(x, True), WIZARD.ALL) + map(lambda _: conf.__setitem__(_, True), WIZARD.ALL) else: - map(lambda x: conf.__setitem__(x, True), WIZARD.BASIC) + map(lambda _: conf.__setitem__(_, True), WIZARD.BASIC) logger.debug("muting sqlmap.. it will do the magic for you") conf.verbose = 0 diff --git a/lib/core/settings.py b/lib/core/settings.py index f2043b8d3..8b911d698 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.1.11.15" +VERSION = "1.1.11.16" 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/utils/brute.py b/lib/utils/brute.py index e34111ff1..4a323acfa 100644 --- a/lib/utils/brute.py +++ b/lib/utils/brute.py @@ -278,7 +278,7 @@ def columnExists(columnFile, regex=None): kb.data.cachedColumns[conf.db] = {conf.tbl: columns} - for _ in map(lambda x: (conf.db, conf.tbl, x[0], x[1]), columns.items()): + for _ in ((conf.db, conf.tbl, item[0], item[1]) for item in columns.items()): if _ not in kb.brute.columns: kb.brute.columns.append(_) diff --git a/lib/utils/hash.py b/lib/utils/hash.py index 5a2b69fe0..4c93509e2 100644 --- a/lib/utils/hash.py +++ b/lib/utils/hash.py @@ -153,7 +153,7 @@ def mssql_passwd(password, salt, uppercase=False): """ binsalt = hexdecode(salt) - unistr = "".join(map(lambda c: ("%s\0" if ord(c) < 256 else "%s") % utf8encode(c), password)) + unistr = "".join(("%s\0" if ord(_) < 256 else "%s") % utf8encode(_) for _ in password) retVal = "0100%s%s" % (salt, sha1(unistr + binsalt).hexdigest()) @@ -171,7 +171,7 @@ def mssql_old_passwd(password, salt, uppercase=True): # prior to version '2005' """ binsalt = hexdecode(salt) - unistr = "".join(map(lambda c: ("%s\0" if ord(c) < 256 else "%s") % utf8encode(c), password)) + unistr = "".join(("%s\0" if ord(_) < 256 else "%s") % utf8encode(_) for _ in password) retVal = "0100%s%s%s" % (salt, sha1(unistr + binsalt).hexdigest(), sha1(unistr.upper() + binsalt).hexdigest()) @@ -187,7 +187,7 @@ def mssql_new_passwd(password, salt, uppercase=False): """ binsalt = hexdecode(salt) - unistr = "".join(map(lambda c: ("%s\0" if ord(c) < 256 else "%s") % utf8encode(c), password)) + unistr = "".join(("%s\0" if ord(_) < 256 else "%s") % utf8encode(_) for _ in password) retVal = "0200%s%s" % (salt, sha512(unistr + binsalt).hexdigest()) diff --git a/txt/checksum.md5 b/txt/checksum.md5 index f2c560564..9723be5ac 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -40,13 +40,13 @@ d3ed5f9baa074df33390d33164d9d8b5 lib/core/defaults.py 5fb9aaf874daa47ea2b672a22740e56b lib/core/__init__.py f872699e948d0692ce11b54781da814c lib/core/log.py 5adb07b2771f26822e94c75c2cb9db0b lib/core/optiondict.py -ec6a778b0e74749b916caead78ba88b7 lib/core/option.py +e1c000db9be27f973569b1a430629037 lib/core/option.py 8764d2d8610fff5f4aef897b2b1f1006 lib/core/profiling.py 2de91262fcc6bd51c987fd2f8a59ff31 lib/core/readlineng.py 760d9df2a27ded29109b390ab202e72d lib/core/replication.py a2466b62e67f8b31736bac4dac590e51 lib/core/revision.py 02d4762140a72fd44668d3dab5eabda9 lib/core/session.py -012bad7ef5ad747bea3edaaee08f5a68 lib/core/settings.py +c55090cd0074a23ce5e56d3562db5b41 lib/core/settings.py 35bffbad762eb9e03db9e93b1c991103 lib/core/shell.py a59ec28371ae067a6fdd8f810edbee3d lib/core/subprocessng.py 7c9f2af3c0a8dd89223cfe07b0a0b826 lib/core/target.py @@ -99,13 +99,13 @@ ab58650253fdad04e7a53a4e4d36df8a lib/techniques/blind/inference.py fcc3a6ac3b5f7aad86686e5f9adc7a43 lib/techniques/union/test.py 505682f95cb23573dd60bf6d0063a632 lib/techniques/union/use.py 452cb280aa51a4ddf38d94534a6e8d5f lib/utils/api.py -d9d62fa5d7367e7fb23180240c8d03f4 lib/utils/brute.py +48c3f8216b64825c50f5304cb4dadd95 lib/utils/brute.py 7e0078da1dff59530d64f9b1e2f68607 lib/utils/crawler.py a2d2087353fb64a8441c3247ae0ad719 lib/utils/deps.py b806de9710a02436e576ac9065816021 lib/utils/getch.py fe3a38f820ae05a95f92ab53e22b46d0 lib/utils/har.py 1bdd3e6483d3d7c4fd6ec59e9526b542 lib/utils/hashdb.py -e0e8a641c28552ca6794a71b5f12a2fb lib/utils/hash.py +f6772e95ab1ca991adbecc4434535a92 lib/utils/hash.py f20ae1aa6a8d1d5373ace1f7ed3476a7 lib/utils/htmlentities.py 5fb9aaf874daa47ea2b672a22740e56b lib/utils/__init__.py 06cd61b634ca6142281da699a504cc85 lib/utils/pivotdumptable.py