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

Patch related to the #3927

Browse Source
This commit is contained in:
Miroslav Stampar 2019-09-16 19:29:38 +02:00
parent 6ec6e86937
commit cc8209d648
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/core/agent.py
View File

@ -5,7 +5,6 @@ Copyright (c) 2006-2019 sqlmap developers (http://sqlmap.org/)
See the file 'LICENSE' for copying permission See the file 'LICENSE' for copying permission
""" """
import base64
import re import re
from lib.core.common import Backend from lib.core.common import Backend
@ -51,6 +50,7 @@ from lib.core.settings import PAYLOAD_DELIMITER
from lib.core.settings import REPLACEMENT_MARKER from lib.core.settings import REPLACEMENT_MARKER
from lib.core.settings import SINGLE_QUOTE_MARKER from lib.core.settings import SINGLE_QUOTE_MARKER
from lib.core.settings import SLEEP_TIME_MARKER from lib.core.settings import SLEEP_TIME_MARKER
from lib.core.settings import UNICODE_ENCODING
from lib.core.unescaper import unescaper from lib.core.unescaper import unescaper
from thirdparty import six from thirdparty import six
@ -171,8 +171,8 @@ class Agent(object):
if re.sub(r" \(.+", "", parameter) in conf.base64Parameter: if re.sub(r" \(.+", "", parameter) in conf.base64Parameter:
# TODO: support for POST_HINT # TODO: support for POST_HINT
newValue = encodeBase64(newValue, binary=False) newValue = encodeBase64(newValue, binary=False, encoding=conf.encoding or UNICODE_ENCODING)
origValue = encodeBase64(origValue, binary=False) origValue = encodeBase64(origValue, binary=False, encoding=conf.encoding or UNICODE_ENCODING)
if place in (PLACE.URI, PLACE.CUSTOM_POST, PLACE.CUSTOM_HEADER): if place in (PLACE.URI, PLACE.CUSTOM_POST, PLACE.CUSTOM_HEADER):
_ = "%s%s" % (origValue, kb.customInjectionMark) _ = "%s%s" % (origValue, kb.customInjectionMark)

2
lib/core/common.py
View File

@ -623,7 +623,7 @@ def paramToDict(place, parameters=None):
if parameter in (conf.base64Parameter or []): if parameter in (conf.base64Parameter or []):
try: try:
oldValue = value oldValue = value
value = decodeBase64(value, binary=False) value = decodeBase64(value, binary=False, encoding=conf.encoding or UNICODE_ENCODING)
parameters = re.sub(r"\b%s(\b|\Z)" % re.escape(oldValue), value, parameters) parameters = re.sub(r"\b%s(\b|\Z)" % re.escape(oldValue), value, parameters)
except: except:
errMsg = "parameter '%s' does not contain " % parameter errMsg = "parameter '%s' does not contain " % parameter

14
lib/core/convert.py
View File

@ -184,7 +184,7 @@ def encodeHex(value, binary=True):
return retVal return retVal
def decodeBase64(value, binary=True): def decodeBase64(value, binary=True, encoding=None):
""" """
Returns a decoded representation of provided Base64 value Returns a decoded representation of provided Base64 value
@ -197,11 +197,11 @@ def decodeBase64(value, binary=True):
retVal = base64.b64decode(value) retVal = base64.b64decode(value)
if not binary: if not binary:
retVal = getText(retVal) retVal = getText(retVal, encoding)
return retVal return retVal
def encodeBase64(value, binary=True): def encodeBase64(value, binary=True, encoding=None):
""" """
Returns a decoded representation of provided Base64 value Returns a decoded representation of provided Base64 value
@ -212,12 +212,12 @@ def encodeBase64(value, binary=True):
""" """
if isinstance(value, six.text_type): if isinstance(value, six.text_type):
value = value.encode(UNICODE_ENCODING) value = value.encode(encoding or UNICODE_ENCODING)
retVal = base64.b64encode(value) retVal = base64.b64encode(value)
if not binary: if not binary:
retVal = getText(retVal) retVal = getText(retVal, encoding)
return retVal return retVal
@ -305,7 +305,7 @@ def getUnicode(value, encoding=None, noneToNull=False):
except UnicodeDecodeError: except UnicodeDecodeError:
return six.text_type(str(value), errors="ignore") # encoding ignored for non-basestring instances return six.text_type(str(value), errors="ignore") # encoding ignored for non-basestring instances
def getText(value): def getText(value, encoding=None):
""" """
Returns textual value of a given value (Note: not necessary Unicode on Python2) Returns textual value of a given value (Note: not necessary Unicode on Python2)
@ -318,7 +318,7 @@ def getText(value):
retVal = value retVal = value
if isinstance(value, six.binary_type): if isinstance(value, six.binary_type):
retVal = getUnicode(value) retVal = getUnicode(value, encoding)
if six.PY2: if six.PY2:
try: try:

2
lib/core/settings.py
View File

@ -18,7 +18,7 @@ from lib.core.enums import OS
from thirdparty.six import unichr as _unichr from thirdparty.six import unichr as _unichr
# sqlmap version (<major>.<minor>.<month>.<monthly commit>) # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
VERSION = "1.3.9.17" VERSION = "1.3.9.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)