From 13a2ab3fa3dbbddcb5931f4c964592f9f2b20068 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 5 Oct 2020 21:36:30 +0200 Subject: [PATCH] Minor update (drei) --- extra/shutils/drei.sh | 2 +- lib/core/agent.py | 2 +- lib/core/settings.py | 2 +- tamper/0eunion.py | 2 +- tamper/dunion.py | 2 +- tamper/misunion.py | 2 +- tamper/schemasplit.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extra/shutils/drei.sh b/extra/shutils/drei.sh index f73027a30..24875d331 100755 --- a/extra/shutils/drei.sh +++ b/extra/shutils/drei.sh @@ -7,7 +7,7 @@ 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 -for i in $(find . -iname "*.py" | grep -v __init__); do PYTHONWARNINGS=all python3.7 -m compileall $i | sed 's/Compiling/Checking/g'; done +for i in $(find . -iname "*.py" | grep -v __init__); do PYTHONWARNINGS=all python3 -m compileall $i | sed 's/Compiling/Checking/g'; done unset SQLMAP_DREI source `dirname "$0"`"/junk.sh" diff --git a/lib/core/agent.py b/lib/core/agent.py index 34de5f153..67dd2b505 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -1207,7 +1207,7 @@ class Agent(object): def whereQuery(self, query): if conf.dumpWhere and query: - if Backend.isDbms(DBMS.ORACLE) and re.search("qq ORDER BY \w+\)", query, re.I) is not None: + if Backend.isDbms(DBMS.ORACLE) and re.search(r"qq ORDER BY \w+\)", query, re.I) is not None: prefix, suffix = re.sub(r"(?i)(qq)( ORDER BY \w+\))", r"\g<1> WHERE %s\g<2>" % conf.dumpWhere, query), "" else: match = re.search(r" (LIMIT|ORDER).+", query, re.I) diff --git a/lib/core/settings.py b/lib/core/settings.py index d513ea59d..837784503 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.4.10.2" +VERSION = "1.4.10.3" 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/tamper/0eunion.py b/tamper/0eunion.py index b46f381e2..44de282dd 100644 --- a/tamper/0eunion.py +++ b/tamper/0eunion.py @@ -29,4 +29,4 @@ def tamper(payload, **kwargs): '1e0UNION ALL SELECT' """ - return re.sub("(\d+)\s+(UNION )", r"\g<1>e0\g<2>", payload, re.I) if payload else payload + return re.sub(r"(\d+)\s+(UNION )", r"\g<1>e0\g<2>", payload, re.I) if payload else payload diff --git a/tamper/dunion.py b/tamper/dunion.py index 70ebd002c..74a2c6c15 100644 --- a/tamper/dunion.py +++ b/tamper/dunion.py @@ -31,4 +31,4 @@ def tamper(payload, **kwargs): '1DUNION ALL SELECT' """ - return re.sub("(\d+)\s+(UNION )", r"\g<1>D\g<2>", payload, re.I) if payload else payload + return re.sub(r"(\d+)\s+(UNION )", r"\g<1>D\g<2>", payload, re.I) if payload else payload diff --git a/tamper/misunion.py b/tamper/misunion.py index baf767abb..68a9e4fb0 100644 --- a/tamper/misunion.py +++ b/tamper/misunion.py @@ -33,4 +33,4 @@ def tamper(payload, **kwargs): '1"-.1UNION ALL SELECT' """ - return re.sub("\s+(UNION )", r"-.1\g<1>", payload, re.I) if payload else payload + return re.sub(r"\s+(UNION )", r"-.1\g<1>", payload, re.I) if payload else payload diff --git a/tamper/schemasplit.py b/tamper/schemasplit.py index e7bb1ea58..91bfb48d2 100644 --- a/tamper/schemasplit.py +++ b/tamper/schemasplit.py @@ -28,4 +28,4 @@ def tamper(payload, **kwargs): 'SELECT id FROM testdb 9.e.users' """ - return re.sub("( FROM \w+)\.(\w+)", r"\g<1> 9.e.\g<2>", payload, re.I) if payload else payload + return re.sub(r"( FROM \w+)\.(\w+)", r"\g<1> 9.e.\g<2>", payload, re.I) if payload else payload