Add filtering by host, port, and path for MCP tool's getExchanges#2936
Merged
Add filtering by host, port, and path for MCP tool's getExchanges#2936
Conversation
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
📝 WalkthroughWalkthroughAdds server-side request filtering to the MCP ChangesMCP Exchange Filtering Feature
Estimated Code Review Effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Collaborator
Author
|
/ok-to-test |
|
This pull request needs "/ok-to-test" from an authorized committer. |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@core/src/main/java/com/predic8/membrane/core/interceptor/mcp/MembraneMCPServer.java`:
- Around line 240-246: The handler currently accepts a "path" argument but
ignores it in filtering—only "pathPattern" is used—so update the filtering and
schema so "path" is treated as an alias of "pathPattern": modify the stream
filter call that invokes ExchangeUtils.matchesExchangeFilter to pass
getOptionalStringArgument(call, "path") when present (or otherwise
getOptionalStringArgument(call, "pathPattern")), and update the
schema/properties declaration in MembraneMCPServer to document/accept "path" the
same way as "pathPattern" (i.e., add the "path" property and/or map it to
"pathPattern" in validation). Ensure rejectUnexpectedArguments still allows
"path" and that getOptionalStringArgument usage is consistent with existing
getOptionalPort/getOptionalStringArgument calls.
- Around line 242-253: Pre-validate and evaluate the optional arguments before
streaming so invalid inputs are rejected even when there are zero exchanges:
call getOptionalStringArgument(call, "host"), getOptionalPort(call),
getOptionalStringArgument(call, "pathPattern"), getOptionalIntArgument(call,
"limit", maxExchanges, 1, maxExchanges) and
MCPUtil.getOptionalBooleanArgument(call, "includeBodies", false) into local
variables first, use those locals in the ExchangeUtils.matchesExchangeFilter
call and when computing the subList for exchanges, and pass the pre-evaluated
includeBodies local into MCPUtil.describeExchange; this ensures argument
parsing/validation happens up-front rather than inside the stream or when
exchanges are empty.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 6b99bcbd-4452-4c05-a125-22d11d254ad0
📒 Files selected for processing (3)
core/src/main/java/com/predic8/membrane/core/interceptor/mcp/ExchangeUtils.javacore/src/main/java/com/predic8/membrane/core/interceptor/mcp/MCPUtil.javacore/src/main/java/com/predic8/membrane/core/interceptor/mcp/MembraneMCPServer.java
Contributor
There was a problem hiding this comment.
♻️ Duplicate comments (1)
core/src/main/java/com/predic8/membrane/core/interceptor/mcp/MembraneMCPServer.java (1)
242-256:⚠️ Potential issue | 🟠 Major | ⚡ Quick winPre-parse all arguments before the stream.
All filter and response arguments —
host,port,pathPattern, andincludeBodies— are resolved inside the stream lambdas. This has two consequences:
- Correctness gap: when the exchange store is empty, none of the lambda bodies execute, so invalid/malformed argument values are silently accepted.
- Performance:
getOptionalStringArgument/getOptionalPortare invoked once per exchange instead of once per call.🐛 Proposed fix: hoist argument parsing out of the stream
private MCPToolsCallResponse getExchanges(MCPToolsCall call, Exchange exc) { rejectUnexpectedArguments(call, Set.of("limit", "includeBodies", "host", "port", "pathPattern")); + String host = getOptionalStringArgument(call, "host"); + Integer port = getOptionalPort(call); + String pathPattern = getOptionalStringArgument(call, "pathPattern"); + boolean includeBodies = getOptionalBooleanArgument(call, "includeBodies", false); + int limit = getOptionalIntArgument(call, "limit", maxExchanges, 1, maxExchanges); + List<AbstractExchange> filteredExchanges = Optional.ofNullable(getRouter().getExchangeStore().getAllExchangesAsList()) .orElse(List.of()) .stream() - .filter(exchange -> ExchangeUtils.matchesExchangeFilter(exchange, getOptionalStringArgument(call, "host"), getOptionalPort(call), getOptionalStringArgument(call, "pathPattern"))) + .filter(exchange -> ExchangeUtils.matchesExchangeFilter(exchange, host, port, pathPattern)) .toList(); - List<AbstractExchange> exchanges = filteredExchanges.subList(Math.max(0, filteredExchanges.size() - getOptionalIntArgument(call, "limit", maxExchanges, 1, maxExchanges)), filteredExchanges.size()); + List<AbstractExchange> exchanges = filteredExchanges.subList(Math.max(0, filteredExchanges.size() - limit), filteredExchanges.size()); return MCPToolsCallResponse.from(call) .withJson(Map.of( "exchanges", exchanges.stream() - .map(exchange -> MCPUtil.describeExchange(exchange, MCPUtil.getOptionalBooleanArgument(call, "includeBodies", false), payloadSanitizer)) + .map(exchange -> describeExchange(exchange, includeBodies, payloadSanitizer)) .filter(Objects::nonNull) .toList() )); }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@core/src/main/java/com/predic8/membrane/core/interceptor/mcp/MembraneMCPServer.java` around lines 242 - 256, Pre-parse all call arguments before creating the stream: call getOptionalStringArgument for "host" and "pathPattern", getOptionalPort for port, getOptionalIntArgument for "limit" (apply the same bounds logic to compute the start index), and MCPUtil.getOptionalBooleanArgument for "includeBodies"; then use these local variables inside the filter lambda (instead of calling getOptional... inside ExchangeUtils.matchesExchangeFilter) and inside the map that calls MCPUtil.describeExchange so argument parsing happens once and errors surface even when the exchange store is empty.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Duplicate comments:
In
`@core/src/main/java/com/predic8/membrane/core/interceptor/mcp/MembraneMCPServer.java`:
- Around line 242-256: Pre-parse all call arguments before creating the stream:
call getOptionalStringArgument for "host" and "pathPattern", getOptionalPort for
port, getOptionalIntArgument for "limit" (apply the same bounds logic to compute
the start index), and MCPUtil.getOptionalBooleanArgument for "includeBodies";
then use these local variables inside the filter lambda (instead of calling
getOptional... inside ExchangeUtils.matchesExchangeFilter) and inside the map
that calls MCPUtil.describeExchange so argument parsing happens once and errors
surface even when the exchange store is empty.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: a8e42053-573f-4710-8b02-eda3eef0955c
📒 Files selected for processing (1)
core/src/main/java/com/predic8/membrane/core/interceptor/mcp/MembraneMCPServer.java
predic8
approved these changes
May 5, 2026
predic8
approved these changes
May 6, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary by CodeRabbit
New Features
Bug Fixes
Documentation