The Memory Layer for AI Agents - Drop-in memory infrastructure for AI agents and apps. Context that persists. Built for production.
Python agentic-memoryagentic-memory-systemagentsaiai-agentschatgptgenaillmlong-term-memorymemorymemory-managementpythonragstate-management
fix(server): return 404 not 500 for malformed api key id on revoke (#5640)
Yash Singh5b4478458bef
diff --git a/server/routers/api_keys.py b/server/routers/api_keys.pyindex 79f7126a0..992a5be2f 100644--- a/server/routers/api_keys.py+++ b/server/routers/api_keys.py@@ -1,3 +1,4 @@+import uuidfrom datetime import datetime, timezonefrom fastapi import APIRouter, Depends, HTTPException@@ -77,7 +78,11 @@ def create_key(body: CreateKeyRequest, user: User = Depends(require_auth), db: S@router.delete("/{key_id}", response_model=MessageResponse)def revoke_key(key_id: str, user: User = Depends(require_auth), db: Session = Depends(get_db)):- api_key = db.get(APIKey, key_id)+ try:+ key_uuid = uuid.UUID(key_id)+ except (TypeError, ValueError):+ raise HTTPException(status_code=404, detail="API key not found.")+ api_key = db.get(APIKey, key_uuid)if api_key is None or api_key.created_by != user.id:raise HTTPException(status_code=404, detail="API key not found.")if api_key.revoked_at is not None:diff --git a/tests/test_api_keys_router.py b/tests/test_api_keys_router.pynew file mode 100644index 000000000..2b0c688be--- /dev/null+++ b/tests/test_api_keys_router.py@@ -0,0 +1,69 @@+"""Tests for the api-keys router.++revoke_key takes the key_id straight from the URL path and passes it to+db.get(APIKey, key_id). The id column is a Postgres uuid, so a malformed+(non-UUID) key_id makes psycopg raise a DataError at bind time -- which+surfaces as a 500 -- before the None -> 404 check is ever reached. A missing+key should always be a 404, whether or not the id is a valid UUID.+"""++import os+import sys+import uuid++import pytest++pytest.importorskip("fastapi", reason="fastapi not installed")++from fastapi import FastAPI # noqa: E402+from fastapi.testclient import TestClient # noqa: E402+from sqlalchemy.exc import DataError # noqa: E402++# server/ modules use bare imports (from auth import ...), so the server+# directory itself must be importable, mirroring how it runs in Docker.+_SERVER_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "server")+if _SERVER_DIR not in sys.path:+ sys.path.insert(0, _SERVER_DIR)++from auth import require_auth # noqa: E402+from db import get_db # noqa: E402+from models import User # noqa: E402+from routers import api_keys as api_keys_router # noqa: E402+++class _RaisingSession:+ """Stands in for a SQLAlchemy session whose uuid column rejects bad input.++ Postgres raises DataError when a non-UUID string is bound to a uuid+ column; we reproduce that here without needing a live database. A valid+ UUID that maps to no row yields None, the same as a real lookup miss.+ """++ def get(self, _model, ident, *_args, **_kwargs):+ try:+ uuid.UUID(str(ident))+ except ValueError as exc:+ raise DataError("invalid input syntax for type uuid", None, exc) from exc+ return None+++def client():+ app = FastAPI()+ app.include_router(api_keys_router.router)++ fake_user = User(id=uuid.uuid4(), name="t", email="[email protected]", password_hash="x", role="admin")+ app.dependency_overrides[require_auth] = lambda: fake_user+ app.dependency_overrides[get_db] = lambda: _RaisingSession()++ return TestClient(app, raise_server_exceptions=False)+++def test_revoke_malformed_key_id_returns_404(client):+ resp = client.delete("/api-keys/not-a-uuid")+ assert resp.status_code == 404+++def test_revoke_missing_valid_uuid_returns_404(client):+ resp = client.delete(f"/api-keys/{uuid.uuid4()}")+ assert resp.status_code == 404