modelcontextprotocol/inspector
Watch
1
0
Fork
You've already forked inspector
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix: accept a path-less skill root URI in normalizeSkillUri (#2295)

Browse source 
`skill://data-analysis` has an authority and an empty path, which RFC 3986
permits, but the guard required a pathname starting with "/". A server echoing
the skill root back in a directory read was therefore labelled "outside this
skill" instead of "not a direct child". Opaque URIs (`skill:demo`) stay
rejected; a path-less root still names no skill file, so it fails every check
that needs one.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VQ2eszDCUqTmhtTMaznw3W
Signed-off-by: cliffhall <cliff@futurescale.com>
This commit is contained in:
cliffhall 2026-09-14 00:00:49 -04:00
commit 528a37be38
2 changed files with 63 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
clients/web/src/components/screens/SkillsScreen/SkillsScreen.test.tsx
View file

@ -2184,6 +2184,31 @@ describe("SkillsScreen directory browsing (#2248)", () => {
).not.toBeInTheDocument();
});
it("names a skill root echoed back among its own children as not a direct child (#2295)", async () => {
// The root is path-less (`skill://data-analysis`), which
// `normalizeSkillUri` used to reject — so the containment check failed and
// the row read "outside this skill" while being the skill itself.
const user = userEvent.setup();
const ROOT_SELF = {
uri: ROOT,
name: "data-analysis",
mimeType: "inode/directory",
};
await openRoot(
user,
directoryReader({ [ROOT]: { resources: [CHILD_FILE, ROOT_SELF] } }),
);
const table = within(screen.getByTestId("skill-directory"));
expect(table.getByText(/not a direct child/)).toBeInTheDocument();
expect(table.queryByText(/outside this skill/)).not.toBeInTheDocument();
expect(
table.queryByRole("button", { name: `Open directory ${ROOT}` }),
).not.toBeInTheDocument();
expect(
table.getByRole("button", { name: `View ${CHILD_FILE.uri}` }),
).toBeInTheDocument();
});
it("navigates on the normalized URI, so Up cannot walk into a `..` segment", async () => {
// Containment was decided on the normalized URI while navigation sent and
// stored the raw one, so for `skill://root/a/../templates` the first Up

25
clients/web/src/test/core/mcp/skills.test.ts
View file

@ -174,6 +174,31 @@ describe("normalizeSkillUri", () => {
// `skill:demo/../x.md` parses but keeps its `..` verbatim, so containment
// could not be decided on it — accepting it would reopen the hole.
expect(normalizeSkillUri("skill:demo/SKILL.md")).toBeUndefined();
// Path-less but still opaque: no authority, so it stays rejected.
expect(normalizeSkillUri("skill:demo")).toBeUndefined();
});
it("accepts a path-less authority URI — a skill's root directory (#2295)", () => {
// RFC 3986 gives an authority URI an empty path, so `skill://data-analysis`
// is well-formed; rejecting it mislabelled a root echoed back by a
// directory read as "outside this skill".
expect(normalizeSkillUri("skill://data-analysis")).toBe(
"skill://data-analysis",
);
expect(normalizeSkillUri("skill://%64ata-analysis")).toBe(
"skill://data-analysis",
);
});
it("still treats a path-less root as naming no skill file", () => {
// Accepting the root must not let it pass a check that needs a file.
expect(skillNameFromUri("skill://data-analysis")).toBeUndefined();
const issues = checkSkillConformance({
uri: "skill://data-analysis",
frontmatter: { name: "data-analysis", description: "d" },
resources: [],
});
expect(issues.map((issue) => issue.code)).toContain("malformed-uri");
});
it("decodes escapes that stand for unreserved characters", () => {