diff --git a/lib/core/common.py b/lib/core/common.py index 63d5f36cd..67631b110 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -75,6 +75,7 @@ from lib.core.enums import EXPECTED from lib.core.enums import HEURISTIC_TEST from lib.core.enums import HTTP_HEADER from lib.core.enums import HTTPMETHOD +from lib.core.enums import LOGGING_LEVELS from lib.core.enums import MKSTEMP_PREFIX from lib.core.enums import OPTION_TYPE from lib.core.enums import OS @@ -869,7 +870,10 @@ def boldifyMessage(message): def setColor(message, bold=False): retVal = message - level = extractRegexResult(r"\[(?P%s)\]" % '|'.join(_ for _ in dir(logging) if _ == _.upper()), message) or kb.get("stickyLevel") + level = extractRegexResult(r"\[(?P%s)\]" % '|'.join(_[0] for _ in getPublicTypeMembers(LOGGING_LEVELS)), message) or kb.get("stickyLevel") + + if isinstance(level, unicode): + level = unicodeencode(level) if message and getattr(LOGGER_HANDLER, "is_tty", False): # colorizing handler if bold: diff --git a/lib/core/enums.py b/lib/core/enums.py index 849a6b314..775998684 100644 --- a/lib/core/enums.py +++ b/lib/core/enums.py @@ -22,6 +22,15 @@ class SORT_ORDER: FIFTH = 4 LAST = 100 +# Reference: https://docs.python.org/2/library/logging.html#logging-levels +class LOGGING_LEVELS: + NOTSET = 0 + DEBUG = 10 + INFO = 20 + WARNING = 30 + ERROR = 40 + CRITICAL = 50 + class DBMS: ACCESS = "Microsoft Access" DB2 = "IBM DB2" diff --git a/lib/core/settings.py b/lib/core/settings.py index 3a84441b2..f0c6367c4 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.2.0" +VERSION = "1.2.2.1" 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/txt/checksum.md5 b/txt/checksum.md5 index 574108ef9..f9cccc8c0 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -27,7 +27,7 @@ a7b0c8e5a18a3abe8803999dcfc4664f lib/controller/handler.py 1e5532ede194ac9c083891c2f02bca93 lib/controller/__init__.py e3a3f5218b2e52dd0afafdfc9fed2002 lib/core/agent.py 86a4703d5474badd8462146510b2c460 lib/core/bigarray.py -27d1b0a4609eece643141408d1f18716 lib/core/common.py +17ab0324cb992a781cc197ec8c0209d7 lib/core/common.py 2a40d5b5997265daa890545d4a4a59b9 lib/core/convert.py 9f87391b6a3395f7f50830b391264f27 lib/core/data.py 72016ea5c994a711a262fd64572a0fcd lib/core/datatype.py @@ -35,7 +35,7 @@ e3a3f5218b2e52dd0afafdfc9fed2002 lib/core/agent.py 9458679feb9184f3fb1611daf1ebef63 lib/core/defaults.py a8bea09096a42a9a7feeb9d4d118ae66 lib/core/dicts.py 1a94690d60ed792ce441b6f2f4dbbef8 lib/core/dump.py -2ef745b04933855e049ba7fdc98f57b8 lib/core/enums.py +c8551f7696a76450e6d139409e4f06cd lib/core/enums.py cada93357a7321655927fc9625b3bfec lib/core/exception.py 1e5532ede194ac9c083891c2f02bca93 lib/core/__init__.py 458a194764805cd8312c14ecd4be4d1e lib/core/log.py @@ -46,7 +46,7 @@ ffa5f01f39b17c8d73423acca6cfe86a lib/core/readlineng.py 0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py a7db43859b61569b601b97f187dd31c5 lib/core/revision.py fcb74fcc9577523524659ec49e2e964b lib/core/session.py -b7bba78cd084d423c170eef9a6f5dd1f lib/core/settings.py +67ea2aee17da22379743e5dc18159f3f lib/core/settings.py d0adc28a38e43a787df4471f7f027413 lib/core/shell.py 63491be462c515a1a3880c27c2acc4a2 lib/core/subprocessng.py 505aaa61e1bba3c3d4567c3e667699e3 lib/core/target.py