Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

test(tools): exercise MCP provider lookups with SQLite (#44981)

Winoren52b15b8824cd
diff --git a/api/tests/unit_tests/services/tools/test_mcp_tools_manage_service.py b/api/tests/unit_tests/services/tools/test_mcp_tools_manage_service.py
index ef073a6bda5..95ef5320ed0 100644
--- a/api/tests/unit_tests/services/tools/test_mcp_tools_manage_service.py
+++ b/api/tests/unit_tests/services/tools/test_mcp_tools_manage_service.py
@@ -1,141 +1,160 @@
-"""Test cases for MCP provider lookups.
+"""Exercise tenant-scoped MCP provider lookups against persisted rows.
-The two lookups are deliberately separate: `provider_id` always means the
-primary key and `server_identifier` always means the tenant-scoped identifier,
-so a value can never silently resolve through the wrong column.
+Primary keys and server identifiers are distinct, even when an identifier looks
+like a UUID or collides with another provider's primary key.
"""
-from unittest.mock import Mock
+from typing import Literal
import pytest
+from sqlalchemy.orm import Session
from models.tools import MCPToolProvider
from services.tools.mcp_tools_manage_service import MCPToolManageService
PROVIDER_UUID = "0b2bd1e4-3a7d-4a0b-9f2a-9b2d6f3c1e55"
+OTHER_PROVIDER_UUID = "00000000-0000-4000-8000-000000000002"
SERVER_IDENTIFIER = "monday_mcp"
TENANT_ID = "3f0a1c4e-1f3d-4a4e-9a1f-2a6f8c5d0b11"
+OTHER_TENANT_ID = "00000000-0000-4000-8000-000000000003"
-def _provider() -> MCPToolProvider:
- return MCPToolProvider(
- name="Monday",
- server_identifier=SERVER_IDENTIFIER,
- server_url="https://example.com/mcp",
- server_url_hash="hash",
+def _provider(
+ *, provider_id: str = PROVIDER_UUID, server_identifier: str = SERVER_IDENTIFIER, tenant_id: str = TENANT_ID
+) -> MCPToolProvider:
+ provider = MCPToolProvider(
+ name=f"MCP {provider_id}",
+ server_identifier=server_identifier,
+ server_url=f"https://example.com/mcp/{provider_id}",
+ server_url_hash=provider_id,
icon="icon",
- tenant_id=TENANT_ID,
+ tenant_id=tenant_id,
user_id="user-id",
)
+ provider.id = provider_id
+ return provider
-def session() -> Mock:
- return Mock()
+def _persist(session: Session, *providers: MCPToolProvider) -> None:
+ session.add_all(providers)
+ session.commit()
+ session.expire_all()
@pytest.fixture
-def service(session: Mock) -> MCPToolManageService:
- return MCPToolManageService(session=session)
+def service(sqlite_session: Session) -> MCPToolManageService:
+ return MCPToolManageService(session=sqlite_session)
-def test_get_provider_by_id_queries_primary_key(service: MCPToolManageService, session: Mock) -> None:
+def test_get_provider_by_id_queries_primary_key(service: MCPToolManageService, sqlite_session: Session) -> None:
provider = _provider()
- session.scalar.return_value = provider
-
- assert service.get_provider_by_id(provider_id=PROVIDER_UUID, tenant_id=TENANT_ID) is provider
+ identifier_collision = _provider(provider_id=OTHER_PROVIDER_UUID, server_identifier=PROVIDER_UUID)
+ _persist(sqlite_session, identifier_collision, provider)
- where = str(session.scalar.call_args.args[0].whereclause)
- assert "tool_mcp_providers.id = " in where
- assert "server_identifier" not in where
+ assert service.get_provider_by_id(provider_id=PROVIDER_UUID, tenant_id=TENANT_ID).id == provider.id
-def test_get_provider_by_id_rejects_server_identifier(service: MCPToolManageService, session: Mock) -> None:
- """A server identifier in the provider_id slot must not reach the uuid column."""
+def test_get_provider_by_id_rejects_server_identifier(unbound_session: Session) -> None:
+ """Invalid UUIDs must be rejected before any database access is attempted."""
+ service = MCPToolManageService(session=unbound_session)
with pytest.raises(ValueError, match="expected a valid UUID"):
service.get_provider_by_id(provider_id=SERVER_IDENTIFIER, tenant_id=TENANT_ID)
- session.scalar.assert_not_called()
-
-
-def test_get_provider_by_id_not_found(service: MCPToolManageService, session: Mock) -> None:
- session.scalar.return_value = None
+def test_get_provider_by_id_not_found(service: MCPToolManageService) -> None:
with pytest.raises(ValueError, match="MCP tool not found"):
service.get_provider_by_id(provider_id=PROVIDER_UUID, tenant_id=TENANT_ID)
-def test_get_provider_by_server_identifier_queries_identifier(service: MCPToolManageService, session: Mock) -> None:
- provider = _provider()
- session.scalar.return_value = provider
-
- result = service.get_provider_by_server_identifier(server_identifier=SERVER_IDENTIFIER, tenant_id=TENANT_ID)
+def test_get_provider_by_server_identifier_queries_identifier(
+ service: MCPToolManageService, sqlite_session: Session
+) -> None:
+ primary_key_collision = _provider()
+ provider = _provider(provider_id=OTHER_PROVIDER_UUID, server_identifier=PROVIDER_UUID)
+ _persist(sqlite_session, primary_key_collision, provider)
- assert result is provider
- assert "tool_mcp_providers.server_identifier = " in str(session.scalar.call_args.args[0].whereclause)
+ result = service.get_provider_by_server_identifier(server_identifier=PROVIDER_UUID, tenant_id=TENANT_ID)
+ assert result.id == provider.id
-def test_get_provider_by_server_identifier_not_found(service: MCPToolManageService, session: Mock) -> None:
- session.scalar.return_value = None
+def test_get_provider_by_server_identifier_not_found(service: MCPToolManageService) -> None:
with pytest.raises(ValueError, match="MCP tool not found"):
service.get_provider_by_server_identifier(server_identifier=SERVER_IDENTIFIER, tenant_id=TENANT_ID)
-def test_persisted_reference_non_uuid_queries_identifier_only(service: MCPToolManageService, session: Mock) -> None:
+def test_persisted_reference_non_uuid_queries_identifier_only(
+ service: MCPToolManageService, sqlite_session: Session
+) -> None:
provider = _provider()
- session.scalar.return_value = provider
+ _persist(sqlite_session, provider)
assert (
- service.get_provider_by_persisted_reference(id_or_server_identifier=SERVER_IDENTIFIER, tenant_id=TENANT_ID)
- is provider
+ service.get_provider_by_persisted_reference(id_or_server_identifier=SERVER_IDENTIFIER, tenant_id=TENANT_ID).id
+ == provider.id
)
- # A non-uuid reference can only be a server identifier, so the primary-key
- # lookup is never attempted.
- assert session.scalar.call_count == 1
- assert "tool_mcp_providers.server_identifier = " in str(session.scalar.call_args.args[0].whereclause)
-
-def test_persisted_reference_uuid_prefers_primary_key(service: MCPToolManageService, session: Mock) -> None:
- """Graphs written before the server-identifier convention still carry the primary key."""
+def test_persisted_reference_uuid_prefers_primary_key(service: MCPToolManageService, sqlite_session: Session) -> None:
+ """Legacy graph references prefer the primary key when both meanings resolve."""
provider = _provider()
- session.scalar.return_value = provider
+ identifier_collision = _provider(provider_id=OTHER_PROVIDER_UUID, server_identifier=PROVIDER_UUID)
+ _persist(sqlite_session, identifier_collision, provider)
assert (
- service.get_provider_by_persisted_reference(id_or_server_identifier=PROVIDER_UUID, tenant_id=TENANT_ID)
- is provider
+ service.get_provider_by_persisted_reference(id_or_server_identifier=PROVIDER_UUID, tenant_id=TENANT_ID).id
+ == provider.id
)
- assert session.scalar.call_count == 1
- assert "tool_mcp_providers.id = " in str(session.scalar.call_args.args[0].whereclause)
-
-def test_persisted_reference_uuid_falls_back_to_identifier(service: MCPToolManageService, session: Mock) -> None:
- """A server identifier is free text, so it may itself look like a uuid."""
- provider = _provider()
- session.scalar.side_effect = [None, provider]
+def test_persisted_reference_uuid_falls_back_to_identifier(
+ service: MCPToolManageService, sqlite_session: Session
+) -> None:
+ """A foreign primary-key match must not hide the tenant's UUID-shaped identifier."""
+ foreign_primary_key = _provider(tenant_id=OTHER_TENANT_ID)
+ provider = _provider(provider_id=OTHER_PROVIDER_UUID, server_identifier=PROVIDER_UUID)
+ _persist(sqlite_session, foreign_primary_key, provider)
assert (
- service.get_provider_by_persisted_reference(id_or_server_identifier=PROVIDER_UUID, tenant_id=TENANT_ID)
- is provider
+ service.get_provider_by_persisted_reference(id_or_server_identifier=PROVIDER_UUID, tenant_id=TENANT_ID).id
+ == provider.id
)
- assert session.scalar.call_count == 2
- assert "tool_mcp_providers.server_identifier = " in str(session.scalar.call_args.args[0].whereclause)
-
-def test_persisted_reference_not_found(service: MCPToolManageService, session: Mock) -> None:
- session.scalar.return_value = None
-
- # Never the primary-key lookup's "expected a valid UUID", which would
- # misdescribe a legitimate reference.
[email protected]("reference", [SERVER_IDENTIFIER, PROVIDER_UUID])
+def test_persisted_reference_not_found(service: MCPToolManageService, reference: str) -> None:
with pytest.raises(ValueError, match="MCP tool not found"):
- service.get_provider_by_persisted_reference(id_or_server_identifier=SERVER_IDENTIFIER, tenant_id=TENANT_ID)
-
+ service.get_provider_by_persisted_reference(id_or_server_identifier=reference, tenant_id=TENANT_ID)
+
+
[email protected]("lookup", ["id", "server_identifier", "persisted_id", "persisted_identifier"])
+def test_provider_lookups_reject_foreign_tenants(
+ service: MCPToolManageService,
+ sqlite_session: Session,
+ lookup: Literal["id", "server_identifier", "persisted_id", "persisted_identifier"],
+) -> None:
+ _persist(sqlite_session, _provider(tenant_id=OTHER_TENANT_ID))
+
+ if lookup == "id":
+ with pytest.raises(ValueError, match="MCP tool not found"):
+ service.get_provider_by_id(provider_id=PROVIDER_UUID, tenant_id=TENANT_ID)
+ elif lookup == "server_identifier":
+ with pytest.raises(ValueError, match="MCP tool not found"):
+ service.get_provider_by_server_identifier(server_identifier=SERVER_IDENTIFIER, tenant_id=TENANT_ID)
+ else:
+ with pytest.raises(ValueError, match="MCP tool not found"):
+ service.get_provider_by_persisted_reference(
+ id_or_server_identifier=PROVIDER_UUID if lookup == "persisted_id" else SERVER_IDENTIFIER,
+ tenant_id=TENANT_ID,
+ )
+
+
+def test_server_identifier_can_be_reused_across_tenants(service: MCPToolManageService, sqlite_session: Session) -> None:
+ foreign = _provider(tenant_id=OTHER_TENANT_ID)
+ provider = _provider(provider_id=OTHER_PROVIDER_UUID)
+ _persist(sqlite_session, foreign, provider)
-def test_persisted_reference_uuid_not_found(service: MCPToolManageService, session: Mock) -> None:
- session.scalar.return_value = None
-
- with pytest.raises(ValueError, match="MCP tool not found"):
- service.get_provider_by_persisted_reference(id_or_server_identifier=PROVIDER_UUID, tenant_id=TENANT_ID)
+ assert (
+ service.get_provider_by_server_identifier(server_identifier=SERVER_IDENTIFIER, tenant_id=TENANT_ID).id
+ == provider.id
+ )