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
2 changes: 1 addition & 1 deletion saas_web.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ async def require_api_key(request: Request, call_next):
if configured_keys and not (request.method == "GET" and request.url.path == "/"):
provided_key = request.headers.get("x-api-key", "")
if not any(
hmac.compare_digest(provided_key, key) for key in configured_keys
hmac.compare_digest(provided_key.encode('utf-8'), key.encode('utf-8')) for key in configured_keys
):
return JSONResponse(
status_code=401,
Expand Down
23 changes: 23 additions & 0 deletions tests/test_saas_web.py
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,29 @@ def test_only_empty_entries_leave_endpoints_open(self):
{"error": "Invalid target_bytes value. Must be greater than 0."},
)

def test_non_ascii_header_does_not_crash(self):
import json
import asyncio
from fastapi import Request

with patch.dict(os.environ, {"CODEC_CARVER_API_KEYS": "secret-key"}):
scope = {
"type": "http",
"method": "POST",
"path": "/shrink",
"headers": [(b"x-api-key", "wrong-key-😊".encode("utf-8"))]
}
request = Request(scope)

async def dummy_call_next(req):
pass

response = asyncio.run(saas_web.require_api_key(request, dummy_call_next))

self.assertEqual(response.status_code, 401)
body = json.loads(response.body)
self.assertEqual(body, {"error": "Invalid or missing API key"})

def test_get_configured_api_keys_parsing(self):
with patch.dict(os.environ, {"CODEC_CARVER_API_KEYS": " a ,, b ,"}):
self.assertEqual(saas_web.get_configured_api_keys(), ["a", "b"])
Expand Down
Loading