π The fast, Pythonic way to build MCP servers and clients.
fix: preserve _list_query_params in FastMCPProviderResourceTemplate.wrap (#6130)
Rhinkar Shaha76b9bd62ab3
diff --git a/fastmcp_slim/fastmcp/server/providers/fastmcp_provider.py b/fastmcp_slim/fastmcp/server/providers/fastmcp_provider.pyindex 4fbd92726..158158db7 100644--- a/fastmcp_slim/fastmcp/server/providers/fastmcp_provider.py+++ b/fastmcp_slim/fastmcp/server/providers/fastmcp_provider.py@@ -311,6 +311,7 @@ class FastMCPProviderResourceTemplate(ResourceTemplate):# compiled pattern instead of rebuilding it per wrapper.template._compiled_pattern()wrapped._pattern = template._pattern+ wrapped._list_query_params = template._list_query_paramsreturn wrappedasync def create_resource(self, uri: str, params: dict[str, Any]) -> Resource:diff --git a/tests/resources/test_resource_template.py b/tests/resources/test_resource_template.pyindex f0f0c5afe..5a2c8c6f2 100644--- a/tests/resources/test_resource_template.py+++ b/tests/resources/test_resource_template.py@@ -915,6 +915,34 @@ class TestMalformedURITemplates:scalar = template.model_copy(update={"_list_query_params": frozenset()})assert scalar.matches("items://all?tags=a,b") == {"tags": "a,b"}+ async def test_mounted_template_wrapper_preserves_list_query_params(self):+ from fastmcp.exceptions import ResourceSecurityError+ from fastmcp.server.providers.fastmcp_provider import (+ FastMCPProviderResourceTemplate,+ )++ child = FastMCP("child", resource_security=None)++ @child.resource("files://{category}{?paths}")+ def read_files(+ category: str, paths: list[str] = Field(default_factory=list)+ ) -> str:+ return str(paths)++ [source] = await child.list_resource_templates()+ wrapped = FastMCPProviderResourceTemplate.wrap(child, source)+ assert wrapped.matches("files://docs?paths=a,b") == {+ "category": "docs",+ "paths": ["a", "b"],+ }++ parent = FastMCP("parent")+ parent.mount(child)+ with pytest.raises(ResourceSecurityError):+ await parent.read_resource("files://docs?paths=safe.txt,..")+ with pytest.raises(ResourceSecurityError):+ await parent.read_resource("files://docs?paths=safe.txt,/etc/passwd")+def test_shared_pattern_cache_is_bounded(self):"""Template strings can come from a proxied server, so the shared cachemust not grow with every template a remote ever sends."""