From 8f1a6d2b5c2d8524ac3dd2a1915da1f0d3e5dc77 Mon Sep 17 00:00:00 2001 From: Sai Asish Y Date: Thu, 19 Nov 2026 17:36:20 -0800 Subject: [PATCH] fix(rest): return 400 only for an invalid cursor Signed-off-by: Sai Asish Y --- publisher/api/rest/app.py | 4 ++-- tests/api/rest/test_server_keys.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/publisher/api/rest/app.py b/publisher/api/rest/app.py index 270e32a..51ed298 100644 --- a/publisher/api/rest/app.py +++ b/publisher/api/rest/app.py @@ -21,6 +21,7 @@ from publisher.api.rest.v1.routes import router as v1_router from publisher.config import ApiDocsConfig, AuthConfig from publisher.db import dispose_engine, get_session +from publisher.db.pagination import InvalidCursorError from publisher.log import setup_logging logger = logging.getLogger(__name__) @@ -174,8 +175,7 @@ def _bad_request_handler(request: Request, exc: Exception): return JSONResponse(status_code=400, content={"error": str(exc)}) -app.add_exception_handler(ValueError, _bad_request_handler) -app.add_exception_handler(NotImplementedError, _bad_request_handler) +app.add_exception_handler(InvalidCursorError, _bad_request_handler) @app.exception_handler(StarletteHTTPException) diff --git a/tests/api/rest/test_server_keys.py b/tests/api/rest/test_server_keys.py index 56632df..ed1475b 100644 --- a/tests/api/rest/test_server_keys.py +++ b/tests/api/rest/test_server_keys.py @@ -3,8 +3,10 @@ import base64 import pytest +from fastapi.testclient import TestClient from publisher import keys +from publisher.api.rest.v1 import server_keys from publisher.db import get_session from publisher.models.server_identity_key import get_private_key @@ -35,3 +37,15 @@ def test_get_returns_the_public_half_of_the_identity_key(client): @pytest.mark.parametrize("key_id", ["256", "-1", "abc"]) def test_get_rejects_ids_outside_0_255(client, key_id): assert client.get(f"/v1/server-keys/{key_id}").status_code == 422 + + +def test_a_database_fault_is_a_500_that_hides_its_message(app, monkeypatch): + def wrong_key(db): + raise ValueError("Wrong key, or the database file is corrupted.") + + monkeypatch.setattr(server_keys, "get_public_keys", wrong_key) + + response = TestClient(app, raise_server_exceptions=False).get("/v1/server-keys") + + assert response.status_code == 500 + assert "Wrong key" not in response.text