From 1e310631ab0b036580f0ca2badab2796a332e6b2 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 11 Apr 2017 10:01:37 +0200 Subject: [PATCH] Minor stability patch --- lib/core/common.py | 3 +++ lib/core/settings.py | 2 +- sqlmap.py | 6 +++--- txt/checksum.md5 | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index d37f021cc..a10170c9f 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -3188,6 +3188,9 @@ def checkIntegrity(): Checks integrity of code files during the unhandled exceptions """ + if not paths: + return + logger.debug("running code integrity check") retVal = True diff --git a/lib/core/settings.py b/lib/core/settings.py index e4fb08bc6..ac61d9bb9 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.4.15" +VERSION = "1.1.4.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/sqlmap.py b/sqlmap.py index bfc20cb80..13fb28229 100755 --- a/sqlmap.py +++ b/sqlmap.py @@ -115,7 +115,6 @@ def main(): try: checkEnvironment() - setPaths(modulePath()) banner() @@ -203,9 +202,10 @@ def main(): print errMsg = unhandledExceptionMessage() excMsg = traceback.format_exc() + valid = checkIntegrity() try: - if not checkIntegrity(): + if valid is False: errMsg = "code integrity check failed (turning off automatic issue creation). " errMsg += "You should retrieve the latest development version from official GitHub " errMsg += "repository at '%s'" % GIT_PAGE @@ -285,7 +285,7 @@ def main(): errMsg = maskSensitiveData(errMsg) excMsg = maskSensitiveData(excMsg) - if conf.get("api"): + if conf.get("api") or not valid: logger.critical("%s\n%s" % (errMsg, excMsg)) else: logger.critical(errMsg) diff --git a/txt/checksum.md5 b/txt/checksum.md5 index bb664073a..d67aa1eab 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -26,7 +26,7 @@ d79481ab99acd739615e747d4a79d9d0 lib/controller/handler.py 310efc965c862cfbd7b0da5150a5ad36 lib/controller/__init__.py 19905ecb4437b94512cf21d5f1720091 lib/core/agent.py 6cc95a117fbd34ef31b9aa25520f0e31 lib/core/bigarray.py -95e165749bdb830e51be2159bc2c021e lib/core/common.py +f667d34b2869016ac2b97f82c4463599 lib/core/common.py 5065a4242a8cccf72f91e22e1007ae63 lib/core/convert.py a8143dab9d3a27490f7d49b6b29ea530 lib/core/data.py 7936d78b1a7f1f008ff92bf2f88574ba lib/core/datatype.py @@ -45,7 +45,7 @@ dd19b4d930d418f8aef498941346ab2d lib/core/option.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -8d6ab6209fa5fc2bb2a414992320a1ce lib/core/settings.py +f2cace15ba198ea85d8d67981ee739ea lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py afd0636d2e93c23f4f0a5c9b6023ea17 lib/core/target.py @@ -224,7 +224,7 @@ c3cc8b7727161e64ab59f312c33b541a shell/stager.aspx_ 1f7f125f30e0e800beb21e2ebbab18e1 shell/stager.jsp_ 01e3505e796edf19aad6a996101c81c9 shell/stager.php_ 0751a45ac4c130131f2cdb74d866b664 sqlmapapi.py -e6e6fbed25e09f29ce62a2d55932e331 sqlmap.py +d715e78922d1b6bee7c9c03fdfa7ccfd sqlmap.py 08c711a470d7e0bf705320ba3c48b886 tamper/apostrophemask.py e8509df10d3f1c28014d7825562d32dd tamper/apostrophenullencode.py bb27f7dc980ea07fcfedbd7da5e5e029 tamper/appendnullbyte.py