From 70168855f9f4ab00c2d0af88c610941941508a5d Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 30 Apr 2019 11:41:03 +0200 Subject: [PATCH] Update of drei testing functionality --- extra/shutils/drei.sh | 6 +++++- lib/core/settings.py | 2 +- lib/utils/versioncheck.py | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/extra/shutils/drei.sh b/extra/shutils/drei.sh index e45a1fd1d..39c5c6e9e 100755 --- a/extra/shutils/drei.sh +++ b/extra/shutils/drei.sh @@ -4,4 +4,8 @@ # See the file 'LICENSE' for copying permission # Stress test against Python3 -for i in $(find . -iname "*.py" | grep -v __init__); do python3 -c 'import '`echo $i | cut -d '.' -f 2 | cut -d '/' -f 2- | sed 's/\//./g'`''; done \ No newline at end of file + +export SQLMAP_DREI=1 +for i in $(find . -iname "*.py" | grep -v __init__); do python3 -c 'import '`echo $i | cut -d '.' -f 2 | cut -d '/' -f 2- | sed 's/\//./g'`''; done +unset SQLMAP_DREI +source `dirname "$0"`"/junk.sh" \ No newline at end of file diff --git a/lib/core/settings.py b/lib/core/settings.py index 8464ed191..05673cfc2 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -17,7 +17,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.3.4.46" +VERSION = "1.3.4.47" 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 0e75e4681..8fbac1ea9 100644 --- a/lib/utils/versioncheck.py +++ b/lib/utils/versioncheck.py @@ -5,12 +5,13 @@ Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/) See the file 'LICENSE' for copying permission """ +import os import sys import time PYVERSION = sys.version.split()[0] -if PYVERSION >= "3" or PYVERSION < "2.6": +if (PYVERSION >= "3" or PYVERSION < "2.6") and not int(os.environ.get("SQLMAP_DREI", 0)): 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 = []