FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Renaming conf.cDel to conf.cookieDel · getcode2git/sqlmap@7cc4159 · GitHub

/ sqlmap Public
forked from sqlmapproject/sqlmap

Commit 7cc4159

Browse files
stamparm
committed
Renaming conf.cDel to conf.cookieDel
1 parent 0ae8ac7 commit 7cc4159

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎lib/core/common.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ def paramToDict(place, parameters=None):
539539
parameters = parameters.replace(", ", ",")
540540
parameters = re.sub(r"&(\w{1,4});", r"%s\g<1>%s" % (PARAMETER_AMP_MARKER, PARAMETER_SEMICOLON_MARKER), parameters)
541541
if place == PLACE.COOKIE:
542-
splitParams = parameters.split(conf.cDel or DEFAULT_COOKIE_DELIMITER)
542+
splitParams = parameters.split(conf.cookieDel or DEFAULT_COOKIE_DELIMITER)
543543
else:
544544
splitParams = parameters.split(conf.paramDel or DEFAULT_GET_POST_DELIMITER)
545545

‎lib/core/optiondict.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"data": "string",
2626
"paramDel": "string",
2727
"cookie": "string",
28-
"cDel": "string",
28+
"cookieDel": "string",
2929
"loadCookies": "string",
3030
"dropSetCookie": "boolean",
3131
"agent": "string",

‎lib/parse/cmdline.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def cmdLineParser():
8888
request.add_option("--cookie", dest="cookie",
8989
help="HTTP Cookie header value")
9090

91-
request.add_option("--cookie-del", dest="cDel",
91+
request.add_option("--cookie-del", dest="cookieDel",
9292
help="Character used for splitting cookie values")
9393

9494
request.add_option("--load-cookies", dest="loadCookies",

‎lib/request/basic.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def title(self):
9494
kb.mergeCookies = not _ or _[0] in ("y", "Y")
9595

9696
if kb.mergeCookies:
97-
_ = lambda x: re.sub("(?i)%s=[^%s]+" % (cookie.name, conf.cDel or DEFAULT_COOKIE_DELIMITER), "%s=%s" % (cookie.name, getUnicode(cookie.value)), x)
97+
_ = lambda x: re.sub("(?i)%s=[^%s]+" % (cookie.name, conf.cookieDel or DEFAULT_COOKIE_DELIMITER), "%s=%s" % (cookie.name, getUnicode(cookie.value)), x)
9898
headers[HTTP_HEADER.COOKIE] = _(headers[HTTP_HEADER.COOKIE])
9999

100100
if PLACE.COOKIE in conf.parameters:
@@ -103,7 +103,7 @@ def title(self):
103103
conf.httpHeaders = [(item[0], item[1] if item[0] != HTTP_HEADER.COOKIE else _(item[1])) for item in conf.httpHeaders]
104104

105105
elif not kb.testMode:
106-
headers[HTTP_HEADER.COOKIE] += "%s %s=%s" % (conf.cDel or DEFAULT_COOKIE_DELIMITER, cookie.name, getUnicode(cookie.value))
106+
headers[HTTP_HEADER.COOKIE] += "%s %s=%s" % (conf.cookieDel or DEFAULT_COOKIE_DELIMITER, cookie.name, getUnicode(cookie.value))
107107

108108
if kb.testMode:
109109
resetCookieJar(conf.cj)

‎lib/request/connect.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ def _randomizeParameter(paramString, randomParameter):
769769
evaluateCode("%s=%s" % (name.strip(), repr(value)), variables)
770770

771771
if cookie:
772-
for part in cookie.split(conf.cDel or DEFAULT_COOKIE_DELIMITER):
772+
for part in cookie.split(conf.cookieDel or DEFAULT_COOKIE_DELIMITER):
773773
if '=' in part:
774774
name, value = part.split('=', 1)
775775
value = urldecode(value, convall=True)
@@ -793,7 +793,7 @@ def _randomizeParameter(paramString, randomParameter):
793793
found = True
794794
post = re.sub(regex, "\g<1>%s\g<3>" % value, post)
795795

796-
regex = r"((\A|%s)%s=).+?(%s|\Z)" % (re.escape(conf.cDel or DEFAULT_COOKIE_DELIMITER), name, re.escape(conf.cDel or DEFAULT_COOKIE_DELIMITER))
796+
regex = r"((\A|%s)%s=).+?(%s|\Z)" % (re.escape(conf.cookieDel or DEFAULT_COOKIE_DELIMITER), name, re.escape(conf.cookieDel or DEFAULT_COOKIE_DELIMITER))
797797
if re.search(regex, (cookie or "")):
798798
found = True
799799
cookie = re.sub(regex, "\g<1>%s\g<3>" % value, cookie)
@@ -804,7 +804,7 @@ def _randomizeParameter(paramString, randomParameter):
804804
elif get is not None:
805805
get += "%s%s=%s" % (delimiter, name, value)
806806
elif cookie is not None:
807-
cookie += "%s%s=%s" % (conf.cDel or DEFAULT_COOKIE_DELIMITER, name, value)
807+
cookie += "%s%s=%s" % (conf.cookieDel or DEFAULT_COOKIE_DELIMITER, name, value)
808808

809809
if not conf.skipUrlEncode:
810810
get = urlencode(get, limit=True)

‎lib/request/redirecthandler.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def http_error_302(self, req, fp, code, msg, headers):
113113
if redurl and kb.redirectChoice == REDIRECTION.YES:
114114
req.headers[HTTP_HEADER.HOST] = getHostHeader(redurl)
115115
if headers and HTTP_HEADER.SET_COOKIE in headers:
116-
req.headers[HTTP_HEADER.COOKIE] = headers[HTTP_HEADER.SET_COOKIE].split(conf.cDel or DEFAULT_COOKIE_DELIMITER)[0]
116+
req.headers[HTTP_HEADER.COOKIE] = headers[HTTP_HEADER.SET_COOKIE].split(conf.cookieDel or DEFAULT_COOKIE_DELIMITER)[0]
117117
result = urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
118118
else:
119119
result = fp

‎sqlmap.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ paramDel =
4646
cookie =
4747

4848
# Character used for splitting cookie values
49-
cDel =
49+
cookieDel =
5050

5151
# File containing cookies in Netscape/wget format
5252
loadCookies =

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL