Minor beautification

stamparm · stamparm · commit 3513ca66fec5 · 2020-02-07T14:26:01.000+01:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -949,6 +949,9 @@ def setColor(message, color=None, bold=False, level=None, istty=None):
             if match:
                 retVal = retVal.replace(match.group(1), colored(match.group(1), color="lightgrey"))
 
+            for match in re.finditer(r"[^\w]'([^']+)'", message):  # single-quoted
+                retVal = retVal.replace(match.group(1), colored(match.group(1), color="lightgrey"))
+
     return retVal
 
 def clearColors(message):
diff --git a/lib/core/log.py b/lib/core/log.py
@@ -74,7 +74,7 @@ def colorize(self, message, levelno):
                                     string = match.group(1)
                                     message = message.replace("'%s" % string, "'%s" % ''.join((self.csi, str(self.color_map["white"] + 30), 'm', string, self._reset(message))), 1)
                                 else:
-                                    match = re.search(r" \('(.+)'\)\Z", message)
+                                    match = re.search(r" \('(.+)'\)\Z", message) or re.search(r"output: '(.+)'\Z", message)
                                     if match:
                                         string = match.group(1)
                                         message = message.replace("'%s'" % string, "'%s'" % ''.join((self.csi, str(self.color_map["white"] + 30), 'm', string, self._reset(message))), 1)
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -18,7 +18,7 @@
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.4.2.24"
+VERSION = "1.4.2.25"
 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)
