Repository navigation
Commit 1510aac
committed
fix(server): escape regex special chars in resource template literals
Closes #2961
ResourceTemplate.matches() built its regex via plain string replacement
("{" -> "(?P<", "}" -> ">[^/]+)"), leaving regex-special characters in the
literal parts of the URI template (".", "?", "+", etc.) unescaped. They were
then interpreted as metacharacters, causing false matches:
data://.well-known/{name} matched data://Xwell-known/hello (. = any char)
data://items/{id}.json matched data://items/123Xjson (. = any char)
Escape the whole template with re.escape() first, then substitute the
escaped "{param}" markers with named capture groups so literal characters
are matched literally while parameters still capture.
Adds a regression test that fails without the fix.1 parent a527142 commit 1510aac
2 files changed
Lines changed: 38 additions & 2 deletions
File tree
- src/mcp/server/mcpserver/resources
- tests/server/mcpserver/resources
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
22 | 26 | | |
23 | 27 | | |
24 | 28 | | |
| |||
93 | 97 | | |
94 | 98 | | |
95 | 99 | | |
96 | | - | |
97 | | - | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
98 | 105 | | |
99 | 106 | | |
100 | 107 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
53 | 82 | | |
54 | 83 | | |
55 | 84 | | |
| |||
0 commit comments