diff --git a/lib/core/settings.py b/lib/core/settings.py index 873a5efc8..d55e241ec 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.2.7.5" +VERSION = "1.2.7.6" 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/thirdparty/ansistrm/ansistrm.py b/thirdparty/ansistrm/ansistrm.py index 5ecc05961..02b0b85eb 100644 --- a/thirdparty/ansistrm/ansistrm.py +++ b/thirdparty/ansistrm/ansistrm.py @@ -150,7 +150,7 @@ class ColorizingStreamHandler(logging.StreamHandler): else: prefix = "" - match = re.search(r"\[([A-Z]+)\]", message) + match = re.search(r"\[([A-Z ]+)\]", message) if match: level = match.group(1) if message.startswith("\x1b[1m"): @@ -174,6 +174,17 @@ class ColorizingStreamHandler(logging.StreamHandler): reset = self.reset message = message.replace(time, ''.join((self.csi, str(self.color_map["cyan"] + 30), 'm', time, reset)), 1) + match = re.search(r"\[(#\d+)\]", message) + if match: + counter = match.group(1) + if not message.endswith(self.reset): + reset = self.reset + elif message.startswith("\x1b[1m"): # bold + reset = self.reset + "\x1b[1m" + else: + reset = self.reset + message = message.replace(counter, ''.join((self.csi, str(self.color_map["yellow"] + 30), 'm', counter, reset)), 1) + return message def format(self, record): diff --git a/txt/checksum.md5 b/txt/checksum.md5 index 467d7de28..87116f163 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -48,7 +48,7 @@ c8c386d644d57c659d74542f5f57f632 lib/core/patch.py 0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py a7db43859b61569b601b97f187dd31c5 lib/core/revision.py fcb74fcc9577523524659ec49e2e964b lib/core/session.py -9f27c2f2abae2c21eb623f16abfeccf9 lib/core/settings.py +f1e0cc7708df13f9f973dbcabfd77007 lib/core/settings.py dd68a9d02fccb4fa1428b20e15b0db5d lib/core/shell.py a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py 95f04c1c1d8c3998d86e1bdf0e12771c lib/core/target.py @@ -285,7 +285,7 @@ fd1bff6caefe5007444f7a0fabbc8ce9 tamper/space2mysqlblank.py 929a2586dbb7b758a454eb09e13e5a73 tamper/versionedkeywords.py 3aff4d344ebd4f38e033e73b63f84447 tamper/versionedmorekeywords.py ed1acafbac707bfa71c72f76b81c1bdd tamper/xforwardedfor.py -b743632abd4eee8654f98dcfdb753246 thirdparty/ansistrm/ansistrm.py +2350c4ab8a9972980ad93466066294e9 thirdparty/ansistrm/ansistrm.py d41d8cd98f00b204e9800998ecf8427e thirdparty/ansistrm/__init__.py 8e775c25bc9e84891ad6fcb4f0005c23 thirdparty/beautifulsoup/beautifulsoup.py cb2e1fe7c404dff41a2ae9132828f532 thirdparty/beautifulsoup/__init__.py