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

Skip to content

Commit e519484

Browse files
stamparmstamparm
committed
Patching live-testing
1 parent a2c8f1d commit e519484

4 files changed

Lines changed: 311 additions & 309 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.revision import getRevisionNumber
2020

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

‎lib/core/testing.py‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ class Failures(object):
4141
failedParseOn = None
4242
failedTraceBack = None
4343

44+
_failures = Failures()
45+
4446
def smokeTest():
4547
"""
4648
Runs the basic smoke testing of a program
@@ -193,26 +195,26 @@ def liveTest():
193195
else:
194196
errMsg = "test failed"
195197

196-
if Failures.failedItems:
197-
errMsg += " at parsing items: %s" % ", ".join(i for i in Failures.failedItems)
198+
if _failures.failedItems:
199+
errMsg += " at parsing items: %s" % ", ".join(i for i in _failures.failedItems)
198200

199201
errMsg += " - scan folder: %s" % paths.SQLMAP_OUTPUT_PATH
200-
errMsg += " - traceback: %s" % bool(Failures.failedTraceBack)
202+
errMsg += " - traceback: %s" % bool(_failures.failedTraceBack)
201203

202204
if not vulnerable:
203205
errMsg += " - SQL injection not detected"
204206

205207
logger.error(errMsg)
206208
test_case_fd.write("%s\n" % errMsg)
207209

208-
if Failures.failedParseOn:
210+
if _failures.failedParseOn:
209211
console_output_fd = codecs.open(os.path.join(paths.SQLMAP_OUTPUT_PATH, "console_output"), "wb", UNICODE_ENCODING)
210-
console_output_fd.write(Failures.failedParseOn)
212+
console_output_fd.write(_failures.failedParseOn)
211213
console_output_fd.close()
212214

213-
if Failures.failedTraceBack:
215+
if _failures.failedTraceBack:
214216
traceback_fd = codecs.open(os.path.join(paths.SQLMAP_OUTPUT_PATH, "traceback"), "wb", UNICODE_ENCODING)
215-
traceback_fd.write(Failures.failedTraceBack)
217+
traceback_fd.write(_failures.failedTraceBack)
216218
traceback_fd.close()
217219

218220
beep()
@@ -233,9 +235,9 @@ def liveTest():
233235
return retVal
234236

235237
def initCase(switches, count):
236-
Failures.failedItems = []
237-
Failures.failedParseOn = None
238-
Failures.failedTraceBack = None
238+
_failures.failedItems = []
239+
_failures.failedParseOn = None
240+
_failures.failedTraceBack = None
239241

240242
paths.SQLMAP_OUTPUT_PATH = tempfile.mkdtemp(prefix="%s%d-" % (MKSTEMP_PREFIX.TESTING, count))
241243
paths.SQLMAP_DUMP_PATH = os.path.join(paths.SQLMAP_OUTPUT_PATH, "%s", "dump")
@@ -279,10 +281,10 @@ def runCase(parse):
279281
LOGGER_HANDLER.stream = sys.stdout = sys.__stdout__
280282

281283
if unhandled_exception:
282-
Failures.failedTraceBack = "unhandled exception: %s" % str(traceback.format_exc())
284+
_failures.failedTraceBack = "unhandled exception: %s" % str(traceback.format_exc())
283285
retVal = None
284286
elif handled_exception:
285-
Failures.failedTraceBack = "handled exception: %s" % str(traceback.format_exc())
287+
_failures.failedTraceBack = "handled exception: %s" % str(traceback.format_exc())
286288
retVal = None
287289
elif result is False: # this means no SQL injection has been detected - if None, ignore
288290
retVal = False
@@ -299,17 +301,17 @@ def runCase(parse):
299301
if item.startswith("r'") and item.endswith("'"):
300302
if not re.search(item[2:-1], parse_on, re.DOTALL):
301303
retVal = None
302-
Failures.failedItems.append(item)
304+
_failures.failedItems.append(item)
303305

304306
elif item not in parse_on:
305307
retVal = None
306-
Failures.failedItems.append(item)
308+
_failures.failedItems.append(item)
307309

308-
if Failures.failedItems:
309-
Failures.failedParseOn = console
310+
if _failures.failedItems:
311+
_failures.failedParseOn = console
310312

311313
elif retVal is False:
312-
Failures.failedParseOn = console
314+
_failures.failedParseOn = console
313315

314316
return retVal
315317

‎txt/checksum.md5‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ e60456db5380840a586654344003d4e6 lib/core/readlineng.py
4545
5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py
4646
99a2b496b9d5b546b335653ca801153f lib/core/revision.py
4747
7c15dd2777af4dac2c89cab6df17462e lib/core/session.py
48-
137081b65629992ef3968f0290f86955 lib/core/settings.py
48+
7592c234fac1036667aaa5a772615fa8 lib/core/settings.py
4949
7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py
5050
23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py
5151
0bc2fae1dec18cdd11954b22358293f2 lib/core/target.py
52-
3c7478f279ed1b5645b4a75b29d4ac5d lib/core/testing.py
52+
d43f059747ffd48952922c94152e2a07 lib/core/testing.py
5353
424a6cf9bdfaf7182657ed7929d7df5a lib/core/threads.py
5454
53c15b78e0288274f52410db25406432 lib/core/unescaper.py
5555
6bdc53e2ca152ff8cd35ad671e48a96b lib/core/update.py
@@ -441,7 +441,7 @@ d989813ee377252bca2103cea524c06b xml/banner/sharepoint.xml
441441
2394458d582a636c52342cff33ae3035 xml/banner/x-powered-by.xml
442442
fb93505ef0ab3b4a20900f3e5625260d xml/boundaries.xml
443443
535d625cff8418bdc086ab4e1bbf5135 xml/errors.xml
444-
2e13b9e0a51768969d4ccc02cf62ea70 xml/livetests.xml
444+
a279656ea3fcb85c727249b02f828383 xml/livetests.xml
445445
18b2c7e5738a3be72d759af96a9aaddf xml/payloads/boolean_blind.xml
446446
103a4c9b12c582b24a3fac8147a9c8d4 xml/payloads/error_based.xml
447447
06b1a210b190d52477a9d492443725b5 xml/payloads/inline_query.xml

0 commit comments

Comments
 (0)