Annotation of pkgsrc/lang/python27/patches/patch-Lib_test_test__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/test/test_cgi.py.orig 2020-04-19 21:13:39.000000000 +0000
! 8: +++ Lib/test/test_cgi.py
! 9: @@ -61,12 +61,9 @@ parse_strict_test_cases = [
! 10: ("", ValueError("bad query field: ''")),
! 11: ("&", ValueError("bad query field: ''")),
! 12: ("&&", ValueError("bad query field: ''")),
! 13: - (";", ValueError("bad query field: ''")),
! 14: - (";&;", ValueError("bad query field: ''")),
! 15: # Should the next few really be valid?
! 16: ("=", {}),
! 17: ("=&=", {}),
! 18: - ("=;=", {}),
! 19: # This rest seem to make sense
! 20: ("=a", {'': ['a']}),
! 21: ("&=a", ValueError("bad query field: ''")),
! 22: @@ -81,8 +78,6 @@ parse_strict_test_cases = [
! 23: ("a=a+b&b=b+c", {'a': ['a b'], 'b': ['b c']}),
! 24: ("a=a+b&a=b+a", {'a': ['a b', 'b a']}),
! 25: ("x=1&y=2.0&z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}),
! 26: - ("x=1;y=2.0&z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}),
! 27: - ("x=1;y=2.0;z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}),
! 28: ("Hbc5161168c542333633315dee1182227:key_store_seqid=400006&cuyer=r&view=bustomer&order_id=0bb2e248638833d48cb7fed300000f1b&expire=964546263&lobale=en-US&kid=130003.300038&ss=env",
! 29: {'Hbc5161168c542333633315dee1182227:key_store_seqid': ['400006'],
! 30: 'cuyer': ['r'],
! 31: @@ -143,6 +138,60 @@ class CgiTests(unittest.TestCase):
! 32: if isinstance(expect, dict):
! 33: # test dict interface
! 34: self.assertEqual(len(expect), len(fcd))
! 35: + self.assertItemsEqual(expect.keys(), fcd.keys())
! 36: + self.assertItemsEqual(expect.values(), fcd.values())
! 37: + self.assertItemsEqual(expect.items(), fcd.items())
! 38: + self.assertEqual(fcd.get("nonexistent field", "default"), "default")
! 39: + self.assertEqual(len(sd), len(fs))
! 40: + self.assertItemsEqual(sd.keys(), fs.keys())
! 41: + self.assertEqual(fs.getvalue("nonexistent field", "default"), "default")
! 42: + # test individual fields
! 43: + for key in expect.keys():
! 44: + expect_val = expect[key]
! 45: + self.assertTrue(fcd.has_key(key))
! 46: + self.assertItemsEqual(fcd[key], expect[key])
! 47: + self.assertEqual(fcd.get(key, "default"), fcd[key])
! 48: + self.assertTrue(fs.has_key(key))
! 49: + if len(expect_val) > 1:
! 50: + single_value = 0
! 51: + else:
! 52: + single_value = 1
! 53: + try:
! 54: + val = sd[key]
! 55: + except IndexError:
! 56: + self.assertFalse(single_value)
! 57: + self.assertEqual(fs.getvalue(key), expect_val)
! 58: + else:
! 59: + self.assertTrue(single_value)
! 60: + self.assertEqual(val, expect_val[0])
! 61: + self.assertEqual(fs.getvalue(key), expect_val[0])
! 62: + self.assertItemsEqual(sd.getlist(key), expect_val)
! 63: + if single_value:
! 64: + self.assertItemsEqual(sd.values(),
! 65: + first_elts(expect.values()))
! 66: + self.assertItemsEqual(sd.items(),
! 67: + first_second_elts(expect.items()))
! 68: +
! 69: + def test_separator(self):
! 70: + parse_semicolon = [
! 71: + ("x=1;y=2.0", {'x': ['1'], 'y': ['2.0']}),
! 72: + ("x=1;y=2.0;z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}),
! 73: + (";", ValueError("bad query field: ''")),
! 74: + (";;", ValueError("bad query field: ''")),
! 75: + ("=;a", ValueError("bad query field: 'a'")),
! 76: + (";b=a", ValueError("bad query field: ''")),
! 77: + ("b;=a", ValueError("bad query field: 'b'")),
! 78: + ("a=a+b;b=b+c", {'a': ['a b'], 'b': ['b c']}),
! 79: + ("a=a+b;a=b+a", {'a': ['a b', 'b a']}),
! 80: + ]
! 81: + for orig, expect in parse_semicolon:
! 82: + env = {'QUERY_STRING': orig}
! 83: + fcd = cgi.FormContentDict(env, separator=';')
! 84: + sd = cgi.SvFormContentDict(env, separator=';')
! 85: + fs = cgi.FieldStorage(environ=env, separator=';')
! 86: + if isinstance(expect, dict):
! 87: + # test dict interface
! 88: + self.assertEqual(len(expect), len(fcd))
! 89: self.assertItemsEqual(expect.keys(), fcd.keys())
! 90: self.assertItemsEqual(expect.values(), fcd.values())
! 91: self.assertItemsEqual(expect.items(), fcd.items())
CVSweb <webmaster@jp.NetBSD.org>