Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e84142b

Browse files
stamparmstamparm
committed
Fixes #3172 
1 parent b445512 commit e84142b

3 files changed

Lines changed: 33 additions & 29 deletions

File tree

‎lib/core/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from lib.core.enums import OS
2020

2121
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
22-
VERSION = "1.2.7.7"
22+
VERSION = "1.2.7.8"
2323
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2424
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2525
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

‎thirdparty/ansistrm/ansistrm.py‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class ColorizingStreamHandler(logging.StreamHandler):
4545
}
4646
csi = '\x1b['
4747
reset = '\x1b[0m'
48+
bold = "\x1b[1m"
4849
disable_coloring = False
4950

5051
@property
@@ -150,40 +151,43 @@ def colorize(self, message, levelno):
150151
else:
151152
prefix = ""
152153

153-
match = re.search(r"\[([A-Z ]+)\]", message)
154+
match = re.search(r"\[([A-Z ]+)\]", message) # log level
154155
if match:
155156
level = match.group(1)
156-
if message.startswith("\x1b[1m"):
157-
message = message.replace("\x1b[1m", "")
158-
reset = self.reset + "\x1b[1m"
157+
if message.startswith(self.bold):
158+
message = message.replace(self.bold, "")
159+
reset = self.reset + self.bold
159160
params.append('1')
160161
else:
161162
reset = self.reset
162163
message = message.replace(level, ''.join((self.csi, ';'.join(params), 'm', level, reset)), 1)
163-
else:
164-
message = "%s%s" % (prefix, ''.join((self.csi, ';'.join(params), 'm', message, self.reset)))
165164

166-
match = re.search(r"\A\s*\[([\d:]+)\]", message)
167-
if match:
168-
time = match.group(1)
169-
if not message.endswith(self.reset):
170-
reset = self.reset
171-
elif message.startswith("\x1b[1m"): # bold
172-
reset = self.reset + "\x1b[1m"
173-
else:
174-
reset = self.reset
175-
message = message.replace(time, ''.join((self.csi, str(self.color_map["cyan"] + 30), 'm', time, reset)), 1)
165+
match = re.search(r"\A\s*\[([\d:]+)\]", message) # time
166+
if match:
167+
time = match.group(1)
168+
if not message.endswith(self.reset):
169+
reset = self.reset
170+
elif message.startswith(self.bold): # bold
171+
reset = self.reset + self.bold
172+
else:
173+
reset = self.reset
174+
message = message.replace(time, ''.join((self.csi, str(self.color_map["cyan"] + 30), 'm', time, reset)), 1)
175+
176+
match = re.search(r"\[(#\d+)\]", message) # counter
177+
if match:
178+
counter = match.group(1)
179+
if not message.endswith(self.reset):
180+
reset = self.reset
181+
elif message.startswith(self.bold): # bold
182+
reset = self.reset + self.bold
183+
else:
184+
reset = self.reset
185+
message = message.replace(counter, ''.join((self.csi, str(self.color_map["yellow"] + 30), 'm', counter, reset)), 1)
186+
else:
187+
message = ''.join((self.csi, ';'.join(params), 'm', message, self.reset))
176188

177-
match = re.search(r"\[(#\d+)\]", message)
178-
if match:
179-
counter = match.group(1)
180-
if not message.endswith(self.reset):
181-
reset = self.reset
182-
elif message.startswith("\x1b[1m"): # bold
183-
reset = self.reset + "\x1b[1m"
184-
else:
185-
reset = self.reset
186-
message = message.replace(counter, ''.join((self.csi, str(self.color_map["yellow"] + 30), 'm', counter, reset)), 1)
189+
if prefix:
190+
message = "%s%s" % (prefix, message)
187191

188192
return message
189193

‎txt/checksum.md5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ c8c386d644d57c659d74542f5f57f632 lib/core/patch.py
4848
0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py
4949
a7db43859b61569b601b97f187dd31c5 lib/core/revision.py
5050
fcb74fcc9577523524659ec49e2e964b lib/core/session.py
51-
c4439324bd9484f4a35d648a20d7bf87 lib/core/settings.py
51+
21189972adee4e784a2ffad146550749 lib/core/settings.py
5252
dd68a9d02fccb4fa1428b20e15b0db5d lib/core/shell.py
5353
a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py
5454
95f04c1c1d8c3998d86e1bdf0e12771c lib/core/target.py
@@ -285,7 +285,7 @@ fd1bff6caefe5007444f7a0fabbc8ce9 tamper/space2mysqlblank.py
285285
929a2586dbb7b758a454eb09e13e5a73 tamper/versionedkeywords.py
286286
3aff4d344ebd4f38e033e73b63f84447 tamper/versionedmorekeywords.py
287287
ed1acafbac707bfa71c72f76b81c1bdd tamper/xforwardedfor.py
288-
2350c4ab8a9972980ad93466066294e9 thirdparty/ansistrm/ansistrm.py
288+
0424227a228a2b5b53ad1d6df4240ddd thirdparty/ansistrm/ansistrm.py
289289
d41d8cd98f00b204e9800998ecf8427e thirdparty/ansistrm/__init__.py
290290
8e775c25bc9e84891ad6fcb4f0005c23 thirdparty/beautifulsoup/beautifulsoup.py
291291
cb2e1fe7c404dff41a2ae9132828f532 thirdparty/beautifulsoup/__init__.py

0 commit comments

Comments
 (0)