From 59d97968a7dbf47a49078501c42858745fcf6aff Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 4 Mar 2019 16:36:19 +0100 Subject: [PATCH] Fixes #3514 --- extra/wafdetectify/wafdetectify.py | 12 ++++++------ lib/core/settings.py | 2 +- lib/utils/versioncheck.py | 4 ++-- sqlmap.py | 4 ++-- txt/checksum.md5 | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/extra/wafdetectify/wafdetectify.py b/extra/wafdetectify/wafdetectify.py index 2ceea92d0..a5f3d54d1 100755 --- a/extra/wafdetectify/wafdetectify.py +++ b/extra/wafdetectify/wafdetectify.py @@ -73,7 +73,7 @@ def main(): print(colorize("%s #v%s\n by: %s\n" % (NAME, VERSION, AUTHOR))) if len(sys.argv) < 2: - exit(colorize("[x] usage: python %s " % os.path.split(__file__)[-1])) + sys.exit(colorize("[x] usage: python %s " % os.path.split(__file__)[-1])) cookie_jar = cookielib.CookieJar() opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookie_jar)) @@ -96,11 +96,11 @@ def main(): del sys.modules[filename[:-3]] module = __import__(filename[:-3].encode(sys.getfilesystemencoding() or "utf8")) except ImportError as ex: - exit(colorize("[x] cannot import WAF script '%s' (%s)" % (filename[:-3], ex))) + sys.exit(colorize("[x] cannot import WAF script '%s' (%s)" % (filename[:-3], ex))) _ = dict(inspect.getmembers(module)) if "detect" not in _: - exit(colorize("[x] missing function 'detect(get_page)' in WAF script '%s'" % found)) + sys.exit(colorize("[x] missing function 'detect(get_page)' in WAF script '%s'" % found)) else: WAF_FUNCTIONS.append((_["detect"], _.get("__product__", filename[:-3]))) @@ -113,7 +113,7 @@ def main(): socket.getaddrinfo(hostname, None) except socket.gaierror: print(colorize("[x] host '%s' does not exist" % hostname)) - exit(1) + sys.exit(1) found = False for function, product in WAF_FUNCTIONS: @@ -121,14 +121,14 @@ def main(): continue if function(get_page): - exit(colorize("[!] WAF/IPS identified as '%s'" % product)) + sys.exit(colorize("[!] WAF/IPS identified as '%s'" % product)) if not found: print(colorize("[o] nothing found")) print() - exit(int(not found)) + sys.exit(int(not found)) if __name__ == "__main__": main() diff --git a/lib/core/settings.py b/lib/core/settings.py index e44d9a1aa..c9304ca75 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.3.3.3" +VERSION = "1.3.3.4" 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/versioncheck.py b/lib/utils/versioncheck.py index 7e17f28bc..e9e49a5f0 100644 --- a/lib/utils/versioncheck.py +++ b/lib/utils/versioncheck.py @@ -11,7 +11,7 @@ import time PYVERSION = sys.version.split()[0] if PYVERSION >= "3" or PYVERSION < "2.6": - exit("[%s] [CRITICAL] incompatible Python version detected ('%s'). To successfully run sqlmap you'll have to use version 2.6.x or 2.7.x (visit 'https://www.python.org/downloads/')" % (time.strftime("%X"), PYVERSION)) + sys.exit("[%s] [CRITICAL] incompatible Python version detected ('%s'). To successfully run sqlmap you'll have to use version 2.6.x or 2.7.x (visit 'https://www.python.org/downloads/')" % (time.strftime("%X"), PYVERSION)) errors = [] extensions = ("bz2", "gzip", "pyexpat", "ssl", "sqlite3", "zlib") @@ -25,4 +25,4 @@ if errors: errMsg = "missing one or more core extensions (%s) " % (", ".join("'%s'" % _ for _ in errors)) errMsg += "most likely because current version of Python has been " errMsg += "built without appropriate dev packages" - exit(errMsg) + sys.exit(errMsg) diff --git a/sqlmap.py b/sqlmap.py index bf49f9fa5..ce3b4cbf8 100755 --- a/sqlmap.py +++ b/sqlmap.py @@ -15,7 +15,7 @@ try: try: __import__("lib.utils.versioncheck") # this has to be the first non-standard import except ImportError: - exit("[!] wrong installation detected (missing modules). Visit 'https://github.com/sqlmapproject/sqlmap/#installation' for further details") + sys.exit("[!] wrong installation detected (missing modules). Visit 'https://github.com/sqlmapproject/sqlmap/#installation' for further details") import bdb import distutils @@ -76,7 +76,7 @@ except KeyboardInterrupt: raise SystemExit else: import time - exit("\r[%s] [CRITICAL] %s" % (time.strftime("%X"), errMsg)) + sys.exit("\r[%s] [CRITICAL] %s" % (time.strftime("%X"), errMsg)) def modulePath(): """ diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 4558c4378..9c8803f5d 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -22,7 +22,7 @@ a32e12410e0f86c1d035db6daae84680 extra/shutils/duplicates.py fb6be55d21a70765e35549af2484f762 extra/sqlharvest/__init__.py 4f82e97b09cc530cb9a92472d0835cea extra/sqlharvest/sqlharvest.py fb6be55d21a70765e35549af2484f762 extra/wafdetectify/__init__.py -aec73042403993076f478da48066a79e extra/wafdetectify/wafdetectify.py +4dc5e7c5400204159baaf10a0a9124f0 extra/wafdetectify/wafdetectify.py e6909a3b32fc09c0373101eb58c76538 lib/controller/action.py 0fce185e63b1b743b3ef0a3dbe640366 lib/controller/checks.py 8581acf56b8fb0def50af3707490a834 lib/controller/controller.py @@ -50,7 +50,7 @@ d5ef43fe3cdd6c2602d7db45651f9ceb lib/core/readlineng.py 7d8a22c582ad201f65b73225e4456170 lib/core/replication.py 3179d34f371e0295dd4604568fb30bcd lib/core/revision.py d6269c55789f78cf707e09a0f5b45443 lib/core/session.py -430c1a61f8acb571e755a3ddab1c1591 lib/core/settings.py +918a8651a9872a33ddb04f82ac3360c3 lib/core/settings.py 4483b4a5b601d8f1c4281071dff21ecc lib/core/shell.py 10fd19b0716ed261e6d04f311f6f527c lib/core/subprocessng.py 43772ea73e9e3d446f782af591cb4eda lib/core/target.py @@ -118,7 +118,7 @@ b79654e49850937ab2dc8e0d73625cab lib/utils/purge.py 503637fbdabaad5bc7f87dfcfbea4dd3 lib/utils/search.py 272a538a3d36186113191f4c543bb34b lib/utils/sqlalchemy.py 68f90f633d812ca428d2f15f016b2d96 lib/utils/timeout.py -164f830baad3e13b226ee57d44d69dfa lib/utils/versioncheck.py +e0cecb6efea4dbd6ac389f6162808283 lib/utils/versioncheck.py a5007113e3cda726e1d131b99b927284 lib/utils/xrange.py 28da82c0afa4d8a0e9848f7bd8e994b7 LICENSE b8656f4785d0945e68257107a171f945 plugins/dbms/access/connector.py @@ -236,7 +236,7 @@ ec2ba8c757ac96425dcd2b97970edd3a shell/stagers/stager.asp_ 0c48ddb1feb7e38a951ef05a0d48e032 shell/stagers/stager.jsp_ 2f9e459a4cf6a58680978cdce5ff7971 shell/stagers/stager.php_ 41522f8ad02ac133ca0aeaab374c36a8 sqlmapapi.py -9693388e705f68e0e307dc225c64ae42 sqlmap.py +a436dd078b06bf664637b27f42889a35 sqlmap.py 772fb3dd15edc9d4055ab9f9dee0c203 tamper/0x2char.py 3d89a5c4c33d4d1d9303f5e3bd11f0ae tamper/apostrophemask.py 1fd0eec63970728c1e6628b2e4c21d81 tamper/apostrophenullencode.py