Skip to content
Merged
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
4 changes: 2 additions & 2 deletions publisher/api/rest/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down Expand Up @@ -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)
Expand Down
14 changes: 14 additions & 0 deletions tests/api/rest/test_server_keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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