From 68be0370416d38c5961ea7926dac9a728d85ab95 Mon Sep 17 00:00:00 2001 From: ShahadatTest Date: Tue, 3 Nov 2026 17:35:48 +0000 Subject: [PATCH] fix(hosting): skip Accept-Language candidates with q<=0 or non-finite q LocaleMiddleware._negotiate treated q=0 like any other weight, so Accept-Language: es;q=0 selected es. Skip not-acceptable and nan/inf weights so negotiation falls through to a real preference or default. Fixes #792 --- .../simple_module_hosting/i18n_middleware.py | 6 +++++ .../hosting/tests/test_locale_middleware.py | 24 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/framework/hosting/simple_module_hosting/i18n_middleware.py b/framework/hosting/simple_module_hosting/i18n_middleware.py index d2913893d..3e56abf0b 100644 --- a/framework/hosting/simple_module_hosting/i18n_middleware.py +++ b/framework/hosting/simple_module_hosting/i18n_middleware.py @@ -2,6 +2,8 @@ from __future__ import annotations +import math + from starlette.datastructures import Headers from starlette.requests import Request from starlette.types import ASGIApp, Receive, Scope, Send @@ -80,6 +82,10 @@ def _negotiate(self, accept_language: str) -> str | None: q = float(q_part.split("=", 1)[1]) if q_part.startswith("q=") else 1.0 except ValueError: q = 1.0 + # RFC 9110 §12.4.2: q=0 means "not acceptable". Non-finite values + # (nan/inf) make sort order undefined, so skip those too. + if not math.isfinite(q) or q <= 0: + continue candidates.append((q, tag)) # Sort by q descending, stable. diff --git a/framework/hosting/tests/test_locale_middleware.py b/framework/hosting/tests/test_locale_middleware.py index 034513810..67fcbe8f3 100644 --- a/framework/hosting/tests/test_locale_middleware.py +++ b/framework/hosting/tests/test_locale_middleware.py @@ -97,3 +97,27 @@ def test_lower_q_supported_beats_higher_q_unsupported() -> None: headers={"Accept-Language": "de;q=1.0,es;q=0.1"}, ) assert resp.json() == {"locale": "es"} + + +def test_skips_accept_language_with_q_zero() -> None: + """q=0 is 'not acceptable' (RFC 9110 §12.4.2) — must not select the tag.""" + app = _build_app(["en", "es"], "en") + mw = LocaleMiddleware(app, supported_locales=["en", "es"], default_locale="en") + assert mw._negotiate("es;q=0") is None + assert mw._negotiate("es;q=0,en;q=0.5") == "en" + + client = TestClient(app) + resp = client.get("/", headers={"Accept-Language": "es;q=0"}) + assert resp.json() == {"locale": "en"} + + +def test_skips_non_finite_accept_language_q() -> None: + app = _build_app(["en", "es"], "en") + mw = LocaleMiddleware(app, supported_locales=["en", "es"], default_locale="en") + assert mw._negotiate("es;q=nan") is None + assert mw._negotiate("es;q=inf,en;q=0.5") == "en" + assert mw._negotiate("es;q=-inf,en") == "en" + + client = TestClient(app) + resp = client.get("/", headers={"Accept-Language": "es;q=nan,en;q=0.8"}) + assert resp.json() == {"locale": "en"}