FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-70765: avoid waiting for HTTP headers when parsing HTTP/0.9 requests by picnixz · Pull Request #139514 · python/cpython · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
7 changes: 7 additions & 0 deletions Lib/http/server.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ def parse_request(self):
error response has already been sent back.

"""
is_http_0_9 = False
self.command = None # set in case of error on the first line
self.request_version = version = self.default_request_version
self.close_connection = True
Expand Down Expand Up @@ -359,6 +360,7 @@ def parse_request(self):
HTTPStatus.BAD_REQUEST,
"Bad HTTP/0.9 request type (%r)" % command)
Comment thread
picnixz marked this conversation as resolved.
return False
is_http_0_9 = True
self.command, self.path = command, path

# gh-87389: The purpose of replacing '//' with '/' is to protect
Expand All @@ -368,6 +370,11 @@ def parse_request(self):
if self.path.startswith('//'):
self.path = '/' + self.path.lstrip('/') # Reduce to a single /

# For HTTP/0.9, headers are not expected at all.
if is_http_0_9:
Comment thread
picnixz marked this conversation as resolved.
self.headers = {}
return True

# Examine the headers and look for a Connection directive.
try:
self.headers = http.client.parse_headers(self.rfile,
Expand Down
37 changes: 37 additions & 0 deletions Lib/test/test_httpservers.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,43 @@ def test_head_via_send_error(self):
self.assertEqual(b'', data)


class HTTP09ServerTestCase(BaseTestCase):

class request_handler(NoLogRequestHandler, BaseHTTPRequestHandler):
"""Request handler for HTTP/0.9 server."""

def do_GET(self):
self.wfile.write(f'OK: here is {self.path}\r\n'.encode())

def setUp(self):
super().setUp()
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock = self.enterContext(self.sock)
self.sock.connect((self.HOST, self.PORT))

def test_simple_get(self):
self.sock.send(b'GET /index.html\r\n')
res = self.sock.recv(1024)
self.assertEqual(res, b"OK: here is /index.html\r\n")

def test_invalid_request(self):
self.sock.send(b'POST /index.html\r\n')
res = self.sock.recv(1024)
self.assertIn(b"Bad HTTP/0.9 request type ('POST')", res)

def test_single_request(self):
self.sock.send(b'GET /foo.html\r\n')
res = self.sock.recv(1024)
self.assertEqual(res, b"OK: here is /foo.html\r\n")

self.sock.send(b'GET /bar.html\r\n')
res = self.sock.recv(1024)
# The server will not parse more input as it closed the connection.
# Note that the socket connection itself is still opened since the
# client is responsible for also closing it on their side.
self.assertEqual(res, b'')


def certdata_file(*path):
return os.path.join(os.path.dirname(__file__), "certdata", *path)

Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
:mod:`http.server`: fix default handling of HTTP/0.9 requests in
:class:`~http.server.BaseHTTPRequestHandler`. Previously,
:meth:`!BaseHTTPRequestHandler.parse_request`` incorrectly
waited for headers in the request although those are not
supported in HTTP/0.9. Patch by Bénédikt Tran.
Loading

Back | FazBrowse Home | New Git URL