mirror of
https://github.com/frappe/gunicorn.git
synced 2026-07-02 18:51:31 +08:00
Merge pull request #3595 from benoitc/fix/rfc9112-reject-authority-form-non-connect
fix: reject authority-form request-target outside CONNECT (RFC 9112 §3.2.3)
This commit is contained in:
commit
37771e8a44
@ -460,6 +460,13 @@ class PythonProtocol:
|
|||||||
if self.path == b'*' and self.method != b'OPTIONS':
|
if self.path == b'*' and self.method != b'OPTIONS':
|
||||||
raise InvalidRequestLine("Invalid request line")
|
raise InvalidRequestLine("Invalid request line")
|
||||||
|
|
||||||
|
# RFC 9112 section 3.2.3: authority-form is only valid with CONNECT.
|
||||||
|
if (self.method != b'CONNECT'
|
||||||
|
and self.path != b'*'
|
||||||
|
and not self.path.startswith(b'/')
|
||||||
|
and b'://' not in self.path):
|
||||||
|
raise InvalidRequestLine("Invalid request line")
|
||||||
|
|
||||||
# Parse version
|
# Parse version
|
||||||
version = parts[2]
|
version = parts[2]
|
||||||
if version == b'HTTP/1.1':
|
if version == b'HTTP/1.1':
|
||||||
|
|||||||
@ -811,6 +811,15 @@ class Request(Message):
|
|||||||
if self.uri == "*" and self.method != "OPTIONS":
|
if self.uri == "*" and self.method != "OPTIONS":
|
||||||
raise InvalidRequestLine(bytes_to_str(line_bytes))
|
raise InvalidRequestLine(bytes_to_str(line_bytes))
|
||||||
|
|
||||||
|
# RFC 9112 section 3.2.3: authority-form ("host:port") is only valid
|
||||||
|
# with CONNECT. origin-form starts with "/"; absolute-form contains
|
||||||
|
# "://". Anything else on a non-CONNECT request is authority-form.
|
||||||
|
if (self.method != "CONNECT"
|
||||||
|
and self.uri != "*"
|
||||||
|
and not self.uri.startswith("/")
|
||||||
|
and "://" not in self.uri):
|
||||||
|
raise InvalidRequestLine(bytes_to_str(line_bytes))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
parts = split_request_uri(self.uri)
|
parts = split_request_uri(self.uri)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
|
|||||||
@ -0,0 +1,3 @@
|
|||||||
|
GET example.com:443 HTTP/1.1\r\n
|
||||||
|
Host: example.com:443\r\n
|
||||||
|
\r\n
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
#
|
||||||
|
# This file is part of gunicorn released under the MIT license.
|
||||||
|
# See the NOTICE for more information.
|
||||||
|
|
||||||
|
# RFC 9112 section 3.2.3: authority-form ("host:port") is only valid with
|
||||||
|
# the CONNECT method. Any other method carrying it must be rejected.
|
||||||
|
from gunicorn.http.errors import InvalidRequestLine
|
||||||
|
request = InvalidRequestLine
|
||||||
|
# The C parser (gunicorn_h1c) does not yet enforce this rule.
|
||||||
|
python_only = True
|
||||||
Loading…
x
Reference in New Issue
Block a user