Skip to content
Draft
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
20 changes: 19 additions & 1 deletion python/packages/devui/agent_framework_devui/_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,25 @@ async def auth_middleware(request: Request, call_next: Callable[[Request], Await
)

token = auth_header.replace("Bearer ", "", 1).strip()
if not secrets.compare_digest(token, expected_token):
# Starlette decodes header bytes as Latin-1. Encode the presented token
# back to bytes so compare_digest() can compare the original header byte
# values without the non-ASCII string restriction.
try:
token_bytes = token.encode("latin-1")
expected_token_bytes = expected_token.encode("latin-1")
except UnicodeEncodeError:
return JSONResponse(
status_code=401,
content={
"error": {
"message": "Invalid authentication token",
"type": "authentication_error",
"code": "invalid_token",
}
},
)

if not secrets.compare_digest(token_bytes, expected_token_bytes):
return JSONResponse(
status_code=401,
content={
Expand Down
36 changes: 36 additions & 0 deletions python/packages/devui/tests/devui/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,42 @@ def test_meta_endpoint_requires_auth(monkeypatch):
assert ok.status_code == 200


def test_non_ascii_presented_token_returns_401():
"""Non-ASCII presented token with ASCII configured token returns 401, not 500."""
server = DevServer(auth_token="secret")
app = server.get_app()

with TestClient(app, base_url="http://127.0.0.1") as client:
response = client.get("/v1/entities", headers={"Authorization": b"Bearer s\xe9cret"})
assert response.status_code == 401
assert response.json()["error"]["code"] == "invalid_token"


def test_non_latin1_configured_token_does_not_crash():
"""A configured token that cannot be represented in Latin-1 returns 401."""
server = DevServer(auth_token="secret\u20ac") # € is outside Latin-1
app = server.get_app()

with TestClient(app, base_url="http://127.0.0.1") as client:
response = client.get("/v1/entities", headers={"Authorization": b"Bearer secret"})
assert response.status_code == 401
assert response.json()["error"]["code"] == "invalid_token"


def test_ascii_tokens_still_work():
"""ASCII tokens continue to work correctly after the non-ASCII fix."""
server = DevServer(auth_token="secret")
app = server.get_app()

with TestClient(app, base_url="http://127.0.0.1") as client:
response = client.get("/v1/entities", headers={"Authorization": "Bearer secret"})
assert response.status_code == 200

response = client.get("/v1/entities", headers={"Authorization": "Bearer wrong"})
assert response.status_code == 401
assert response.json()["error"]["code"] == "invalid_token"


def test_loopback_bind_rejects_non_allowlisted_host_header(monkeypatch):
"""A loopback-bound server must reject requests with a non-loopback Host header.

Expand Down
Loading