Annotation of pkgsrc/lang/python27/patches/patch-Lib_cgi.py, revision 1.1
1.1 ! gutterid 1: $NetBSD$
! 2:
! 3: Fix CVE-2021-23336: Add `separator` argument to parse_qs; warn with default
! 4: Via Fedora:
! 5: https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00359-CVE-2021-23336.patch
! 6:
! 7: --- Lib/cgi.py.orig 2020-04-19 21:13:39.000000000 +0000
! 8: +++ Lib/cgi.py
! 9: @@ -121,7 +121,8 @@ log = initlog # The current lo
! 10: # 0 ==> unlimited input
! 11: maxlen = 0
! 12:
! 13: -def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0):
! 14: +def parse(fp=None, environ=os.environ, keep_blank_values=0,
! 15: + strict_parsing=0, separator=None):
! 16: """Parse a query in the environment or from a file (default stdin)
! 17:
! 18: Arguments, all optional:
! 19: @@ -140,6 +141,8 @@ def parse(fp=None, environ=os.environ, k
! 20: strict_parsing: flag indicating what to do with parsing errors.
! 21: If false (the default), errors are silently ignored.
! 22: If true, errors raise a ValueError exception.
! 23: +
! 24: + separator: str. The symbol to use for separating the query arguments.
! 25: """
! 26: if fp is None:
! 27: fp = sys.stdin
! 28: @@ -171,25 +174,26 @@ def parse(fp=None, environ=os.environ, k
! 29: else:
! 30: qs = ""
! 31: environ['QUERY_STRING'] = qs # XXX Shouldn't, really
! 32: - return urlparse.parse_qs(qs, keep_blank_values, strict_parsing)
! 33: + return urlparse.parse_qs(qs, keep_blank_values, strict_parsing, separator=separator)
! 34:
! 35:
! 36: # parse query string function called from urlparse,
! 37: # this is done in order to maintain backward compatibility.
! 38:
! 39: -def parse_qs(qs, keep_blank_values=0, strict_parsing=0):
! 40: +def parse_qs(qs, keep_blank_values=0, strict_parsing=0, separator=None):
! 41: """Parse a query given as a string argument."""
! 42: warn("cgi.parse_qs is deprecated, use urlparse.parse_qs instead",
! 43: PendingDeprecationWarning, 2)
! 44: - return urlparse.parse_qs(qs, keep_blank_values, strict_parsing)
! 45: + return urlparse.parse_qs(qs, keep_blank_values, strict_parsing,
! 46: + separator=separator)
! 47:
! 48:
! 49: -def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None):
! 50: +def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None, separator=None):
! 51: """Parse a query given as a string argument."""
! 52: warn("cgi.parse_qsl is deprecated, use urlparse.parse_qsl instead",
! 53: PendingDeprecationWarning, 2)
! 54: return urlparse.parse_qsl(qs, keep_blank_values, strict_parsing,
! 55: - max_num_fields)
! 56: + max_num_fields, separator=separator)
! 57:
! 58: def parse_multipart(fp, pdict):
! 59: """Parse multipart input.
! 60: @@ -288,7 +292,6 @@ def parse_multipart(fp, pdict):
! 61:
! 62: return partdict
! 63:
! 64: -
! 65: def _parseparam(s):
! 66: while s[:1] == ';':
! 67: s = s[1:]
! 68: @@ -395,7 +398,7 @@ class FieldStorage:
! 69:
! 70: def __init__(self, fp=None, headers=None, outerboundary="",
! 71: environ=os.environ, keep_blank_values=0, strict_parsing=0,
! 72: - max_num_fields=None):
! 73: + max_num_fields=None, separator=None):
! 74: """Constructor. Read multipart/* until last part.
! 75:
! 76: Arguments, all optional:
! 77: @@ -430,6 +433,7 @@ class FieldStorage:
! 78: self.keep_blank_values = keep_blank_values
! 79: self.strict_parsing = strict_parsing
! 80: self.max_num_fields = max_num_fields
! 81: + self.separator = separator
! 82: if 'REQUEST_METHOD' in environ:
! 83: method = environ['REQUEST_METHOD'].upper()
! 84: self.qs_on_post = None
! 85: @@ -613,7 +617,8 @@ class FieldStorage:
! 86: if self.qs_on_post:
! 87: qs += '&' + self.qs_on_post
! 88: query = urlparse.parse_qsl(qs, self.keep_blank_values,
! 89: - self.strict_parsing, self.max_num_fields)
! 90: + self.strict_parsing, self.max_num_fields,
! 91: + self.separator)
! 92: self.list = [MiniFieldStorage(key, value) for key, value in query]
! 93: self.skip_lines()
! 94:
! 95: @@ -629,7 +634,8 @@ class FieldStorage:
! 96: query = urlparse.parse_qsl(self.qs_on_post,
! 97: self.keep_blank_values,
! 98: self.strict_parsing,
! 99: - self.max_num_fields)
! 100: + self.max_num_fields,
! 101: + self.separator)
! 102: self.list.extend(MiniFieldStorage(key, value)
! 103: for key, value in query)
! 104: FieldStorageClass = None
! 105: @@ -649,7 +655,8 @@ class FieldStorage:
! 106: headers = rfc822.Message(self.fp)
! 107: part = klass(self.fp, headers, ib,
! 108: environ, keep_blank_values, strict_parsing,
! 109: - max_num_fields)
! 110: + max_num_fields,
! 111: + separator=self.separator)
! 112:
! 113: if max_num_fields is not None:
! 114: max_num_fields -= 1
! 115: @@ -817,10 +824,11 @@ class FormContentDict(UserDict.UserDict)
! 116: form.dict == {key: [val, val, ...], ...}
! 117:
! 118: """
! 119: - def __init__(self, environ=os.environ, keep_blank_values=0, strict_parsing=0):
! 120: + def __init__(self, environ=os.environ, keep_blank_values=0, strict_parsing=0, separator=None):
! 121: self.dict = self.data = parse(environ=environ,
! 122: keep_blank_values=keep_blank_values,
! 123: - strict_parsing=strict_parsing)
! 124: + strict_parsing=strict_parsing,
! 125: + separator=separator)
! 126: self.query_string = environ['QUERY_STRING']
! 127:
! 128:
CVSweb <webmaster@jp.NetBSD.org>