Skip to content

Commit dd05b44

Browse files
sethmlarsongpshead
authored andcommitted
gh-143916: Reject control characters in wsgiref.headers.Headers (GH-143917)
* Add 'test.support' fixture for C0 control characters * gh-143916: Reject control characters in wsgiref.headers.Headers (cherry picked from commit f7fceed)
1 parent 0f21962 commit dd05b44

File tree

4 files changed

+23
-1
lines changed

4 files changed

+23
-1
lines changed

Lib/test/support/__init__.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2856,3 +2856,10 @@ def linked_to_musl():
28562856
except (OSError, subprocess.CalledProcessError):
28572857
return False
28582858
return ('musl' in stdout)
2859+
2860+
2861+
def control_characters_c0() -> list[str]:
2862+
"""Returns a list of C0 control characters as strings.
2863+
C0 control characters defined as the byte range 0x00-0x1F, and 0x7F.
2864+
"""
2865+
return [chr(c) for c in range(0x00, 0x20)] + ["\x7F"]

Lib/test/test_wsgiref.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from unittest import mock
22
from test import support
3-
from test.support import socket_helper
3+
from test.support import socket_helper, control_characters_c0
44
from test.test_httpservers import NoLogRequestHandler
55
from unittest import TestCase
66
from wsgiref.util import setup_testing_defaults
@@ -503,6 +503,16 @@ def testExtras(self):
503503
'\r\n'
504504
)
505505

506+
def testRaisesControlCharacters(self):
507+
headers = Headers()
508+
for c0 in control_characters_c0():
509+
self.assertRaises(ValueError, headers.__setitem__, f"key{c0}", "val")
510+
self.assertRaises(ValueError, headers.__setitem__, "key", f"val{c0}")
511+
self.assertRaises(ValueError, headers.add_header, f"key{c0}", "val", param="param")
512+
self.assertRaises(ValueError, headers.add_header, "key", f"val{c0}", param="param")
513+
self.assertRaises(ValueError, headers.add_header, "key", "val", param=f"param{c0}")
514+
515+
506516
class ErrorHandler(BaseCGIHandler):
507517
"""Simple handler subclass for testing BaseHandler"""
508518

Lib/wsgiref/headers.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# existence of which force quoting of the parameter value.
1010
import re
1111
tspecials = re.compile(r'[ \(\)<>@,;:\\"/\[\]\?=]')
12+
_control_chars_re = re.compile(r'[\x00-\x1F\x7F]')
1213

1314
def _formatparam(param, value=None, quote=1):
1415
"""Convenience function to format and return a key=value pair.
@@ -41,6 +42,8 @@ def __init__(self, headers=None):
4142
def _convert_string_type(self, value):
4243
"""Convert/check value type."""
4344
if type(value) is str:
45+
if _control_chars_re.search(value):
46+
raise ValueError("Control characters not allowed in headers")
4447
return value
4548
raise AssertionError("Header names/values must be"
4649
" of type str (got {0})".format(repr(value)))
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Reject C0 control characters within wsgiref.headers.Headers fields, values,
2+
and parameters.

0 commit comments

Comments
 (0)