Revert of patch for an Issue #347

This commit is contained in:
Miroslav Stampar 2013-01-17 18:38:37 +01:00
parent 9dd69042de
commit 507f185b69
2 changed files with 0 additions and 9 deletions

View File

@ -86,7 +86,6 @@ from lib.core.settings import DEFAULT_GET_POST_DELIMITER
from lib.core.settings import DEFAULT_MSSQL_SCHEMA from lib.core.settings import DEFAULT_MSSQL_SCHEMA
from lib.core.settings import DEPRECATED_OPTIONS from lib.core.settings import DEPRECATED_OPTIONS
from lib.core.settings import DESCRIPTION from lib.core.settings import DESCRIPTION
from lib.core.settings import DOLLAR_MARKER
from lib.core.settings import DUMMY_SQL_INJECTION_CHARS from lib.core.settings import DUMMY_SQL_INJECTION_CHARS
from lib.core.settings import DUMMY_USER_INJECTION from lib.core.settings import DUMMY_USER_INJECTION
from lib.core.settings import DYNAMICITY_MARK_LENGTH from lib.core.settings import DYNAMICITY_MARK_LENGTH
@ -2042,10 +2041,6 @@ def urlencode(value, safe="%&=", convall=False, limit=False):
if all(map(lambda x: '%' in x, [safe, value])) and not kb.tamperFunctions: if all(map(lambda x: '%' in x, [safe, value])) and not kb.tamperFunctions:
value = re.sub("%(?![0-9a-fA-F]{2})", "%25", value) value = re.sub("%(?![0-9a-fA-F]{2})", "%25", value)
if '$' in value and '$' not in safe:
for match in re.finditer(r"\b([\w$]*\$[\w$]*)=", value):
value = value.replace(match.group(1), match.group(1).replace('$', DOLLAR_MARKER))
while True: while True:
result = urllib.quote(utf8encode(value), safe) result = urllib.quote(utf8encode(value), safe)
@ -2061,9 +2056,6 @@ def urlencode(value, safe="%&=", convall=False, limit=False):
else: else:
break break
if result:
result = result.replace(DOLLAR_MARKER, '$')
return result return result
def runningAsAdmin(): def runningAsAdmin():

View File

@ -37,7 +37,6 @@ UPPER_RATIO_BOUND = 0.98
PARAMETER_AMP_MARKER = "__AMP__" PARAMETER_AMP_MARKER = "__AMP__"
PARAMETER_SEMICOLON_MARKER = "__SEMICOLON__" PARAMETER_SEMICOLON_MARKER = "__SEMICOLON__"
PARTIAL_VALUE_MARKER = "__PARTIAL__" PARTIAL_VALUE_MARKER = "__PARTIAL__"
DOLLAR_MARKER = "__DOLLAR_MARK__"
URI_QUESTION_MARKER = "__QUESTION_MARK__" URI_QUESTION_MARKER = "__QUESTION_MARK__"
ASTERISK_MARKER = "__ASTERISK_MARK__" ASTERISK_MARKER = "__ASTERISK_MARK__"