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
18 changes: 18 additions & 0 deletions tests/test_saas_web.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,24 @@ def test_shrink_media_rejects_nonpositive_target_bytes(self):
{"error": "Invalid target_bytes value. Must be greater than 0."},
)


@unittest.skipUnless(_HAS_FASTAPI, "fastapi not installed (optional integration dependency)")
class TestAPIKeyDoS(unittest.IsolatedAsyncioTestCase):
async def test_non_ascii_key_does_not_crash(self):
import starlette.requests
from saas_web import require_api_key
with patch.dict(os.environ, {"CODEC_CARVER_API_KEYS": "secret-key"}):
scope = {
"type": "http",
"method": "POST",
"path": "/shrink",
"headers": [(b"x-api-key", "non-ascii-☃".encode("utf-8"))],
}
request = starlette.requests.Request(scope)
response = await require_api_key(request, lambda r: None)

self.assertEqual(response.status_code, 401)

def test_shrink_media_rejects_missing_filename(self):
response = saas_web.shrink_media(
BackgroundTasks(),
Expand Down
Loading