mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-11-22 13:29:19 +08:00
fix(proxy): keep the selected provider when x-headroom-base-url overrides the metadata upstream
_model_metadata_route returned "openai" for every request carrying x-headroom-base-url, so x-api-key requests lost the Anthropic model-id sanitization in handle_passthrough (GET /v1/models/claude-opus-4-8[1m] reached the gateway with the [1m] suffix). Override only the destination and keep the provider the request's auth selects. Adds a test through the real passthrough path asserting the outbound URL.
This commit is contained in:
@@ -506,7 +506,11 @@ def register_provider_routes(app: FastAPI, proxy: Any) -> None:
|
||||
if not await is_safe_upstream_url_async(custom_base):
|
||||
logger.warning("rejecting unsafe x-headroom-base-url: %r", custom_base)
|
||||
raise HTTPException(status_code=400, detail="Rejected unsafe upstream base URL")
|
||||
return "openai", custom_base.rstrip("/")
|
||||
# Only the destination is overridden: keep the provider the request's
|
||||
# auth selects, so Anthropic-auth requests still get model-id
|
||||
# sanitization in handle_passthrough.
|
||||
provider_name = proxy.provider_runtime.model_metadata_provider(dict(request.headers))
|
||||
return provider_name, custom_base.rstrip("/")
|
||||
headers = dict(request.headers)
|
||||
provider_name = proxy.provider_runtime.model_metadata_provider(headers)
|
||||
base_url = (
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
"""``GET /v1/models/{id}`` with ``x-headroom-base-url`` keeps the selected provider.
|
||||
|
||||
The header only overrides the destination. An Anthropic-authenticated request
|
||||
(``x-api-key``) must still go through ``handle_passthrough``'s Anthropic
|
||||
model-id sanitization, so Claude Code's ``[1m]`` context-tier suffix never
|
||||
reaches the named gateway (#4302). These tests run the real
|
||||
``handle_passthrough`` and fake only the upstream HTTP transport, asserting the
|
||||
outbound URL.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import pytest
|
||||
|
||||
pytest.importorskip("fastapi")
|
||||
|
||||
import httpx # noqa: E402
|
||||
from fastapi.testclient import TestClient # noqa: E402
|
||||
|
||||
from headroom.proxy.server import ProxyConfig, create_app # noqa: E402
|
||||
|
||||
GATEWAY = "https://gateway.example"
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def real_passthrough(monkeypatch: pytest.MonkeyPatch):
|
||||
monkeypatch.setenv("HEADROOM_REQUIRE_RUST_CORE", "false")
|
||||
monkeypatch.setenv("HEADROOM_ALLOWED_BASE_URLS", "gateway.example")
|
||||
outbound: list[httpx.Request] = []
|
||||
|
||||
def handler(request: httpx.Request) -> httpx.Response:
|
||||
outbound.append(request)
|
||||
return httpx.Response(200, json={"data": []})
|
||||
|
||||
config = ProxyConfig(
|
||||
optimize=False,
|
||||
cache_enabled=False,
|
||||
rate_limit_enabled=False,
|
||||
cost_tracking_enabled=False,
|
||||
)
|
||||
with TestClient(create_app(config)) as c:
|
||||
c.app.state.proxy.http_client = httpx.AsyncClient(transport=httpx.MockTransport(handler))
|
||||
yield c, outbound
|
||||
|
||||
|
||||
def test_anthropic_auth_with_header_upstream_sanitizes_model_id(real_passthrough) -> None:
|
||||
client, outbound = real_passthrough
|
||||
resp = client.get(
|
||||
"/v1/models/claude-opus-4-8%5B1m%5D",
|
||||
headers={"x-api-key": "sk-ant-test", "x-headroom-base-url": GATEWAY},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
assert [str(r.url) for r in outbound] == [f"{GATEWAY}/v1/models/claude-opus-4-8"]
|
||||
|
||||
|
||||
def test_bearer_auth_with_header_upstream_leaves_model_id_untouched(real_passthrough) -> None:
|
||||
client, outbound = real_passthrough
|
||||
resp = client.get(
|
||||
"/v1/models/some-model%5B1m%5D",
|
||||
headers={"authorization": "Bearer k", "x-headroom-base-url": GATEWAY},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
assert [str(r.url) for r in outbound] == [f"{GATEWAY}/v1/models/some-model[1m]"]
|
||||
Reference in New Issue
Block a user