Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions framework/hosting/simple_module_hosting/i18n_middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
24 changes: 24 additions & 0 deletions framework/hosting/tests/test_locale_middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"}