π The fast, Pythonic way to build MCP servers and clients.
Encode manifest paths in download_skill URIs (#6376)
nate nowack246d7ecd2d1b
diff --git a/fastmcp_slim/fastmcp/utilities/skills.py b/fastmcp_slim/fastmcp/utilities/skills.pyindex ab630905f..a64f014c1 100644--- a/fastmcp_slim/fastmcp/utilities/skills.py+++ b/fastmcp_slim/fastmcp/utilities/skills.py@@ -12,6 +12,7 @@ import warningsfrom dataclasses import dataclassfrom pathlib import Pathfrom typing import TYPE_CHECKING+from urllib.parse import quoteimport mcp_types@@ -239,7 +240,7 @@ async def _download_skill(if not file_path.is_relative_to(skill_dir):continue- file_uri = f"skill://{skill_name}/{file_info.path}"+ file_uri = f"skill://{skill_name}/{quote(file_info.path, safe='/')}"result = await client.read_resource(file_uri)if not result:diff --git a/tests/utilities/test_skills.py b/tests/utilities/test_skills.pyindex ef4cb09ff..d40d56c8d 100644--- a/tests/utilities/test_skills.py+++ b/tests/utilities/test_skills.py@@ -404,6 +404,50 @@ class TestDownloadSkill:"skill://malicious/SKILL.md",]+ async def test_quotes_manifest_paths_when_reading_resources(self, tmp_path: Path):+ manifest = {+ "skill": "encoded",+ "files": [+ {"path": "100 score.md", "size": 5, "hash": "sha256:space"},+ {"path": "100%20score.md", "size": 6, "hash": "sha256:percent"},+ {"path": "notes#1.md", "size": 5, "hash": "sha256:hash"},+ {"path": "team/ref.md", "size": 6, "hash": "sha256:nested"},+ ],+ }+ client = FakeResourceReader(+ {+ "skill://encoded/_manifest": [+ text_resource("skill://encoded/_manifest", json.dumps(manifest))+ ],+ "skill://encoded/100%20score.md": [+ text_resource("skill://encoded/100%20score.md", "SPACE")+ ],+ "skill://encoded/100%2520score.md": [+ text_resource("skill://encoded/100%2520score.md", "PERCENT")+ ],+ "skill://encoded/notes%231.md": [+ text_resource("skill://encoded/notes%231.md", "HASH!")+ ],+ "skill://encoded/team/ref.md": [+ text_resource("skill://encoded/team/ref.md", "NESTED")+ ],+ }+ )++ result = await download_skill(cast(Client, client), "encoded", tmp_path)++ assert (result / "100 score.md").read_text() == "SPACE"+ assert (result / "100%20score.md").read_text() == "PERCENT"+ assert (result / "notes#1.md").read_text() == "HASH!"+ assert (result / "team" / "ref.md").read_text() == "NESTED"+ assert client.requested_uris == [+ "skill://encoded/_manifest",+ "skill://encoded/100%20score.md",+ "skill://encoded/100%2520score.md",+ "skill://encoded/notes%231.md",+ "skill://encoded/team/ref.md",+ ]+async def test_downloads_blob_resources(self, tmp_path: Path):data = b"\x00\x01binary data"manifest = {