mirror of
https://github.com/BerriAI/litellm.git
synced 2026-08-28 05:25:59 +00:00
40ff01b987
An MCP server behind an API gateway needs two credentials on one request: the gateway's own token on a private header, and a separate bearer on Authorization for the server behind it. Every arm that minted or held a token hardcoded Authorization, and the conflict rule then dropped the operator's static Authorization to make room, so the second credential never arrived. ApiKeyConfig already modelled this as header_name plus value_prefix behind a header() method. Extend that carrier to the four minted-token configs, have each resolver arm ask its config which header to use instead of naming one, and drop only the header the resolved credential is about to occupy. Operators set it per server via upstream_token_header, plumbed through config.yaml, the credentials blob, the management API and the admin form, on the M2M, token-exchange, authorization-code and ID-JAG arms. It is non-secret so it stays plaintext and round-trips on admin reads. Unset keeps today's behaviour. Moving a credential off Authorization means it stops inheriting what Authorization gets for free, so the slot now carries those protections itself. httpx drops Authorization when a redirect crosses origin and keeps every other header, so a custom slot is dropped by the client on the same condition, mirroring httpx's own scheme/host/port rule with an agreement test that fails if the two ever diverge. The v1 path also mirrors the v2 conflict rule, so an injected header cannot shadow the credential the gateway resolved for that slot. Which header a credential occupies, and what counts as being that header, was answered independently in nine places by four hand-rolled comparisons. same_header, has_header and without_header in litellm/types/mcp.py are now the one owner, shared by both MCP stacks, and the client derives its slot once instead of three times. The header name reaches egress verbatim, so the RFC 7230 grammar lives in one place and is checked where servers are built: a bad value fails the config load and the management API returns 400, rather than raising while a spec is built and emptying the aggregate tool list for every other server. A blank means unset, matching what the endpoint already accepts. |
||
|---|---|---|
| .. | ||
| auth | ||
| faults | ||
| guardrail_translation | ||
| outbound_credentials | ||
| conftest.py | ||
| test_byok_oauth_endpoints.py | ||
| test_callback_oauth_error_responses.py | ||
| test_db_credentials.py | ||
| test_discoverable_endpoints.py | ||
| test_gateway_dcr_flow.py | ||
| test_is_tool_name_prefixed.py | ||
| test_jwt_mcp_enforcement.py | ||
| test_jwt_mcp_simple.py | ||
| test_mcp_block_recording.py | ||
| test_mcp_cost_calculator.py | ||
| test_mcp_custom_fields.py | ||
| test_mcp_debug.py | ||
| test_mcp_discovery.py | ||
| test_mcp_elicitation_handler.py | ||
| test_mcp_env_vars.py | ||
| test_mcp_guardrail_usage_monitor.py | ||
| test_mcp_header_alias_utils.py | ||
| test_mcp_hook_extra_headers.py | ||
| test_mcp_max_concurrent_requests.py | ||
| test_mcp_metadata_preservation.py | ||
| test_mcp_oauth_passthrough.py | ||
| test_mcp_oauth_passthrough_cold_start.py | ||
| test_mcp_oauth_passthrough_tools.py | ||
| test_mcp_partial_update.py | ||
| test_mcp_sampling_completion_flow.py | ||
| test_mcp_sampling_model_access.py | ||
| test_mcp_sampling_model_resolution.py | ||
| test_mcp_sampling_priority_selection.py | ||
| test_mcp_sampling_request_builder.py | ||
| test_mcp_sampling_response_conversion.py | ||
| test_mcp_sampling_tool_conversion.py | ||
| test_mcp_server.py | ||
| test_mcp_server_identity_env.py | ||
| test_mcp_server_manager.py | ||
| test_mcp_session_logging.py | ||
| test_mcp_sigv4_auth.py | ||
| test_mcp_stale_session.py | ||
| test_mcp_tool_search.py | ||
| test_mcp_toolset_scope.py | ||
| test_oauth2_flow_backfill.py | ||
| test_oauth2_token_cache.py | ||
| test_oauth_issuer_stamp_backfill.py | ||
| test_openapi_to_mcp_generator.py | ||
| test_openapi_tool_auth.py | ||
| test_proxy_api_credentials.py | ||
| test_rest_endpoints.py | ||
| test_semantic_tool_filter.py | ||
| test_short_mcp_tool_prefix.py | ||
| test_ui_session_utils.py | ||
| test_utils.py | ||