sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-02-03 21:24:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor update

Browse Source
This commit is contained in:
Miroslav Stampar 2019-05-03 16:36:21 +02:00
parent f344a01bd9
commit e2db0d20ea
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/core/common.py
View File

@ -1897,7 +1897,7 @@ def safeStringFormat(format_, params):
if isinstance(params, six.string_types): if isinstance(params, six.string_types):
retVal = retVal.replace("%s", params, 1) retVal = retVal.replace("%s", params, 1)
elif not isListLike(params): elif not isListLike(params):
retVal = retVal.replace("%s", getText(params), 1) retVal = retVal.replace("%s", getUnicode(params), 1)
else: else:
start, end = 0, len(retVal) start, end = 0, len(retVal)
match = re.search(r"%s(.+)%s" % (PAYLOAD_DELIMITER, PAYLOAD_DELIMITER), retVal) match = re.search(r"%s(.+)%s" % (PAYLOAD_DELIMITER, PAYLOAD_DELIMITER), retVal)
@ -1906,7 +1906,7 @@ def safeStringFormat(format_, params):
if retVal.count("%s", start, end) == len(params): if retVal.count("%s", start, end) == len(params):
for param in params: for param in params:
index = retVal.find("%s", start) index = retVal.find("%s", start)
retVal = retVal[:index] + getText(param) + retVal[index + 2:] retVal = retVal[:index] + getUnicode(param) + retVal[index + 2:]
else: else:
if any('%s' in _ for _ in conf.parameters.values()): if any('%s' in _ for _ in conf.parameters.values()):
parts = format_.split(' ') parts = format_.split(' ')
@ -1930,6 +1930,9 @@ def safeStringFormat(format_, params):
count += 1 count += 1
else: else:
break break
retVal = getText(retVal)
return retVal return retVal
def getFilteredPageContent(page, onlyText=True, split=" "): def getFilteredPageContent(page, onlyText=True, split=" "):
@ -4115,10 +4118,10 @@ def asciifyUrl(url, forceQuote=False):
parts = _urllib.parse.urlsplit(url) parts = _urllib.parse.urlsplit(url)
if not parts.scheme or not parts.netloc: if not parts.scheme or not parts.netloc:
# apparently not an url # apparently not an url
return url return getText(url)
if all(char in string.printable for char in url): if all(char in string.printable for char in url):
return url return getText(url)
# idna-encode domain # idna-encode domain
try: try:
@ -4160,7 +4163,7 @@ def asciifyUrl(url, forceQuote=False):
if port: if port:
netloc += ':' + str(port) netloc += ':' + str(port)
return _urllib.parse.urlunsplit([parts.scheme, netloc, path, query, parts.fragment]) or url return getText(_urllib.parse.urlunsplit([parts.scheme, netloc, path, query, parts.fragment]) or url)
def isAdminFromPrivileges(privileges): def isAdminFromPrivileges(privileges):
""" """
@ -4193,9 +4196,9 @@ def isAdminFromPrivileges(privileges):
def findPageForms(content, url, raise_=False, addToTargets=False): def findPageForms(content, url, raise_=False, addToTargets=False):
""" """
Parses given page content for possible forms Parses given page content for possible forms (Note: still not implemented for Python3)
>>> findPageForms('<html><form action="/input.php" method="POST"><input type="text" name="id" value="1"><input type="submit" value="Submit"></form></html>', '') >> findPageForms('<html><form action="/input.php" method="POST"><input type="text" name="id" value="1"><input type="submit" value="Submit"></form></html>', '')
set([(u'/input.php', 'POST', u'id=1', None, None)]) set([(u'/input.php', 'POST', u'id=1', None, None)])
""" """

2
lib/core/settings.py
View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty import six from thirdparty import six
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.5.17" VERSION = "1.3.5.18"
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)