sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-25 11:03:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming conf.pDel to conf.paramDel

Browse Source
This commit is contained in:
Miroslav Stampar 2014-04-06 16:48:46 +02:00
parent 95e7ca02f0
commit 0ae8ac707e
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/controller/controller.py
View File

@ -277,7 +277,7 @@ def start():
testSqlInj = False testSqlInj = False
if PLACE.GET in conf.parameters and not any([conf.data, conf.testParameter]): if PLACE.GET in conf.parameters and not any([conf.data, conf.testParameter]):
for parameter in re.findall(r"([^=]+)=([^%s]+%s?|\Z)" % (conf.pDel or DEFAULT_GET_POST_DELIMITER, conf.pDel or DEFAULT_GET_POST_DELIMITER), conf.parameters[PLACE.GET]): for parameter in re.findall(r"([^=]+)=([^%s]+%s?|\Z)" % (conf.paramDel or DEFAULT_GET_POST_DELIMITER, conf.paramDel or DEFAULT_GET_POST_DELIMITER), conf.parameters[PLACE.GET]):
paramKey = (conf.hostname, conf.path, PLACE.GET, parameter[0]) paramKey = (conf.hostname, conf.path, PLACE.GET, parameter[0])
if paramKey not in kb.testedParams: if paramKey not in kb.testedParams:

4
lib/core/common.py
View File

@ -541,7 +541,7 @@ def paramToDict(place, parameters=None):
if place == PLACE.COOKIE: if place == PLACE.COOKIE:
splitParams = parameters.split(conf.cDel or DEFAULT_COOKIE_DELIMITER) splitParams = parameters.split(conf.cDel or DEFAULT_COOKIE_DELIMITER)
else: else:
splitParams = parameters.split(conf.pDel or DEFAULT_GET_POST_DELIMITER) splitParams = parameters.split(conf.paramDel or DEFAULT_GET_POST_DELIMITER)
for element in splitParams: for element in splitParams:
element = re.sub(r"%s(.+?)%s" % (PARAMETER_AMP_MARKER, PARAMETER_SEMICOLON_MARKER), r"&\g<1>;", element) element = re.sub(r"%s(.+?)%s" % (PARAMETER_AMP_MARKER, PARAMETER_SEMICOLON_MARKER), r"&\g<1>;", element)
@ -550,7 +550,7 @@ def paramToDict(place, parameters=None):
if len(parts) >= 2: if len(parts) >= 2:
parameter = parts[0].replace(" ", "") parameter = parts[0].replace(" ", "")
if conf.pDel and conf.pDel == '\n': if conf.paramDel and conf.paramDel == '\n':
parts[-1] = parts[-1].rstrip() parts[-1] = parts[-1].rstrip()
condition = not conf.testParameter condition = not conf.testParameter

4
lib/core/option.py
View File

@ -1431,8 +1431,8 @@ def _cleanupOptions():
else: else:
conf.rParam = [] conf.rParam = []
if conf.pDel and '\\' in conf.pDel: if conf.paramDel and '\\' in conf.paramDel:
conf.pDel = conf.pDel.decode("string_escape") conf.paramDel = conf.paramDel.decode("string_escape")
if conf.skip: if conf.skip:
conf.skip = conf.skip.replace(" ", "") conf.skip = conf.skip.replace(" ", "")

2
lib/core/optiondict.py
View File

@ -23,7 +23,7 @@ optDict = {
"Request": { "Request": {
"data": "string", "data": "string",
"pDel": "string", "paramDel": "string",
"cookie": "string", "cookie": "string",
"cDel": "string", "cDel": "string",
"loadCookies": "string", "loadCookies": "string",

2
lib/parse/cmdline.py
View File

@ -82,7 +82,7 @@ def cmdLineParser():
request.add_option("--data", dest="data", request.add_option("--data", dest="data",
help="Data string to be sent through POST") help="Data string to be sent through POST")
request.add_option("--param-del", dest="pDel", request.add_option("--param-del", dest="paramDel",
help="Character used for splitting parameter values") help="Character used for splitting parameter values")
request.add_option("--cookie", dest="cookie", request.add_option("--cookie", dest="cookie",

2
lib/request/connect.py
View File

@ -757,7 +757,7 @@ class Connect(object):
cookie = _randomizeParameter(cookie, randomParameter) cookie = _randomizeParameter(cookie, randomParameter)
if conf.evalCode: if conf.evalCode:
delimiter = conf.pDel or DEFAULT_GET_POST_DELIMITER delimiter = conf.paramDel or DEFAULT_GET_POST_DELIMITER
variables = {} variables = {}
originals = {} originals = {}

2
sqlmap.conf
View File

@ -40,7 +40,7 @@ googleDork =
data = data =
# Character used for splitting parameter values # Character used for splitting parameter values
pDel = paramDel =
# HTTP Cookie header value. # HTTP Cookie header value.
cookie = cookie =