diff --git a/lib/core/option.py b/lib/core/option.py index d033ffdeb..379eed0dd 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -45,7 +45,6 @@ from lib.core.common import ntToPosixSlashes from lib.core.common import openFile from lib.core.common import parseRequestFile from lib.core.common import parseTargetDirect -from lib.core.common import parseTargetUrl from lib.core.common import paths from lib.core.common import randomStr from lib.core.common import readCachedFileContent @@ -104,7 +103,6 @@ from lib.core.settings import DEFAULT_PAGE_ENCODING from lib.core.settings import DEFAULT_TOR_HTTP_PORTS from lib.core.settings import DEFAULT_TOR_SOCKS_PORTS from lib.core.settings import DUMMY_URL -from lib.core.settings import INJECT_HERE_REGEX from lib.core.settings import IS_WIN from lib.core.settings import KB_CHARS_BOUNDARY_CHAR from lib.core.settings import KB_CHARS_LOW_FREQUENCY_ALPHABET @@ -1533,14 +1531,6 @@ def _cleanupOptions(): if conf.optimize: setOptimize() - match = re.search(INJECT_HERE_REGEX, conf.data or "") - if match: - kb.customInjectionMark = match.group(0) - - match = re.search(INJECT_HERE_REGEX, conf.url or "") - if match: - kb.customInjectionMark = match.group(0) - if conf.os: conf.os = conf.os.capitalize() @@ -2486,7 +2476,6 @@ def init(): _resolveCrossReferences() _checkWebSocket() - parseTargetUrl() parseTargetDirect() if any((conf.url, conf.logFile, conf.bulkFile, conf.sitemapUrl, conf.requestFile, conf.googleDork, conf.liveTest)): diff --git a/lib/core/settings.py b/lib/core/settings.py index fb7617d35..1d87a2806 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.10.34" +VERSION = "1.2.10.35" 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/core/target.py b/lib/core/target.py index 66f237dc8..2a6926816 100644 --- a/lib/core/target.py +++ b/lib/core/target.py @@ -52,9 +52,11 @@ from lib.core.option import _setKnowledgeBaseAttributes from lib.core.option import _setAuthCred from lib.core.settings import ASTERISK_MARKER from lib.core.settings import CSRF_TOKEN_PARAMETER_INFIXES +from lib.core.settings import CUSTOM_INJECTION_MARK_CHAR from lib.core.settings import DEFAULT_GET_POST_DELIMITER from lib.core.settings import HOST_ALIASES from lib.core.settings import ARRAY_LIKE_RECOGNITION_REGEX +from lib.core.settings import INJECT_HERE_REGEX from lib.core.settings import JSON_RECOGNITION_REGEX from lib.core.settings import JSON_LIKE_RECOGNITION_REGEX from lib.core.settings import MULTIPART_RECOGNITION_REGEX @@ -752,6 +754,9 @@ def initTargetEnv(): setattr(conf.data, UNENCODED_ORIGINAL_VALUE, original) kb.postSpaceToPlus = '+' in original + match = re.search(INJECT_HERE_REGEX, conf.data or "") or re.search(INJECT_HERE_REGEX, conf.url or "") + kb.customInjectionMark = match.group(0) if match else CUSTOM_INJECTION_MARK_CHAR + def setupTargetEnv(): _createTargetDirs() _setRequestParams() diff --git a/txt/checksum.md5 b/txt/checksum.md5 index cc3269e50..2ce719f56 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -42,17 +42,17 @@ cada93357a7321655927fc9625b3bfec lib/core/exception.py 1e5532ede194ac9c083891c2f02bca93 lib/core/__init__.py 458a194764805cd8312c14ecd4be4d1e lib/core/log.py 7d6edc552e08c30f4f4d49fa93b746f1 lib/core/optiondict.py -2f2b2286f82028cf36ace9be3af06bf9 lib/core/option.py +18f33e43a09f5d682b92ca63baacd531 lib/core/option.py c8c386d644d57c659d74542f5f57f632 lib/core/patch.py 6783160150b4711d02c56ee2beadffdb lib/core/profiling.py 6f654e1715571eff68a0f8af3d62dcf8 lib/core/readlineng.py 0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py a7db43859b61569b601b97f187dd31c5 lib/core/revision.py fcb74fcc9577523524659ec49e2e964b lib/core/session.py -6a4002715dd3a6e636aee4b6b081c583 lib/core/settings.py +31e606e7847cb86495bde3d5d0b18e8a lib/core/settings.py dd68a9d02fccb4fa1428b20e15b0db5d lib/core/shell.py a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py -47ad325975ab21fc9f11d90b46d0d143 lib/core/target.py +721198b5be72c8015a02acb116532a1f lib/core/target.py 72d499ca8d792e90a1ebfb2ad2341a51 lib/core/testing.py cd0067d1798e45f422ce44b98baf57db lib/core/threads.py c40758411bb0bd68764d78e0bb72bd0f lib/core/unescaper.py