fix: enhance URI matching to support query parameters

Author: sheegansrigm

mcp-core/src/main/java/io/modelcontextprotocol/util/DefaultMcpUriTemplateManager.java

@@ -141,14 +141,34 @@ public boolean matches(String uri) {
 			return uri.equals(this.uriTemplate);
 		}
 
-		// Convert the pattern to a regex
-		String regex = this.uriTemplate.replaceAll("\\{[^/]+?\\}", "([^/]+?)");
-		regex = regex.replace("/", "\\/");
+		// Convert the URI template into a robust regex pattern that escapes special
+        // characters like '?'.
+        StringBuilder patternBuilder = new StringBuilder("^");
+        Matcher variableMatcher = URI_VARIABLE_PATTERN.matcher(this.uriTemplate);
+        int lastEnd = 0;
+
+        while (variableMatcher.find()) {
+            // Append the literal part of the template, safely quoted
+            String textBefore = this.uriTemplate.substring(lastEnd, variableMatcher.start());
+            patternBuilder.append(Pattern.quote(textBefore));
+            // Append a capturing group for the variable itself
+            patternBuilder.append("([^/]+?)");
+            lastEnd = variableMatcher.end();
+        }
+
+        // Append any remaining literal text after the last variable
+        if (lastEnd < this.uriTemplate.length()) {
+            patternBuilder.append(Pattern.quote(this.uriTemplate.substring(lastEnd)));
+        }
+
+        patternBuilder.append("$");
 
 		// Check if the URI matches the regex
-		return Pattern.compile(regex).matcher(uri).matches();
+        return Pattern.compile(patternBuilder.toString()).matcher(uri).matches();
 	}
 
+
+
 	@Override
 	public boolean isUriTemplate(String uri) {
 		return URI_VARIABLE_PATTERN.matcher(uri).find();

mcp-core/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java

@@ -94,4 +94,12 @@ void shouldMatchUriAgainstTemplatePattern() {
 		assertFalse(uriTemplateManager.matches("/api/users/123/comments/456"));
 	}
 
+    @Test
+    void shouldMatchUriWithQueryParameters() {
+        String templateWithQuery = "file://name/search?={search}";
+        var uriTemplateManager = this.uriTemplateFactory.create(templateWithQuery);
+
+        assertTrue(uriTemplateManager.matches("file://name/search?=abcd"),
+                "Should correctly match a URI containing query parameters.");
+    }
 }