From 66c1f72a1613f0a247c36ec679affb7cb7116bdb Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 29 Dec 2017 13:04:52 +0100 Subject: [PATCH] Minor optimization --- lib/controller/checks.py | 3 +++ lib/core/option.py | 1 + lib/core/settings.py | 2 +- txt/checksum.md5 | 6 +++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/controller/checks.py b/lib/controller/checks.py index 09bab2a82..017b527f5 100644 --- a/lib/controller/checks.py +++ b/lib/controller/checks.py @@ -110,6 +110,9 @@ def checkSqlInjection(place, parameter, value): if value.isdigit(): kb.cache.intBoundaries = kb.cache.intBoundaries or sorted(copy.deepcopy(conf.boundaries), key=lambda boundary: any(_ in (boundary.prefix or "") or _ in (boundary.suffix or "") for _ in ('"', '\''))) boundaries = kb.cache.intBoundaries + elif value.isalpha(): + kb.cache.alphaBoundaries = kb.cache.alphaBoundaries or sorted(copy.deepcopy(conf.boundaries), key=lambda boundary: not any(_ in (boundary.prefix or "") or _ in (boundary.suffix or "") for _ in ('"', '\''))) + boundaries = kb.cache.alphaBoundaries else: boundaries = conf.boundaries diff --git a/lib/core/option.py b/lib/core/option.py index a75e15ed8..b1fa13f6c 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -1889,6 +1889,7 @@ def _setKnowledgeBaseAttributes(flushAll=True): kb.cache.addrinfo = {} kb.cache.content = {} kb.cache.encoding = {} + kb.cache.alphaBoundaries = None kb.cache.intBoundaries = None kb.cache.parsedDbms = {} kb.cache.regex = {} diff --git a/lib/core/settings.py b/lib/core/settings.py index 11be16ba0..749fcda3b 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.12.31" +VERSION = "1.1.12.32" 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 55db79713..78162a27a 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -21,7 +21,7 @@ f96467fc5cd1d87f52dd7966c8ae6e79 extra/shutils/regressiontest.py 5fb9aaf874daa47ea2b672a22740e56b extra/sqlharvest/__init__.py 1fc7772edce5a01c31f3932b2fc4c1c6 extra/sqlharvest/sqlharvest.py 21bf2b3a7a22b8cd5d96a6457a1b4997 lib/controller/action.py -8266f1119366b0857d88f139de9b2035 lib/controller/checks.py +4e5cdc969503780c6a3ee5e3bbfca82a lib/controller/checks.py 2db2666dba713c710d248a62b2c1c1fe lib/controller/controller.py d2cdb9e832e18a81e936ca3348144b16 lib/controller/handler.py 5fb9aaf874daa47ea2b672a22740e56b lib/controller/__init__.py @@ -40,13 +40,13 @@ d3ed5f9baa074df33390d33164d9d8b5 lib/core/defaults.py 5fb9aaf874daa47ea2b672a22740e56b lib/core/__init__.py f872699e948d0692ce11b54781da814c lib/core/log.py 5adb07b2771f26822e94c75c2cb9db0b lib/core/optiondict.py -35187108c74a957ebadf194207737162 lib/core/option.py +eec64e3d4c3f77eded3270b8116698ea 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 -42d4b8279ae70e235ff6d52185671eb4 lib/core/settings.py +ec31a0f93542b8b7984f94eb96684fe8 lib/core/settings.py 35bffbad762eb9e03db9e93b1c991103 lib/core/shell.py a59ec28371ae067a6fdd8f810edbee3d lib/core/subprocessng.py d93501771b41315f9fb949305b6ed257 lib/core/target.py