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

Skip to content

Commit 212c1ec

Browse files
stamparmstamparm
committed
Couple of fixes and some testing stuff
1 parent 381deb6 commit 212c1ec

7 files changed

Lines changed: 21 additions & 10 deletions

File tree

‎lib/core/optiondict.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@
235235
"profile": "boolean",
236236
"forceDns": "boolean",
237237
"ignore401": "boolean",
238+
"murphyRate": "integer",
238239
"smokeTest": "boolean",
239240
"liveTest": "boolean",
240241
"stopFail": "boolean",

‎lib/core/settings.py‎

Lines changed: 4 additions & 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.40"
22+
VERSION = "1.0.9.41"
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}
@@ -86,6 +86,9 @@
8686
# Timeout before the pre-connection candidate is being disposed (because of high probability that the web server will reset it)
8787
PRECONNECT_CANDIDATE_TIMEOUT = 10
8888

89+
# Maximum sleep time in "Murphy" (testing) mode
90+
MAX_MURPHY_SLEEP_TIME = 3
91+
8992
# Regular expression used for extracting results from Google search
9093
GOOGLE_REGEX = r"webcache\.googleusercontent\.com/search\?q=cache:[^:]+:([^+]+)\+&amp;cd=|url\?\w+=((?![^>]+webcache\.googleusercontent\.com)http[^>]+)&(sa=U|rct=j)"
9194

‎lib/core/threads.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ def reset(self):
5959
self.retriesCount = 0
6060
self.seqMatcher = difflib.SequenceMatcher(None)
6161
self.shared = shared
62+
self.validationRun = 0
6263
self.valueStack = []
6364

6465
ThreadData = _ThreadData()

‎lib/parse/cmdline.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,9 @@ def cmdLineParser(argv=None):
759759
parser.add_option("--dummy", dest="dummy", action="store_true",
760760
help=SUPPRESS_HELP)
761761

762+
parser.add_option("--murphy-rate", dest="murphyRate", type="int",
763+
help=SUPPRESS_HELP)
764+
762765
parser.add_option("--pickled-options", dest="pickledOptions",
763766
help=SUPPRESS_HELP)
764767

‎lib/request/connect.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ class WebSocketException(Exception):
9090
from lib.core.settings import MAX_CONNECTION_CHUNK_SIZE
9191
from lib.core.settings import MAX_CONNECTIONS_REGEX
9292
from lib.core.settings import MAX_CONNECTION_TOTAL_SIZE
93+
from lib.core.settings import MAX_MURPHY_SLEEP_TIME
9394
from lib.core.settings import META_REFRESH_REGEX
9495
from lib.core.settings import MIN_TIME_RESPONSES
9596
from lib.core.settings import IS_WIN
@@ -224,8 +225,10 @@ def getPage(**kwargs):
224225

225226
if conf.offline:
226227
return None, None, None
227-
elif conf.dummy:
228-
return getUnicode(randomStr(int(randomInt()), alphabet=[chr(_) for _ in xrange(256)]), {}, int(randomInt())), None, None
228+
elif conf.dummy or conf.murphyRate and randomInt() % conf.murphyRate == 0:
229+
if conf.murphyRate:
230+
time.sleep(randomInt() % (MAX_MURPHY_SLEEP_TIME + 1))
231+
return getUnicode(randomStr(int(randomInt()), alphabet=[chr(_) for _ in xrange(256)]), {}, int(randomInt())), None, None if not conf.murphyRate else randomInt(3)
229232

230233
threadData = getCurrentThreadData()
231234
with kb.locks.request:

‎lib/techniques/blind/inference.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ def getChar(idx, charTbl=None, continuousOrder=True, expand=charsetType is None,
324324
if not timeBasedCompare:
325325
unexpectedCode |= threadData.lastCode not in (kb.injection.data[kb.technique].falseCode, kb.injection.data[kb.technique].trueCode)
326326
if unexpectedCode:
327-
warnMsg = "unexpected HTTP code '%d' detected. Will use (extra) validation step in similar cases" % threadData.lastCode
327+
warnMsg = "unexpected HTTP code '%s' detected. Will use (extra) validation step in similar cases" % threadData.lastCode
328328
singleTimeWarnMessage(warnMsg)
329329

330330
if result:

‎txt/checksum.md5‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,26 @@ e4ca0fd47f20cf7ba6a5f5cbf980073c lib/core/decorators.py
3838
e4aec2b11c1ad6039d0c3dbbfbc5eb1a lib/core/exception.py
3939
cc9c82cfffd8ee9b25ba3af6284f057e lib/core/__init__.py
4040
91c514013daa796e2cdd940389354eac lib/core/log.py
41-
b9779615206791e6ebbaa84947842b49 lib/core/optiondict.py
41+
5b079749c50240602ea92637e268ed31 lib/core/optiondict.py
4242
74d826338a2cd66a4724d8486a648d93 lib/core/option.py
4343
1e8948dddbd12def5c2af52530738059 lib/core/profiling.py
4444
e60456db5380840a586654344003d4e6 lib/core/readlineng.py
4545
5ef56abb8671c2ca6ceecb208258e360 lib/core/replication.py
4646
99a2b496b9d5b546b335653ca801153f lib/core/revision.py
4747
7c15dd2777af4dac2c89cab6df17462e lib/core/session.py
48-
beddfa335e49041ded23235064af09de lib/core/settings.py
48+
f736ee4e7e504498859dce2171991550 lib/core/settings.py
4949
7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py
5050
23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py
5151
0bc2fae1dec18cdd11954b22358293f2 lib/core/target.py
5252
d43f059747ffd48952922c94152e2a07 lib/core/testing.py
53-
7ec80da7d7fa8ceaf2ff606cfa578c15 lib/core/threads.py
53+
2cafee22d9f8018e7efff0a5e3178596 lib/core/threads.py
5454
53c15b78e0288274f52410db25406432 lib/core/unescaper.py
5555
6bdc53e2ca152ff8cd35ad671e48a96b lib/core/update.py
5656
8485a3cd94c0a5af2718bad60c5f1ae5 lib/core/wordlist.py
5757
354ecc0c6d3e0ac9c06ed897c4d52edf lib/core/xmldump.py
5858
cc9c82cfffd8ee9b25ba3af6284f057e lib/__init__.py
5959
c1288bc4ce5651dbdd82d4a9435fdc03 lib/parse/banner.py
60-
daea32290b63c43f7d1c0e14c66d4826 lib/parse/cmdline.py
60+
498be08b12a01bd79d82fc993bd07965 lib/parse/cmdline.py
6161
8ec4d4f02634834701f8258726f2e511 lib/parse/configfile.py
6262
fe4e2152292587928edb94c9a4d311ff lib/parse/handler.py
6363
8e6bfb13e5a34b2610f3ff23467a34cf lib/parse/headers.py
@@ -68,7 +68,7 @@ b40a4c5d91770d347df36d3065b63798 lib/parse/sitemap.py
6868
9299f21804033f099681525bb9bf51c0 lib/request/basicauthhandler.py
6969
ca9879ea9277810c5fce0f0d8d2f8e03 lib/request/basic.py
7070
c48285682a61d49982cb508351013cb4 lib/request/comparison.py
71-
29148e4412209526b18acbd8a942fe03 lib/request/connect.py
71+
c8aeed55d933b4944da038fdee4cdbc6 lib/request/connect.py
7272
49b4c583af68689de5f9acb162de2939 lib/request/direct.py
7373
1a46f7bb26b23ec0c0d9d9c95828241b lib/request/dns.py
7474
70ceefe39980611494d4f99afb96f652 lib/request/httpshandler.py
@@ -87,7 +87,7 @@ cc9c82cfffd8ee9b25ba3af6284f057e lib/takeover/__init__.py
8787
7d6cd7bdfc8f4bc4e8aed60c84cdf87f lib/takeover/udf.py
8888
f6e3084abd506925a8be3d1c0a6d058c lib/takeover/web.py
8989
9af83a62de360184f1c14e69b8a95cfe lib/takeover/xp_cmdshell.py
90-
9e4ae2df75cab68ea297f0db50b574c7 lib/techniques/blind/inference.py
90+
0b44d8de954e74ac9bac13594b9d81e8 lib/techniques/blind/inference.py
9191
cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/blind/__init__.py
9292
cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/brute/__init__.py
9393
d36effffe64e63ef9b3be490f850e2cc lib/techniques/brute/use.py

0 commit comments

Comments
 (0)