feat(config): add lenient flags for httptools

- Add HTTPTOOLS_LENIENT type and related configuration options
- Implement lenient flags support in HttpToolsProtocol
- Update documentation and CLI options for lenient flags
- Add test case for lenient_data_after_close flag

Author: vvanglro

docs/deployment.md

@@ -135,6 +135,9 @@ Options:
                                   buffer of an incomplete event.
   --factory                       Treat APP as an application factory, i.e. a
                                   () -> <ASGI app> callable.
+  --lenient-flag [lenient_headers|lenient_chunked_length|lenient_keep_alive|lenient_transfer_encoding|lenient_version|lenient_data_after_close|lenient_optional_lf_after_cr|lenient_optional_cr_before_lf|lenient_optional_crlf_after_chunk|lenient_spaces_after_chunk_size]
+                                  Lenient flags for httptools only,
+                                  Details：https://llhttp.org/
   --help                          Show this message and exit.
 ```
 

docs/index.md

@@ -205,6 +205,9 @@ Options:
                                   buffer of an incomplete event.
   --factory                       Treat APP as an application factory, i.e. a
                                   () -> <ASGI app> callable.
+  --lenient-flag [lenient_headers|lenient_chunked_length|lenient_keep_alive|lenient_transfer_encoding|lenient_version|lenient_data_after_close|lenient_optional_lf_after_cr|lenient_optional_cr_before_lf|lenient_optional_crlf_after_chunk|lenient_spaces_after_chunk_size]
+                                  Lenient flags for httptools only,
+                                  Details：https://llhttp.org/
   --help                          Show this message and exit.
 ```
 

tests/protocols/test_http.py

@@ -1023,8 +1023,10 @@ async def test_return_close_header(http_protocol_cls: HTTPProtocol):
 
 async def test_close_connection_with_multiple_requests(http_protocol_cls: HTTPProtocol):
     app = Response("Hello, world", media_type="text/plain")
-
-    protocol = get_connected_protocol(app, http_protocol_cls)
+    config_kw = {}
+    if http_protocol_cls == HttpToolsProtocol:
+        config_kw = {"lenient_flags": ["lenient_data_after_close"]}
+    protocol = get_connected_protocol(app, http_protocol_cls, **config_kw)
     protocol.data_received(REQUEST_AFTER_CONNECTION_CLOSE)
     await protocol.loop.run_one()
     assert b"HTTP/1.1 200 OK" in protocol.transport.buffer

uvicorn/config.py

@@ -28,7 +28,31 @@
 LifespanType = Literal["auto", "on", "off"]
 LoopSetupType = Literal["none", "auto", "asyncio", "uvloop"]
 InterfaceType = Literal["auto", "asgi3", "asgi2", "wsgi"]
-
+HTTPToolsLenientType = Literal[
+    "lenient_headers",
+    "lenient_chunked_length",
+    "lenient_keep_alive",
+    "lenient_transfer_encoding",
+    "lenient_version",
+    "lenient_data_after_close",
+    "lenient_optional_lf_after_cr",
+    "lenient_optional_cr_before_lf",
+    "lenient_optional_crlf_after_chunk",
+    "lenient_spaces_after_chunk_size",
+]
+
+HTTPTOOLS_LENIENT: list[HTTPToolsLenientType] = [
+    "lenient_headers",
+    "lenient_chunked_length",
+    "lenient_keep_alive",
+    "lenient_transfer_encoding",
+    "lenient_version",
+    "lenient_data_after_close",
+    "lenient_optional_lf_after_cr",
+    "lenient_optional_cr_before_lf",
+    "lenient_optional_crlf_after_chunk",
+    "lenient_spaces_after_chunk_size",
+]
 LOG_LEVELS: dict[str, int] = {
     "critical": logging.CRITICAL,
     "error": logging.ERROR,
@@ -223,6 +247,7 @@ def __init__(
         headers: list[tuple[str, str]] | None = None,
         factory: bool = False,
         h11_max_incomplete_event_size: int | None = None,
+        lenient_flags: HTTPToolsLenientType | None = None,
     ):
         self.app = app
         self.host = host
@@ -268,6 +293,7 @@ def __init__(
         self.encoded_headers: list[tuple[bytes, bytes]] = []
         self.factory = factory
         self.h11_max_incomplete_event_size = h11_max_incomplete_event_size
+        self.lenient_flags = lenient_flags
 
         self.loaded = False
         self.configure_logging()

uvicorn/main.py

@@ -15,6 +15,7 @@
 from uvicorn._types import ASGIApplication
 from uvicorn.config import (
     HTTP_PROTOCOLS,
+    HTTPTOOLS_LENIENT,
     INTERFACES,
     LIFESPAN,
     LOG_LEVELS,
@@ -24,6 +25,7 @@
     WS_PROTOCOLS,
     Config,
     HTTPProtocolType,
+    HTTPToolsLenientType,
     InterfaceType,
     LifespanType,
     LoopSetupType,
@@ -38,6 +40,7 @@
 LIFESPAN_CHOICES = click.Choice(list(LIFESPAN.keys()))
 LOOP_CHOICES = click.Choice([key for key in LOOP_SETUPS.keys() if key != "none"])
 INTERFACE_CHOICES = click.Choice(INTERFACES)
+HTTPTOOLS_CHOICES = click.Choice(HTTPTOOLS_LENIENT)
 
 STARTUP_FAILURE = 3
 
@@ -360,6 +363,15 @@ def print_version(ctx: click.Context, param: click.Parameter, value: bool) -> No
     help="Treat APP as an application factory, i.e. a () -> <ASGI app> callable.",
     show_default=True,
 )
+@click.option(
+    "--lenient-flag",
+    "lenient_flags",
+    type=HTTPTOOLS_CHOICES,
+    multiple=True,
+    default=None,
+    help="Lenient flags for httptools only, Details：https://llhttp.org/",
+    show_default=True,
+)
 def main(
     app: str,
     host: str,
@@ -408,6 +420,7 @@ def main(
     app_dir: str,
     h11_max_incomplete_event_size: int | None,
     factory: bool,
+    lenient_flags: HTTPToolsLenientType | None,
 ) -> None:
     run(
         app,
@@ -457,6 +470,7 @@ def main(
         factory=factory,
         app_dir=app_dir,
         h11_max_incomplete_event_size=h11_max_incomplete_event_size,
+        lenient_flags=lenient_flags,
     )
 
 
@@ -509,6 +523,7 @@ def run(
     app_dir: str | None = None,
     factory: bool = False,
     h11_max_incomplete_event_size: int | None = None,
+    lenient_flags: HTTPToolsLenientType | None = None,
 ) -> None:
     if app_dir is not None:
         sys.path.insert(0, app_dir)
@@ -560,6 +575,7 @@ def run(
         use_colors=use_colors,
         factory=factory,
         h11_max_incomplete_event_size=h11_max_incomplete_event_size,
+        lenient_flags=lenient_flags,
     )
     server = Server(config=config)
 

uvicorn/protocols/http/httptools_impl.py

@@ -58,7 +58,9 @@ def __init__(
         self.access_logger = logging.getLogger("uvicorn.access")
         self.access_log = self.access_logger.hasHandlers()
         self.parser = httptools.HttpRequestParser(self)
-        self.parser.set_dangerous_leniencies(lenient_data_after_close=True)
+        lenient_flags = config.lenient_flags
+        if lenient_flags:
+            self.parser.set_dangerous_leniencies(**{flag: True for flag in lenient_flags})
         self.ws_protocol_class = config.ws_protocol_class
         self.root_path = config.root_path
         self.limit_concurrency = config.limit_concurrency