From 7053226795da005decce04cd74cd3c4218b2a21b Mon Sep 17 00:00:00 2001 From: mateo-berri <277851410+mateo-berri@users.noreply.github.com> Date: Tue, 20 Oct 2026 18:03:25 -0700 Subject: [PATCH] test(proxy): require a key for the Claude Code marketplace when configured and keep exception text out of its 500s --- .../test_claude_code_marketplace.py | 88 +++++++++++++++++++ .../public_endpoints/test_public_endpoints.py | 57 ++++++++++++ 2 files changed, 145 insertions(+) diff --git a/tests/unit/proxy/anthropic_endpoints/test_claude_code_marketplace.py b/tests/unit/proxy/anthropic_endpoints/test_claude_code_marketplace.py index 6f426a4a3a7..3d5c7400938 100644 --- a/tests/unit/proxy/anthropic_endpoints/test_claude_code_marketplace.py +++ b/tests/unit/proxy/anthropic_endpoints/test_claude_code_marketplace.py @@ -5,14 +5,18 @@ Covers the git-subdir and archive source types added alongside the existing gith """ import json +from collections.abc import Mapping +from types import MappingProxyType from typing import Final from unittest.mock import AsyncMock, MagicMock +import httpx import pytest from fastapi import HTTPException from pydantic import ValidationError import litellm +from litellm.caching.caching import DualCache from litellm.proxy._types import LiteLLM_ObjectPermissionTable, ProxyException, UserAPIKeyAuth from litellm.proxy.anthropic_endpoints.claude_code_endpoints import claude_code_marketplace from litellm.proxy.anthropic_endpoints.claude_code_endpoints.claude_code_marketplace import ( @@ -964,3 +968,87 @@ def test_marketplace_response_rejects_unknown_installation_preference(): with pytest.raises(ValidationError): MarketplaceResponse.model_validate(catalog) + + +def _require_marketplace_auth(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setattr( + litellm.proxy.proxy_server, "general_settings", {"claude_code_marketplace_auth_required": True} + ) + monkeypatch.setattr(litellm.proxy.proxy_server, "user_api_key_cache", DualCache()) + + +async def _get_marketplace_over_http( + headers: Mapping[str, str] = MappingProxyType({}), params: Mapping[str, str] = MappingProxyType({}) +) -> httpx.Response: + async with httpx.AsyncClient( + transport=httpx.ASGITransport(app=litellm.proxy.proxy_server.app), base_url="http://test" + ) as client: + return await client.get("/claude-code/marketplace.json", headers=dict(headers), params=dict(params)) + + +@pytest.mark.asyncio +async def test_marketplace_auth_required_refuses_an_anonymous_caller(monkeypatch: pytest.MonkeyPatch) -> None: + _require_marketplace_auth(monkeypatch) + await _register_public_and_private_plugins() + + response: Final = await _get_marketplace_over_http() + + assert response.status_code == 401 + assert "public-skill" not in response.text + + +@pytest.mark.asyncio +@pytest.mark.parametrize( + "headers, params", + [ + ({"Authorization": f"Bearer {MASTER_KEY}"}, {}), + ({"x-litellm-api-key": f"Bearer {MASTER_KEY}"}, {}), + ({}, {"key": MASTER_KEY}), + ], +) +async def test_marketplace_auth_required_serves_a_caller_with_a_valid_key( + monkeypatch: pytest.MonkeyPatch, headers: Mapping[str, str], params: Mapping[str, str] +) -> None: + _require_marketplace_auth(monkeypatch) + await _register_public_and_private_plugins() + + response: Final = await _get_marketplace_over_http(headers, params) + + assert response.status_code == 200 + assert sorted(plugin["name"] for plugin in response.json()["plugins"]) == ["private-skill", "public-skill"] + + +@pytest.mark.asyncio +async def test_marketplace_auth_required_refuses_an_unknown_bearer_key(monkeypatch: pytest.MonkeyPatch) -> None: + _require_marketplace_auth(monkeypatch) + litellm.proxy.proxy_server.prisma_client.get_data = AsyncMock(return_value=None) + await _register_public_and_private_plugins() + + response: Final = await _get_marketplace_over_http({"Authorization": "Bearer sk-not-a-litellm-key"}) + + assert response.status_code == 401 + assert "public-skill" not in response.text + + +@pytest.mark.asyncio +async def test_marketplace_without_auth_required_ignores_an_unrelated_authorization_header(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setattr(litellm.proxy.proxy_server, "general_settings", {}) + await _register_public_and_private_plugins() + + response: Final = await _get_marketplace_over_http({"Authorization": "Bearer an-identity-aware-proxy-token"}) + + assert response.status_code == 200 + assert [plugin["name"] for plugin in response.json()["plugins"]] == ["public-skill"] + + +@pytest.mark.asyncio +async def test_marketplace_500_body_carries_no_exception_text(monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setattr(litellm.proxy.proxy_server, "general_settings", {}) + table: Final = litellm.proxy.proxy_server.prisma_client.db.litellm_claudecodeplugintable + table.find_many = AsyncMock(side_effect=RuntimeError("could not reach postgres://admin:hunter2@db.internal")) + + response: Final = await _get_marketplace_over_http() + + assert response.status_code == 500 + assert "hunter2" not in response.text + assert "db.internal" not in response.text diff --git a/tests/unit/proxy/public_endpoints/test_public_endpoints.py b/tests/unit/proxy/public_endpoints/test_public_endpoints.py index 8f27365fcc1..81fa3a5d1a8 100644 --- a/tests/unit/proxy/public_endpoints/test_public_endpoints.py +++ b/tests/unit/proxy/public_endpoints/test_public_endpoints.py @@ -1,6 +1,7 @@ import asyncio import json import re +from collections.abc import Mapping from datetime import datetime, timezone from importlib.resources import files from itertools import chain @@ -8,6 +9,7 @@ from types import SimpleNamespace from typing import Final from unittest.mock import AsyncMock, MagicMock, patch +import httpx import pytest from fastapi import FastAPI from fastapi.testclient import TestClient @@ -1699,3 +1701,58 @@ def test_public_skill_hub_echoes_registered_installation_preference(preference): assert [(p["name"], p["installation_preference"]) for p in response.json()["plugins"]] == [ ("security-review", preference) ] + + +_INTERNAL_PLUGIN: Final = SimpleNamespace( + id="plugin-id", + name="deploy-helper", + enabled=True, + created_at=None, + updated_at=None, + manifest_json=json.dumps( + { + "source": { + "source": "git-subdir", + "url": "https://gitlab.internal.example.com/platform/claude-skills.git", + "path": "plugins/deploy-helper", + } + } + ), +) + + +def _skill_hub_response(find_many: AsyncMock, general_settings: Mapping[str, object]) -> httpx.Response: + table: Final = MagicMock() + table.find_many = find_many + prisma: Final = MagicMock() + prisma.db.litellm_claudecodeplugintable = table + app: Final = FastAPI() + app.include_router(router) + + with ( + patch("litellm.proxy.proxy_server.prisma_client", prisma), + patch("litellm.proxy.proxy_server.general_settings", dict(general_settings)), + ): + return TestClient(app).get("/public/skill_hub") + + +def test_public_skill_hub_is_empty_when_marketplace_auth_is_required() -> None: + find_many: Final = AsyncMock(return_value=[_INTERNAL_PLUGIN]) + + public: Final = _skill_hub_response(find_many, {}) + gated: Final = _skill_hub_response(find_many, {"claude_code_marketplace_auth_required": True}) + + assert [plugin["name"] for plugin in public.json()["plugins"]] == ["deploy-helper"] + assert gated.status_code == 200 + assert gated.json()["plugins"] == [] + assert "gitlab.internal.example.com" not in gated.text + + +def test_public_skill_hub_500_body_carries_no_exception_text() -> None: + response: Final = _skill_hub_response( + AsyncMock(side_effect=RuntimeError("could not reach postgres://admin:hunter2@db.internal")), {} + ) + + assert response.status_code == 500 + assert "hunter2" not in response.text + assert "db.internal" not in response.text