scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-08 03:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 183

fix(mcp): allow_all_keys backward compat, blocked_tools API write-path, efficient startup query

Browse source
This commit is contained in:
Ishaan Jaffer 2026-03-23 13:15:53 -07:00
parent 88af7dca02
commit 9c1ae5d149
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
View file

@ -792,11 +792,16 @@ class MCPServerManager:
f"Allowed MCP Servers for user api key auth: {allowed_mcp_servers}"
)
combined_servers = set(allowed_mcp_servers)
# Only add allow_all_keys servers when there is no explicit server
# restriction on the key/object_permission. When mcp_servers is
# explicitly set (e.g. by a toolset scope), the explicit list IS
# the permission boundary — allow_all_keys servers must not bleed in.
if not has_explicit_object_permission:
# Only skip allow_all_keys servers when the request is inside a toolset
# scope. _apply_toolset_scope marks this by setting mcp_toolsets=[].
# For regular keys (mcp_toolsets=None) or keys with configured toolsets
# (mcp_toolsets=[...non-empty...]), allow_all_keys servers must still be
# included to preserve backward-compatible behavior.
op = user_api_key_auth.object_permission if user_api_key_auth else None
in_toolset_scope = (
op is not None and op.mcp_servers is not None and op.mcp_toolsets == []
)
if not in_toolset_scope:
combined_servers.update(allow_all_server_ids)
if len(combined_servers) == 0:
@ -2554,18 +2559,19 @@ class MCPServerManager:
prisma_client = get_prisma_client_or_throw(
"Database not connected. Connect a database to your proxy"
)
_all_db_mcp_servers = await get_all_mcp_servers(
prisma_client, approval_status=None
# Load only "active", legacy "approved", and NULL (no approval workflow) rows.
# Pending/rejected servers are excluded at the DB level so we never load them.
from litellm.proxy._experimental.mcp_server.db import LiteLLM_MCPServerTable
raw_rows = await prisma_client.db.litellm_mcpservertable.find_many(
where={
"OR": [
{"approval_status": None},
{"approval_status": {"in": ["active", "approved"]}},
]
}
)
# Load servers that are "active" (explicit approval) or "approved"
# (legacy default value pre-dating the approval workflow).
# Exclude "pending_review" and "rejected".
_load_statuses = {"active", "approved"}
db_mcp_servers = [
s
for s in _all_db_mcp_servers
if s.approval_status in _load_statuses or s.approval_status is None
]
db_mcp_servers = [LiteLLM_MCPServerTable(**r.model_dump()) for r in raw_rows]
verbose_logger.info(f"Found {len(db_mcp_servers)} MCP servers in database")
previous_registry = self.registry

1
litellm/proxy/_types.py
View file

@ -856,6 +856,7 @@ class LiteLLM_ObjectPermissionBase(LiteLLMPydanticObjectBase):
mcp_access_groups: Optional[List[str]] = None
mcp_tool_permissions: Optional[Dict[str, List[str]]] = None
mcp_toolsets: Optional[List[str]] = None
blocked_tools: Optional[List[str]] = None
vector_stores: Optional[List[str]] = None
agents: Optional[List[str]] = None
agent_access_groups: Optional[List[str]] = None