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

Skip to content

Commit 71448b1

Browse files
stamparmstamparm
committed
Minor refactoring
1 parent a633bc7 commit 71448b1

3 files changed

Lines changed: 19 additions & 31 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.9.20"
22+
VERSION = "1.2.9.21"
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: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,16 @@ def output_colorized(self, message):
130130

131131
ctypes.windll.kernel32.SetConsoleTextAttribute(h, color)
132132

133+
def _reset(self, message):
134+
if not message.endswith(self.reset):
135+
reset = self.reset
136+
elif self.bold in message: # bold
137+
reset = self.reset + self.bold
138+
else:
139+
reset = self.reset
140+
141+
return reset
142+
133143
def colorize(self, message, levelno):
134144
if levelno in self.level_map and self.is_tty:
135145
bg, fg, bold = self.level_map[levelno]
@@ -162,51 +172,29 @@ def colorize(self, message, levelno):
162172
match = re.search(r"\A\s*\[([\d:]+)\]", message) # time
163173
if match:
164174
time = match.group(1)
165-
if not message.endswith(self.reset):
166-
reset = self.reset
167-
elif self.bold in message: # bold
168-
reset = self.reset + self.bold
169-
else:
170-
reset = self.reset
171-
message = message.replace(time, ''.join((self.csi, str(self.color_map["cyan"] + 30), 'm', time, reset)), 1)
175+
message = message.replace(time, ''.join((self.csi, str(self.color_map["cyan"] + 30), 'm', time, self._reset(message))), 1)
172176

173177
match = re.search(r"\[(#\d+)\]", message) # counter
174178
if match:
175179
counter = match.group(1)
176-
if not message.endswith(self.reset):
177-
reset = self.reset
178-
elif self.bold in message: # bold
179-
reset = self.reset + self.bold
180-
else:
181-
reset = self.reset
182-
message = message.replace(counter, ''.join((self.csi, str(self.color_map["yellow"] + 30), 'm', counter, reset)), 1)
180+
message = message.replace(counter, ''.join((self.csi, str(self.color_map["yellow"] + 30), 'm', counter, self._reset(message))), 1)
183181

184182
if level != "PAYLOAD":
185183
if any(_ in message for _ in ("parsed DBMS error message",)):
186184
string = re.search(r": '(.+)'", message).group(1)
187-
if not message.endswith(self.reset):
188-
reset = self.reset
189-
elif self.bold in message: # bold
190-
reset = self.reset + self.bold
191-
else:
192-
reset = self.reset
193-
message = message.replace("'%s'" % string, "'%s'" % ''.join((self.csi, str(self.color_map["white"] + 30), 'm', string, reset)), 1)
185+
message = message.replace("'%s'" % string, "'%s'" % ''.join((self.csi, str(self.color_map["white"] + 30), 'm', string, self._reset(message))), 1)
194186
else:
195187
for match in re.finditer(r"[^\w]'([^']+)'", message): # single-quoted
196188
string = match.group(1)
197-
if not message.endswith(self.reset):
198-
reset = self.reset
199-
elif self.bold in message: # bold
200-
reset = self.reset + self.bold
201-
else:
202-
reset = self.reset
203-
message = message.replace("'%s'" % string, "'%s'" % ''.join((self.csi, str(self.color_map["white"] + 30), 'm', string, reset)), 1)
189+
message = message.replace("'%s'" % string, "'%s'" % ''.join((self.csi, str(self.color_map["white"] + 30), 'm', string, self._reset(message))), 1)
204190
else:
205191
message = ''.join((self.csi, ';'.join(params), 'm', message, self.reset))
206192

207193
if prefix:
208194
message = "%s%s" % (prefix, message)
209195

196+
message = message.replace("%s]" % self.bold, "]%s" % self.bold) # dirty patch
197+
210198
return message
211199

212200
def format(self, record):

‎txt/checksum.md5‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ c8c386d644d57c659d74542f5f57f632 lib/core/patch.py
5050
0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py
5151
a7db43859b61569b601b97f187dd31c5 lib/core/revision.py
5252
fcb74fcc9577523524659ec49e2e964b lib/core/session.py
53-
03a73c87322c0165d98bcc1df2794e9f lib/core/settings.py
53+
3698f90905c46eb938cf0b0f5235132f lib/core/settings.py
5454
dd68a9d02fccb4fa1428b20e15b0db5d lib/core/shell.py
5555
a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py
5656
248bd121e0565318e1efaff54aa427bc lib/core/target.py
@@ -287,7 +287,7 @@ f2b9eac52d346315f5705f71beeda791 tamper/varnish.py
287287
0e40966a51d1eb5d42a2159d2015a8a4 tamper/versionedkeywords.py
288288
0fba004bf1be6edbefbda89f23f4e518 tamper/versionedmorekeywords.py
289289
23d845e9f937f2a31c43767b8a8fcff6 tamper/xforwardedfor.py
290-
b422795c5e589decec725963e480ffba thirdparty/ansistrm/ansistrm.py
290+
1ebf563bb2cb18b68ea952418bba0ec5 thirdparty/ansistrm/ansistrm.py
291291
d41d8cd98f00b204e9800998ecf8427e thirdparty/ansistrm/__init__.py
292292
8e775c25bc9e84891ad6fcb4f0005c23 thirdparty/beautifulsoup/beautifulsoup.py
293293
cb2e1fe7c404dff41a2ae9132828f532 thirdparty/beautifulsoup/__init__.py

0 commit comments

Comments
 (0)