Validate origin header #771
Merged
+1,810
−38
Conversation
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
- Fixes #695 - Does not implement Host header validation yet Signed-off-by: Daniel Garnier-Moiroux <git@garnier.wf>
Kehrlann
requested review from
chemicL and
tzolov
and removed request for
chemicL
Signed-off-by: Daniel Garnier-Moiroux <git@garnier.wf>
Kehrlann
force-pushed
the
dgarnier/validate-origin-header
branch
from
e5624d4 to
68ed795
Compare
tzolov
approved these changes
Feb 5, 2026
|
|
||
| @Test | ||
| void differentSchemeWithWildcard() { | ||
| var headers = originHeader("https://localhost:3000"); |
Contributor
There was a problem hiding this comment.
shouldn't the port be 8080 to ensure that it fails because of the schema?
Contributor
Author
There was a problem hiding this comment.
It's using the the wildcard validator, so the port does not matter:
private final DefaultServerTransportSecurityValidator wildcardValidator =
DefaultServerTransportSecurityValidator
.builder()
.allowedOrigin("http://localhost:*")
.build();
chemicL
reviewed
Feb 10, 2026
...n/java/io/modelcontextprotocol/server/transport/DefaultServerTransportSecurityValidator.java
Show resolved
Hide resolved
...n/java/io/modelcontextprotocol/server/transport/DefaultServerTransportSecurityValidator.java
Show resolved
Hide resolved
...ain/java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportProvider.java
Show resolved
Hide resolved
Comment on lines
+138
to
+145
| try { | ||
| Map<String, List<String>> headers = extractHeaders(request); | ||
| this.securityValidator.validateHeaders(headers); | ||
| } | ||
| catch (ServerTransportSecurityException e) { | ||
| response.sendError(e.getStatusCode(), e.getMessage()); | ||
| return; | ||
| } |
Member
There was a problem hiding this comment.
This code is duplicated across three implementations, perhaps we can have a centralized static utility for it?
.../main/java/io/modelcontextprotocol/server/transport/HttpServletStatelessServerTransport.java
Show resolved
Hide resolved
...a/io/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java
Show resolved
Hide resolved
...a/io/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java
Show resolved
Hide resolved
...a/io/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java
Show resolved
Hide resolved
...t/java/io/modelcontextprotocol/server/transport/ServerTransportSecurityIntegrationTests.java
Show resolved
Hide resolved
...rc/main/java/io/modelcontextprotocol/server/transport/WebFluxSseServerTransportProvider.java
Show resolved
Hide resolved
Kehrlann
added a commit
that referenced
this pull request
Feb 12, 2026
Kehrlann
added a commit
that referenced
this pull request
Feb 12, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Fixes #695 . Updates conformance tests.
Contents
Add Origin header validation for HTTP-based MCP server transports so servers can restrict which origins can connect (e.g. browser or cross-origin clients).
Introduces new
ServerTransportSecurityValidatorinterface, to validate transport-level security. Default behavior stays permissive: transports useServerTransportSecurityValidator.NOOPunless a validator is set via the builder.The provided implementation is
DefaultServerTransportSecurityValidatorand only validates the Origin header, for now.New APIs: example usage
Points of interest
Integration tests use the new JUnit 6
@ParameterizedClassAPI, which is another way of implementation "abstract base classes" for tests.