Skip to content

fix: reject MCP requests from unapproved browser origins - #2657

Open
erichare wants to merge 2 commits into
fix/mcp-request-isolationfrom
fix/mcp-origin-allowlist
Open

erichare wants to merge 2 commits into
fix/mcp-request-isolationfrom
fix/mcp-origin-allowlist

Conversation

@erichare

@erichare erichare commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

What this PR does:

Rejects MCP requests whose Origin header is not on the new stargate.jsonapi.mcp.allowed-origins allowlist, with HTTP 403 and a fixed JSON-RPC error containing a null id. The list is empty by default, and requests without an Origin header are unchanged. The check runs before CORS and authentication. Approved Origins can complete preflight and read WWW-Authenticate; approval never skips authentication. The localhost-only Quarkiverse check is disabled so the allowlist is the single policy.

Which issue(s) this PR fixes:

Part of #2630, which remains open. Public edge verification belongs to #2634, and the launch Origins are not yet recorded in #2624.

Verification

65 focused tests passed with 0 failures, 0 errors, and 0 skips at b94c89dc7, this PR's commit in the rebuilt stack. The format check found 0 non-complying files out of 1,221. CI runs the unit and DSE/HCD integration suites on this push.

JAVA_HOME=/Library/Java/JavaVirtualMachines/graalvm-21.jdk/Contents/Home ./mvnw -B -ntp com.spotify.fmt:fmt-maven-plugin:check test -DskipITs -Dxml-format.skip=true -Dsurefire.failIfNoSpecifiedTests=false -Dquarkus.http.test-port=19089 '-Dtest=McpOriginFilterTest,McpOriginPolicyTest,McpOriginDefaultPolicyTest,McpProtocolTest'

The full unit suite, packaged integration tests, and manual browser checks were not run locally.

Checklist

  • Changes manually tested
  • Automated Tests added/updated
  • Documentation added/updated
  • CLA Signed: DataStax CLA

MCP stack

Merges bottom up; row 1 is the bottom of the stack.

# PR Change Issue
1 #2651 Show accepted update syntax in tool schemas Fixes #2631
2 #2658 Describe every tool argument Part of #2604
3 #2645 Close the command context after each call Part of #2629
4 #2653 Return useful errors when setup fails Fixes #2628
5 #2648 Keep payloads and credentials out of logs Fixes #2635
6 #2649 Describe side effects and retry behavior Fixes #2636
7 #2655 Validate commands like the HTTP API Fixes #2632
8 #2656 Test request isolation, document tracing Refs #2629
9 #2657 Reject unapproved browser origins Part of #2630
10 #2659 Serve only protocol 2026-07-28 Part of #2625, #2626
11 #2669 Add opt-in OAuth authentication Refs #2642, #2643

@github-actions

github-actions Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

📈 Unit Test Coverage Delta vs Main Branch

Metric Value
Main Branch 56.74%
This PR 58.14%
Delta 🟢 +1.41%
✅ Coverage improved!

@github-actions

github-actions Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

Unit Test Coverage Report

Overall Project 58.14% -0.11% 🍏
Files changed 60.27% 🍏

File Coverage
McpOriginFilter.java 60.27% -39.73% 🍏

@github-actions

github-actions Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

📈 Integration Test Coverage Delta vs Main Branch (dse69-it)

Metric Value
Main Branch 72.98%
This PR 72.99%
Delta 🟢 +0.00%
✅ Coverage improved!

@github-actions

github-actions Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

Integration Test Coverage Report (dse69-it)

Overall Project 72.99% -0.16% 🍏
Files changed 41.41% ❌

File Coverage
McpOriginFilter.java 41% -58% ❌

@github-actions

github-actions Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

📉 Integration Test Coverage Delta vs Main Branch (hcd-it)

Metric Value
Main Branch 74.33%
This PR 74.32%
Delta 🔴 -0.01%
⚠️ Coverage decreased

@github-actions

github-actions Bot commented Oct 23, 2026 •

Copy link
Copy Markdown
Contributor

Integration Test Coverage Report (hcd-it)

Overall Project 74.32% -0.16% 🍏
Files changed 41.41% ❌

File Coverage
McpOriginFilter.java 41% -58% ❌

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

1 participant