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

Skip to content

Commit a5e3dce

Browse files
stamparmstamparm
committed
Proper naming
1 parent 71448b1 commit a5e3dce

8 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎doc/CHANGELOG.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Implemented support for automatic decoding of page content through detected charset.
44
* Implemented mechanism for proper data dumping on DBMSes not supporting `LIMIT/OFFSET` like mechanism(s) (e.g. Microsoft SQL Server, Sybase, etc.).
55
* Major improvements to program stabilization based on user reports.
6-
* Added new tampering scripts avoiding popular WAF/IPS/IDS mechanisms.
6+
* Added new tampering scripts avoiding popular WAF/IPS mechanisms.
77
* Fixed major bug with DNS leaking in Tor mode.
88
* Added wordlist compilation made of the most popular cracking dictionaries.
99
* Implemented multi-processor hash cracking routine(s).
@@ -23,7 +23,7 @@
2323
* Added option `--csv-del` for manually setting delimiting character used in CSV output.
2424
* Added switch `--hex` for using DBMS hex conversion function(s) for data retrieval.
2525
* Added switch `--smart` for conducting through tests only in case of positive heuristic(s).
26-
* Added switch `--check-waf` for checking of existence of WAF/IPS/IDS protection.
26+
* Added switch `--check-waf` for checking of existence of WAF/IPS protection.
2727
* Added switch `--schema` to enumerate DBMS schema: shows all columns of all databases' tables.
2828
* Added switch `--count` to count the number of entries for a specific table or all database(s) tables.
2929
* Major improvements to switches `--tables` and `--columns`.
@@ -55,7 +55,7 @@
5555
* Added option `--host` to set the HTTP Host header value.
5656
* Added switch `--hostname` to turn on retrieval of DBMS server hostname.
5757
* Added switch `--hpp` to turn on the usage of HTTP parameter pollution WAF bypass method.
58-
* Added switch `--identify-waf` for turning on the thorough testing of WAF/IPS/IDS protection.
58+
* Added switch `--identify-waf` for turning on the thorough testing of WAF/IPS protection.
5959
* Added switch `--ignore-401` to ignore HTTP Error Code 401 (Unauthorized).
6060
* Added switch `--invalid-bignum` for usage of big numbers while invalidating values.
6161
* Added switch `--invalid-logical` for usage of logical operations while invalidating values.
@@ -78,7 +78,7 @@
7878
* Added option `--skip` to skip testing of given parameter(s).
7979
* Added switch `--skip-static` to skip testing parameters that not appear to be dynamic.
8080
* Added switch `--skip-urlencode` to skip URL encoding of payload data.
81-
* Added switch `--skip-waf` to skip heuristic detection of WAF/IPS/IDS protection.
81+
* Added switch `--skip-waf` to skip heuristic detection of WAF/IPS protection.
8282
* Added switch `--smart` to conduct thorough tests only if positive heuristic(s).
8383
* Added option `--sql-file` for setting file(s) holding SQL statements to be executed (in case of stacked SQLi).
8484
* Added switch `--sqlmap-shell` to turn on interactive sqlmap shell prompt.

‎extra/wafdetectify/wafdetectify.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def main():
107107
continue
108108

109109
if function(get_page):
110-
print colorize("[!] WAF/IPS/IDS identified as '%s'" % product)
110+
print colorize("[!] WAF/IPS identified as '%s'" % product)
111111
found = True
112112

113113
if not found:

‎lib/controller/checks.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ def _():
896896

897897
kb.injection = injection
898898

899-
for i in xrange(conf.level):
899+
for level in xrange(conf.level):
900900
while True:
901901
randInt1, randInt2, randInt3 = (_() for j in xrange(3))
902902

@@ -1338,15 +1338,15 @@ def checkWaf():
13381338
if _ is not None:
13391339
if _:
13401340
warnMsg = "previous heuristics detected that the target "
1341-
warnMsg += "is protected by some kind of WAF/IPS/IDS"
1341+
warnMsg += "is protected by some kind of WAF/IPS"
13421342
logger.critical(warnMsg)
13431343
return _
13441344

13451345
if not kb.originalPage:
13461346
return None
13471347

13481348
infoMsg = "checking if the target is protected by "
1349-
infoMsg += "some kind of WAF/IPS/IDS"
1349+
infoMsg += "some kind of WAF/IPS"
13501350
logger.info(infoMsg)
13511351

13521352
retVal = False
@@ -1378,12 +1378,12 @@ def checkWaf():
13781378

13791379
if retVal:
13801380
warnMsg = "heuristics detected that the target "
1381-
warnMsg += "is protected by some kind of WAF/IPS/IDS"
1381+
warnMsg += "is protected by some kind of WAF/IPS"
13821382
logger.critical(warnMsg)
13831383

13841384
if not conf.identifyWaf:
13851385
message = "do you want sqlmap to try to detect backend "
1386-
message += "WAF/IPS/IDS? [y/N] "
1386+
message += "WAF/IPS? [y/N] "
13871387

13881388
if readInput(message, default='N', boolean=True):
13891389
conf.identifyWaf = True
@@ -1407,7 +1407,7 @@ def identifyWaf():
14071407
kb.testMode = True
14081408

14091409
infoMsg = "using WAF scripts to detect "
1410-
infoMsg += "backend WAF/IPS/IDS protection"
1410+
infoMsg += "backend WAF/IPS protection"
14111411
logger.info(infoMsg)
14121412

14131413
@cachedmethod
@@ -1434,7 +1434,7 @@ def _(*args, **kwargs):
14341434
continue
14351435

14361436
try:
1437-
logger.debug("checking for WAF/IPS/IDS product '%s'" % product)
1437+
logger.debug("checking for WAF/IPS product '%s'" % product)
14381438
found = function(_)
14391439
except Exception, ex:
14401440
errMsg = "exception occurred while running "
@@ -1444,7 +1444,7 @@ def _(*args, **kwargs):
14441444
found = False
14451445

14461446
if found:
1447-
errMsg = "WAF/IPS/IDS identified as '%s'" % product
1447+
errMsg = "WAF/IPS identified as '%s'" % product
14481448
logger.critical(errMsg)
14491449

14501450
retVal.append(product)
@@ -1456,7 +1456,7 @@ def _(*args, **kwargs):
14561456
with openFile(filename, "w+b") as f:
14571457
f.write(kb.wafSpecificResponse)
14581458

1459-
message = "WAF/IPS/IDS specific response can be found in '%s'. " % filename
1459+
message = "WAF/IPS specific response can be found in '%s'. " % filename
14601460
message += "If you know the details on used protection please "
14611461
message += "report it along with specific response "
14621462
message += "to '%s'" % DEV_EMAIL_ADDRESS
@@ -1473,7 +1473,7 @@ def _(*args, **kwargs):
14731473
if not choice:
14741474
raise SqlmapUserQuitException
14751475
else:
1476-
warnMsg = "WAF/IPS/IDS product hasn't been identified"
1476+
warnMsg = "WAF/IPS product hasn't been identified"
14771477
logger.warn(warnMsg)
14781478

14791479
kb.testType = None

‎lib/core/option.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ def _setTamperingFunctions():
824824

825825
def _setWafFunctions():
826826
"""
827-
Loads WAF/IPS/IDS detecting functions from script(s)
827+
Loads WAF/IPS detecting functions from script(s)
828828
"""
829829

830830
if conf.identifyWaf:

‎lib/core/settings.py‎

Lines changed: 4 additions & 4 deletions
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.21"
22+
VERSION = "1.2.9.22"
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)
@@ -45,10 +45,10 @@
4545
DIFF_TOLERANCE = 0.05
4646
CONSTANT_RATIO = 0.9
4747

48-
# Ratio used in heuristic check for WAF/IPS/IDS protected targets
48+
# Ratio used in heuristic check for WAF/IPS protected targets
4949
IDS_WAF_CHECK_RATIO = 0.5
5050

51-
# Timeout used in heuristic check for WAF/IPS/IDS protected targets
51+
# Timeout used in heuristic check for WAF/IPS protected targets
5252
IDS_WAF_CHECK_TIMEOUT = 10
5353

5454
# Lower and upper values for match ratio in case of stable page
@@ -531,7 +531,7 @@
531531
# Value to look for in response to CHECK_INTERNET_ADDRESS
532532
CHECK_INTERNET_VALUE = "IP Address Details"
533533

534-
# Vectors used for provoking specific WAF/IPS/IDS behavior(s)
534+
# Vectors used for provoking specific WAF/IPS behavior(s)
535535
WAF_ATTACK_VECTORS = (
536536
"", # NIL
537537
"search=<script>alert(1)</script>",

‎lib/parse/cmdline.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ def cmdLineParser(argv=None):
635635
help="Use Google dork results from specified page number")
636636

637637
miscellaneous.add_option("--identify-waf", dest="identifyWaf", action="store_true",
638-
help="Make a thorough testing for a WAF/IPS/IDS protection")
638+
help="Make a thorough testing for a WAF/IPS protection")
639639

640640
miscellaneous.add_option("--list-tampers", dest="listTampers", action="store_true",
641641
help="Display list of available tamper scripts")
@@ -650,7 +650,7 @@ def cmdLineParser(argv=None):
650650
help="Safely remove all content from sqlmap data directory")
651651

652652
miscellaneous.add_option("--skip-waf", dest="skipWaf", action="store_true",
653-
help="Skip heuristic detection of WAF/IPS/IDS protection")
653+
help="Skip heuristic detection of WAF/IPS protection")
654654

655655
miscellaneous.add_option("--smart", dest="smart", action="store_true",
656656
help="Conduct thorough tests only if positive heuristic(s)")

‎lib/request/connect.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ class _(dict):
649649
warnMsg = "connection was forcibly closed by the target URL"
650650
elif "timed out" in tbMsg:
651651
if kb.testMode and kb.testType not in (None, PAYLOAD.TECHNIQUE.TIME, PAYLOAD.TECHNIQUE.STACKED):
652-
singleTimeWarnMessage("there is a possibility that the target (or WAF/IPS/IDS) is dropping 'suspicious' requests")
652+
singleTimeWarnMessage("there is a possibility that the target (or WAF/IPS) is dropping 'suspicious' requests")
653653
kb.droppingRequests = True
654654
warnMsg = "connection timed out to the target URL"
655655
elif "Connection reset" in tbMsg:
@@ -658,7 +658,7 @@ class _(dict):
658658
conf.disablePrecon = True
659659

660660
if kb.testMode:
661-
singleTimeWarnMessage("there is a possibility that the target (or WAF/IPS/IDS) is resetting 'suspicious' requests")
661+
singleTimeWarnMessage("there is a possibility that the target (or WAF/IPS) is resetting 'suspicious' requests")
662662
kb.droppingRequests = True
663663
warnMsg = "connection reset to the target URL"
664664
elif "URLError" in tbMsg or "error" in tbMsg:
@@ -1235,7 +1235,7 @@ def _randomizeParameter(paramString, randomParameter):
12351235
warnMsg = "site returned insanely large response"
12361236
if kb.testMode:
12371237
warnMsg += " in testing phase. This is a common "
1238-
warnMsg += "behavior in custom WAF/IPS/IDS solutions"
1238+
warnMsg += "behavior in custom WAF/IPS solutions"
12391239
singleTimeWarnMessage(warnMsg)
12401240

12411241
if conf.secondUrl:

‎txt/checksum.md5‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ e4805169a081b834ca51a60a150c7247 extra/shutils/newlines.py
2222
1e5532ede194ac9c083891c2f02bca93 extra/sqlharvest/__init__.py
2323
b3e60ea4e18a65c48515d04aab28ff68 extra/sqlharvest/sqlharvest.py
2424
1e5532ede194ac9c083891c2f02bca93 extra/wafdetectify/__init__.py
25-
1c7e6968f71214f8a0355420f3914f27 extra/wafdetectify/wafdetectify.py
25+
c1bccc94522d3425a372dcd57f78418e extra/wafdetectify/wafdetectify.py
2626
3459c562a6abb9b4bdcc36925f751f3e lib/controller/action.py
27-
2058987606ad75435c69d28cab11ef9e lib/controller/checks.py
27+
0d4c9c5936d0c063f4b08318f26ad5ca lib/controller/checks.py
2828
c414cecdb0472c92cf50ed5b01e4438c lib/controller/controller.py
2929
c7443613a0a2505b1faec931cee2a6ef lib/controller/handler.py
3030
1e5532ede194ac9c083891c2f02bca93 lib/controller/__init__.py
@@ -43,14 +43,14 @@ cada93357a7321655927fc9625b3bfec lib/core/exception.py
4343
1e5532ede194ac9c083891c2f02bca93 lib/core/__init__.py
4444
458a194764805cd8312c14ecd4be4d1e lib/core/log.py
4545
7d6edc552e08c30f4f4d49fa93b746f1 lib/core/optiondict.py
46-
62fb1b8e7a82c726eb9631daac4c82e9 lib/core/option.py
46+
c59c0bfccf3e906564d82adf1fcd17de lib/core/option.py
4747
c8c386d644d57c659d74542f5f57f632 lib/core/patch.py
4848
6783160150b4711d02c56ee2beadffdb lib/core/profiling.py
4949
6f654e1715571eff68a0f8af3d62dcf8 lib/core/readlineng.py
5050
0c3eef46bdbf87e29a3f95f90240d192 lib/core/replication.py
5151
a7db43859b61569b601b97f187dd31c5 lib/core/revision.py
5252
fcb74fcc9577523524659ec49e2e964b lib/core/session.py
53-
3698f90905c46eb938cf0b0f5235132f lib/core/settings.py
53+
1778dd902fbe5392377fd9b723898bbb lib/core/settings.py
5454
dd68a9d02fccb4fa1428b20e15b0db5d lib/core/shell.py
5555
a7edc9250d13af36ac0108f259859c19 lib/core/subprocessng.py
5656
248bd121e0565318e1efaff54aa427bc lib/core/target.py
@@ -61,7 +61,7 @@ b35636650cfe721f5cc47fb91737c061 lib/core/update.py
6161
e772deb63270375e685fa5a7b775c382 lib/core/wordlist.py
6262
1e5532ede194ac9c083891c2f02bca93 lib/__init__.py
6363
7620f1f4b8791e13c7184c06b5421754 lib/parse/banner.py
64-
7b2a20d7f149cc2522275e5df23bdc54 lib/parse/cmdline.py
64+
fc5a42940327dd3f40a780c865b6b136 lib/parse/cmdline.py
6565
fb2e2f05dde98caeac6ccf3e67192177 lib/parse/configfile.py
6666
3794ff139869f5ae8e81cfdbe5714f56 lib/parse/handler.py
6767
6bab53ea9d75bc9bb8169d3e8f3f149f lib/parse/headers.py
@@ -72,7 +72,7 @@ f2af274126ce0a789027d35d367f2b9e lib/parse/payloads.py
7272
30eed3a92a04ed2c29770e1b10d39dc0 lib/request/basicauthhandler.py
7373
2b81435f5a7519298c15c724e3194a0d lib/request/basic.py
7474
859b6ad583e0ffba154f17ee179b5b89 lib/request/comparison.py
75-
84f9cb02454fa21a619ccd2b3fd294d4 lib/request/connect.py
75+
b744d840de253c05e808a72d6d11dc5d lib/request/connect.py
7676
dd4598675027fae99f2e2475b05986da lib/request/direct.py
7777
2044fce3f4ffa268fcfaaf63241b1e64 lib/request/dns.py
7878
98535d0efca5551e712fcc4b34a3f772 lib/request/httpshandler.py

0 commit comments

Comments
 (0)