-
Notifications
You must be signed in to change notification settings - Fork 0
feat: add wildcard tool filtering support with * patterns #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -3,6 +3,7 @@ | |||||
import { McpProxyServer } from './proxy-server.js'; | ||||||
import type { ProxyConfig, Tool } from './types.js'; | ||||||
import { TargetServerManager } from './target-server.js'; | ||||||
import { matchesToolPattern } from './utils.js'; | ||||||
|
||||||
function parseListToolsArguments(args: string[]): ProxyConfig { | ||||||
if (args.length === 0) { | ||||||
|
@@ -65,7 +66,9 @@ function parseArguments(): ProxyConfig { | |||||
if (args.length === 0) { | ||||||
process.stderr.write('Usage: mcp-controller [--enabled-tools <tool1,tool2,...>] [--disabled-tools <tool1,tool2,...>] <command> [args...]\n'); | ||||||
process.stderr.write(' mcp-controller list-tools [--enabled-tools <tool1,tool2,...>] [--disabled-tools <tool1,tool2,...>] <command> [args...]\n'); | ||||||
process.stderr.write('Tool patterns support wildcards: use * to match any characters (e.g., get_* matches get_logs, get_metrics)\n'); | ||||||
process.stderr.write('Example: mcp-controller --enabled-tools add,subtract bun run server.ts\n'); | ||||||
process.stderr.write('Example: mcp-controller --enabled-tools "get_*,list_*" bun run server.ts\n'); | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The indentation is inconsistent with the surrounding lines. This line should be indented to match the other process.stderr.write statements above and below it.
Suggested change
Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||||||
process.stderr.write('Example: mcp-controller list-tools bun run server.ts\n'); | ||||||
process.stderr.write('Example: mcp-controller --disabled-tools dangerous-tool bun run server.ts\n'); | ||||||
process.exit(1); | ||||||
|
@@ -201,9 +204,9 @@ async function listTools(config: ProxyConfig): Promise<void> { | |||||
let tools = response.result.tools || []; | ||||||
|
||||||
if (config.enabledTools) { | ||||||
tools = tools.filter((tool: Tool) => config.enabledTools!.includes(tool.name)); | ||||||
tools = tools.filter((tool: Tool) => config.enabledTools!.some(pattern => matchesToolPattern(tool.name, pattern))); | ||||||
} else if (config.disabledTools) { | ||||||
tools = tools.filter((tool: Tool) => !config.disabledTools!.includes(tool.name)); | ||||||
tools = tools.filter((tool: Tool) => !config.disabledTools!.some(pattern => matchesToolPattern(tool.name, pattern))); | ||||||
} | ||||||
|
||||||
// Print tools in the requested format | ||||||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
export function matchesToolPattern(toolName: string, pattern: string): boolean { | ||
// Exact match for patterns without wildcards (backward compatibility) | ||
if (!pattern.includes('*')) { | ||
return toolName === pattern; | ||
} | ||
|
||
// Convert glob pattern to regex with proper escaping | ||
const escapedPattern = pattern | ||
.replace(/[.+^${}()|[\]\\]/g, '\\$&') // Escape regex special chars | ||
.replace(/\*/g, '.*'); // Replace * with .* | ||
|
||
const regex = new RegExp(`^${escapedPattern}$`); | ||
return regex.test(toolName); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The indentation is inconsistent with the surrounding lines. This line should be indented to match the other process.stderr.write statements above and below it.
Copilot uses AI. Check for mistakes.