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

Skip to content

Commit 0398cbd

Browse files
stamparmstamparm
committed
Minor refactoring
1 parent e0149e1 commit 0398cbd

10 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎lib/core/common.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3228,7 +3228,7 @@ def maskSensitiveData(msg):
32283228

32293229
retVal = getUnicode(msg)
32303230

3231-
for item in filter(None, map(lambda x: conf.get(x), ("hostname", "data", "googleDork", "authCred", "proxyCred", "tbl", "db", "col", "user", "cookie", "proxy", "rFile", "wFile", "dFile"))):
3231+
for item in filter(None, map(lambda x: conf.get(x), ("hostname", "data", "dnsDomain", "googleDork", "authCred", "proxyCred", "tbl", "db", "col", "user", "cookie", "proxy", "rFile", "wFile", "dFile"))):
32323232
regex = SENSITIVE_DATA_REGEX % re.sub("(\W)", r"\\\1", getUnicode(item))
32333233
while extractRegexResult(regex, retVal):
32343234
value = extractRegexResult(regex, retVal)

‎lib/core/option.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2277,7 +2277,7 @@ def _setTrafficOutputFP():
22772277
conf.trafficFP = openFile(conf.trafficFile, "w+")
22782278

22792279
def _setDNSServer():
2280-
if not conf.dnsName:
2280+
if not conf.dnsDomain:
22812281
return
22822282

22832283
infoMsg = "setting up DNS server instance"

‎lib/core/optiondict.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"uCols": "string",
107107
"uChar": "string",
108108
"uFrom": "string",
109-
"dnsName": "string",
109+
"dnsDomain": "string",
110110
"secondOrder": "string",
111111
},
112112

‎lib/core/settings.py‎

Lines changed: 2 additions & 2 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.0.10.52"
22+
VERSION = "1.0.10.53"
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)
@@ -398,7 +398,7 @@
398398
MAX_INT = sys.maxint
399399

400400
# Options that need to be restored in multiple targets run mode
401-
RESTORE_MERGED_OPTIONS = ("col", "db", "dnsName", "privEsc", "tbl", "regexp", "string", "textOnly", "threads", "timeSec", "tmpPath", "uChar", "user")
401+
RESTORE_MERGED_OPTIONS = ("col", "db", "dnsDomain", "privEsc", "tbl", "regexp", "string", "textOnly", "threads", "timeSec", "tmpPath", "uChar", "user")
402402

403403
# Parameters to be ignored in detection phase (upper case)
404404
IGNORE_PARAMETERS = ("__VIEWSTATE", "__VIEWSTATEENCRYPTED", "__VIEWSTATEGENERATOR", "__EVENTARGUMENT", "__EVENTTARGET", "__EVENTVALIDATION", "ASPSESSIONID", "ASP.NET_SESSIONID", "JSESSIONID", "CFID", "CFTOKEN")

‎lib/parse/cmdline.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ def cmdLineParser(argv=None):
364364
techniques.add_option("--union-from", dest="uFrom",
365365
help="Table to use in FROM part of UNION query SQL injection")
366366

367-
techniques.add_option("--dns-domain", dest="dnsName",
367+
techniques.add_option("--dns-domain", dest="dnsDomain",
368368
help="Domain name used for DNS exfiltration attack")
369369

370370
techniques.add_option("--second-order", dest="secondOrder",

‎lib/request/inject.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
def _goDns(payload, expression):
5858
value = None
5959

60-
if conf.dnsName and kb.dnsTest is not False and not kb.testMode and Backend.getDbms() is not None:
60+
if conf.dnsDomain and kb.dnsTest is not False and not kb.testMode and Backend.getDbms() is not None:
6161
if kb.dnsTest is None:
6262
dnsTest(payload)
6363

@@ -293,7 +293,7 @@ def _goBooleanProxy(expression):
293293

294294
initTechnique(kb.technique)
295295

296-
if conf.dnsName:
296+
if conf.dnsDomain:
297297
query = agent.prefixQuery(kb.injection.data[kb.technique].vector)
298298
query = agent.suffixQuery(query)
299299
payload = agent.payload(newValue=query)
@@ -413,7 +413,7 @@ def getValue(expression, blind=True, union=True, error=True, time=True, fromUser
413413
count += 1
414414
found = (value is not None) or (value is None and expectingNone) or count >= MAX_TECHNIQUES_PER_VALUE
415415

416-
if found and conf.dnsName:
416+
if found and conf.dnsDomain:
417417
_ = "".join(filter(None, (key if isTechniqueAvailable(value) else None for key, value in {"E": PAYLOAD.TECHNIQUE.ERROR, "Q": PAYLOAD.TECHNIQUE.QUERY, "U": PAYLOAD.TECHNIQUE.UNION}.items())))
418418
warnMsg = "option '--dns-domain' will be ignored "
419419
warnMsg += "as faster techniques are usable "

‎lib/techniques/dns/test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def dnsTest(payload):
2424
if not kb.dnsTest:
2525
errMsg = "data retrieval through DNS channel failed"
2626
if not conf.forceDns:
27-
conf.dnsName = None
27+
conf.dnsDomain = None
2828
errMsg += ". Turning off DNS exfiltration support"
2929
logger.error(errMsg)
3030
else:

‎lib/techniques/dns/use.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def dnsUse(payload, expression):
4646
count = 0
4747
offset = 1
4848

49-
if conf.dnsName and Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.ORACLE, DBMS.MYSQL, DBMS.PGSQL):
49+
if conf.dnsDomain and Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.ORACLE, DBMS.MYSQL, DBMS.PGSQL):
5050
output = hashDBRetrieve(expression, checkConf=True)
5151

5252
if output and PARTIAL_VALUE_MARKER in output or kb.dnsTest is None:
@@ -69,7 +69,7 @@ def dnsUse(payload, expression):
6969
nulledCastedField = agent.hexConvertField(nulledCastedField)
7070
expressionReplaced = expression.replace(fieldToCastStr, nulledCastedField, 1)
7171

72-
expressionRequest = getSQLSnippet(Backend.getIdentifiedDbms(), "dns_request", PREFIX=prefix, QUERY=expressionReplaced, SUFFIX=suffix, DOMAIN=conf.dnsName)
72+
expressionRequest = getSQLSnippet(Backend.getIdentifiedDbms(), "dns_request", PREFIX=prefix, QUERY=expressionReplaced, SUFFIX=suffix, DOMAIN=conf.dnsDomain)
7373
expressionUnescaped = unescaper.escape(expressionRequest)
7474

7575
if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.PGSQL):
@@ -111,7 +111,7 @@ def dnsUse(payload, expression):
111111
debugMsg = "performed %d queries in %.2f seconds" % (count, calculateDeltaSeconds(start))
112112
logger.debug(debugMsg)
113113

114-
elif conf.dnsName:
114+
elif conf.dnsDomain:
115115
warnMsg = "DNS data exfiltration method through SQL injection "
116116
warnMsg += "is currently not available for DBMS %s" % Backend.getIdentifiedDbms()
117117
singleTimeWarnMessage(warnMsg)

‎sqlmap.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ uFrom =
377377

378378
# Domain name used for DNS exfiltration attack
379379
# Valid: string
380-
dnsName =
380+
dnsDomain =
381381

382382
# Resulting page URL searched for second-order response
383383
# Valid: string

‎txt/checksum.md5‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ec007a1424da78cfdae90da6ae49ed9b lib/controller/handler.py
2626
cc9c82cfffd8ee9b25ba3af6284f057e lib/controller/__init__.py
2727
04f16204c899438dc7599a9a8426bfee lib/core/agent.py
2828
eb0bd28b0bd9fbf67dcc3119116df377 lib/core/bigarray.py
29-
01c42757ab2928edcf62789e94397d1c lib/core/common.py
29+
7e424aadf807efa352733fb95a6ab431 lib/core/common.py
3030
5680d0c446a3bed5c0f2a0402d031557 lib/core/convert.py
3131
e77cca1cb063016f71f6e6bdebf4ec73 lib/core/data.py
3232
1d042f0bc0557d3fd564ea5a46deb77e lib/core/datatype.py
@@ -38,14 +38,14 @@ b218e03ef7426fb0414881b05add1092 lib/core/enums.py
3838
e4aec2b11c1ad6039d0c3dbbfbc5eb1a lib/core/exception.py
3939
cc9c82cfffd8ee9b25ba3af6284f057e lib/core/__init__.py
4040
91c514013daa796e2cdd940389354eac lib/core/log.py
41-
468ca9a68a5a40a1cb8395602083ba32 lib/core/optiondict.py
42-
470577bfa701af901b29fbc837c5d537 lib/core/option.py
41+
d027df65e7cbb99758daf77aaa6ab61c lib/core/optiondict.py
42+
814b261b06f12d54a9e6c5b62a2402f8 lib/core/option.py
4343
7af487340c138f7b5dbd443161cbb428 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-
e39defdec6e34d32ab82541c88d64880 lib/core/settings.py
48+
c211b7b7ed1f4d628961e9e9457899da lib/core/settings.py
4949
7af83e4f18cab6dff5e67840eb65be80 lib/core/shell.py
5050
23657cd7d924e3c6d225719865855827 lib/core/subprocessng.py
5151
c3ace7874a536d801f308cf1fd03df99 lib/core/target.py
@@ -56,7 +56,7 @@ d43f059747ffd48952922c94152e2a07 lib/core/testing.py
5656
8485a3cd94c0a5af2718bad60c5f1ae5 lib/core/wordlist.py
5757
cc9c82cfffd8ee9b25ba3af6284f057e lib/__init__.py
5858
c1288bc4ce5651dbdd82d4a9435fdc03 lib/parse/banner.py
59-
cbca40e76a5a6e93c9fb523f69a99d88 lib/parse/cmdline.py
59+
344781507a052d4d37157c5017f670ba lib/parse/cmdline.py
6060
8ec4d4f02634834701f8258726f2e511 lib/parse/configfile.py
6161
fe4e2152292587928edb94c9a4d311ff lib/parse/handler.py
6262
8e6bfb13e5a34b2610f3ff23467a34cf lib/parse/headers.py
@@ -72,7 +72,7 @@ d4d52c1073c75a6eecd2ebb98b670b96 lib/request/direct.py
7272
1a46f7bb26b23ec0c0d9d9c95828241b lib/request/dns.py
7373
70ceefe39980611494d4f99afb96f652 lib/request/httpshandler.py
7474
cc9c82cfffd8ee9b25ba3af6284f057e lib/request/__init__.py
75-
aa155f8b27d56485d3ff15efa5e1b07a lib/request/inject.py
75+
62aff2a7bdd43f6e4d33385f57ec3e4c lib/request/inject.py
7676
3fc323d525beddd14cd4d4dca4934fa8 lib/request/methodrequest.py
7777
585a6705cfac79f795b835affb80c901 lib/request/pkihandler.py
7878
b2ffd261947994f4a4af555d468b4970 lib/request/rangehandler.py
@@ -91,8 +91,8 @@ cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/blind/__init__.py
9191
cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/brute/__init__.py
9292
d36effffe64e63ef9b3be490f850e2cc lib/techniques/brute/use.py
9393
cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/dns/__init__.py
94-
b658a1df33fd967c0b6d82911383abda lib/techniques/dns/test.py
95-
4033bdb9e6973ee814fb68d3cf9e710c lib/techniques/dns/use.py
94+
99484ca6f1c12dac031e6a0ebef33ef1 lib/techniques/dns/test.py
95+
77b414d35fd13c8ba6aa171d5d420dc9 lib/techniques/dns/use.py
9696
cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/error/__init__.py
9797
4a1fb475f4a193e2cac48c8c038f5677 lib/techniques/error/use.py
9898
cc9c82cfffd8ee9b25ba3af6284f057e lib/techniques/__init__.py

0 commit comments

Comments
 (0)