Skip to content

gh-103204: http.server - Enforce that HTTP version numbers must consist only of digits #103205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 12, 2023
Merged

gh-103204: http.server - Enforce that HTTP version numbers must consist only of digits #103205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
161058d
gh-103204: Enforce that HTTP version numbers must consist only of digits
kenballus Apr 3, 2023
1f96875
add blurb
kenballus Apr 3, 2023
b24df38
fix blurb
kenballus Apr 3, 2023
30d4e53
add test
kenballus Apr 3, 2023
f4df971
Merge branch 'main' into restrict-http-version-number-parsing
kenballus May 12, 2023
d116790
Update Lib/http/server.py
kenballus May 12, 2023
a32bb85
Merge branch 'main' into restrict-http-version-number-parsing
kenballus May 12, 2023
6b9b20d
Also constrain the length of the http version.
gpshead May 12, 2023
734384e
ReSTify and expand.
gpshead May 12, 2023
1f838b1
Add tests for version number length error
gpshead May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/http/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,10 @@ def parse_request(self):
# - Leading zeros MUST be ignored by recipients.
if len(version_number) != 2:
raise ValueError
if any(not component.isdigit() for component in version_number):
raise ValueError("non digit in http version")
if any(len(component) > 10 for component in version_number):
raise ValueError("unreasonable length http version")
version_number = int(version_number[0]), int(version_number[1])
except (ValueError, IndexError):
self.send_error(
Expand Down
21 changes: 21 additions & 0 deletions Lib/test/test_httpservers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,27 @@ def test_version_digits(self):
res = self.con.getresponse()
self.assertEqual(res.status, HTTPStatus.BAD_REQUEST)

def test_version_signs_and_underscores(self):
self.con._http_vsn_str = 'HTTP/-9_9_9.+9_9_9'
self.con.putrequest('GET', '/')
self.con.endheaders()
res = self.con.getresponse()
self.assertEqual(res.status, HTTPStatus.BAD_REQUEST)

def test_major_version_number_too_long(self):
self.con._http_vsn_str = 'HTTP/909876543210.0'
self.con.putrequest('GET', '/')
self.con.endheaders()
res = self.con.getresponse()
self.assertEqual(res.status, HTTPStatus.BAD_REQUEST)

def test_minor_version_number_too_long(self):
self.con._http_vsn_str = 'HTTP/1.909876543210'
self.con.putrequest('GET', '/')
self.con.endheaders()
res = self.con.getresponse()
self.assertEqual(res.status, HTTPStatus.BAD_REQUEST)

def test_version_none_get(self):
self.con._http_vsn_str = ''
self.con.putrequest('GET', '/')
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2023-04-02-23-05-22.gh-issue-103204.bbDmu0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fixes :mod:`http.server` accepting HTTP requests with HTTP version numbers
preceded by '+', or '-', or with digit-separating '_' characters. The length
of the version numbers is also constrained.