diff --git a/lib/core/settings.py b/lib/core/settings.py index a4e695c0d..bd84e7852 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.7.8" +VERSION = "1.1.7.9" 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 43cbabbf9..1a2d0421b 100644 --- a/lib/core/target.py +++ b/lib/core/target.py @@ -20,6 +20,7 @@ from lib.core.common import getSafeExString from lib.core.common import getUnicode from lib.core.common import hashDBRetrieve from lib.core.common import intersect +from lib.core.common import isNumPosStrValue from lib.core.common import normalizeUnicode from lib.core.common import openFile from lib.core.common import paramToDict @@ -436,7 +437,7 @@ def _resumeHashDBValues(): kb.xpCmdshellAvailable = hashDBRetrieve(HASHDB_KEYS.KB_XP_CMDSHELL_AVAILABLE) or kb.xpCmdshellAvailable kb.errorChunkLength = hashDBRetrieve(HASHDB_KEYS.KB_ERROR_CHUNK_LENGTH) - if kb.errorChunkLength and kb.errorChunkLength.isdigit(): + if isNumPosStrValue(kb.errorChunkLength): kb.errorChunkLength = int(kb.errorChunkLength) else: kb.errorChunkLength = None diff --git a/lib/utils/api.py b/lib/utils/api.py index 9c41412c8..829c2fff3 100644 --- a/lib/utils/api.py +++ b/lib/utils/api.py @@ -736,7 +736,7 @@ def client(host=RESTAPI_DEFAULT_ADDRESS, port=RESTAPI_DEFAULT_PORT): if not res["success"]: logger.error("Failed to execute command %s" % command) dataToStdout("%s\n" % raw) - + elif command.startswith("option"): if not taskid: logger.error("No task ID in use") diff --git a/lib/utils/crawler.py b/lib/utils/crawler.py index 27fc8fbdb..747aaf1e6 100644 --- a/lib/utils/crawler.py +++ b/lib/utils/crawler.py @@ -112,10 +112,10 @@ def crawl(target): threadData.shared.deeper.add(url) if re.search(r"(.*?)\?(.+)", url): threadData.shared.value.add(url) - except ValueError: # for non-valid links - pass except UnicodeEncodeError: # for non-HTML files pass + except ValueError: # for non-valid links + pass finally: if conf.forms: findPageForms(content, current, False, True) diff --git a/tamper/space2mysqlblank.py b/tamper/space2mysqlblank.py index caddab148..e7f96b0fb 100644 --- a/tamper/space2mysqlblank.py +++ b/tamper/space2mysqlblank.py @@ -33,7 +33,7 @@ def tamper(payload, **kwargs): >>> random.seed(0) >>> tamper('SELECT id FROM users') - 'SELECT%0Bid%0DFROM%0Cusers' + 'SELECT%A0id%0BFROM%0Cusers' """ # ASCII table: diff --git a/txt/checksum.md5 b/txt/checksum.md5 index b8fb20812..66d2fda94 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -46,10 +46,10 @@ b9ff4e622c416116bee6024c0f050349 lib/core/enums.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -e65c91771c87c114238f281e198f802c lib/core/settings.py +3f23a17e519b6334d343e57e0018efd1 lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py -baa3f47efa6701076d026e43a6874a51 lib/core/target.py +4416fdcab26b286a5a3a88e75aa60044 lib/core/target.py 8970b88627902239d695280b1160e16c lib/core/testing.py b8306192d980abdc8d669c024511e9a1 lib/core/threads.py ad74fc58fc7214802fd27067bce18dd2 lib/core/unescaper.py @@ -98,9 +98,9 @@ d3da4c7ceaf57c4687a052d58722f6bb lib/techniques/dns/use.py 310efc965c862cfbd7b0da5150a5ad36 lib/techniques/union/__init__.py d71e48e6fd08f75cc612bf8b260994ce lib/techniques/union/test.py db3090ff9a740ba096ba676fcf44ebfc lib/techniques/union/use.py -a73c3ddd0de359507a8ad59b363aa963 lib/utils/api.py +9e903297f6d6bb11660af5c7b109ccab lib/utils/api.py 7d10ba0851da8ee9cd3c140dcd18798e lib/utils/brute.py -ed70f1ca9113664043ec9e6778e48078 lib/utils/crawler.py +c08d2487a53a1db8170178ebcf87c864 lib/utils/crawler.py ba12c69a90061aa14d848b8396e79191 lib/utils/deps.py 3b9fd519164e0bf275d5fd361c3f11ff lib/utils/getch.py 1cd7599b5e6addb29cbab85d292ccf6c lib/utils/har.py @@ -265,7 +265,7 @@ b2331640743170f82be9a8c27f65b206 tamper/space2morecomment.py 507a174c64345df8df003ddba93c8cd1 tamper/space2morehash.py 0ce89b0d602abbd64344ab038be8acbc tamper/space2mssqlblank.py fa66af20648b5538289748abe7a08fe6 tamper/space2mssqlhash.py -9dde72d94ce42bf71e3615108fe0214f tamper/space2mysqlblank.py +b5abc11a45e9646cd0e296548c42e787 tamper/space2mysqlblank.py 038b8ea90f9a3a45b9bc67fcdff38511 tamper/space2mysqldash.py 5665c217ef8998bfd18f9ef1d8c617bd tamper/space2plus.py a30fa43203d960c7a9d8709bf24ca401 tamper/space2randomblank.py