Skip to content

fix: accept header accessor function in ServerTransportSecurityValidator #982

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.

Sign up for GitHub

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

Open
neerajbhatt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: accept header accessor function in ServerTransportSecurityValidator #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions ...ava/io/modelcontextprotocol/server/transport/DefaultServerTransportSecurityValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;

import io.modelcontextprotocol.util.Assert;

Expand Down Expand Up @@ -47,27 +47,18 @@ private DefaultServerTransportSecurityValidator(List<String> allowedOrigins, Lis
}

@Override
public void validateHeaders(Map<String, List<String>> headers) throws ServerTransportSecurityException {
boolean missingHost = true;
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
if (ORIGIN_HEADER.equalsIgnoreCase(entry.getKey())) {
List<String> values = entry.getValue();
if (values == null || values.isEmpty()) {
throw new ServerTransportSecurityException(403, "Invalid Origin header");
}
validateOrigin(values.get(0));
}
else if (HOST_HEADER.equalsIgnoreCase(entry.getKey())) {
missingHost = false;
List<String> values = entry.getValue();
if (values == null || values.isEmpty()) {
throw new ServerTransportSecurityException(421, "Invalid Host header");
}
validateHost(values.get(0));
}
public void validateHeaders(Function<String, List<String>> headerAccessor) throws ServerTransportSecurityException {
List<String> originValues = headerAccessor.apply(ORIGIN_HEADER);
if (originValues != null && !originValues.isEmpty()) {
validateOrigin(originValues.get(0));
}
if (!allowedHosts.isEmpty() && missingHost) {
throw new ServerTransportSecurityException(421, "Invalid Host header");

if (!allowedHosts.isEmpty()) {
List<String> hostValues = headerAccessor.apply(HOST_HEADER);
if (hostValues == null || hostValues.isEmpty()) {
throw new ServerTransportSecurityException(421, "Invalid Host header");
}
validateHost(hostValues.get(0));
}
}

Expand Down
40 changes: 0 additions & 40 deletions mcp-core/src/main/java/io/modelcontextprotocol/server/transport/HttpServletRequestUtils.java
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions .../java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.time.Duration;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.UUID;
Expand Down Expand Up @@ -280,8 +281,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
}

try {
Map<String, List<String>> headers = HttpServletRequestUtils.extractHeaders(request);
this.securityValidator.validateHeaders(headers);
this.securityValidator.validateHeaders(name -> Collections.list(request.getHeaders(name)));
}
catch (ServerTransportSecurityException e) {
response.sendError(e.getStatusCode(), e.getMessage());
Expand Down Expand Up @@ -353,8 +353,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
}

try {
Map<String, List<String>> headers = HttpServletRequestUtils.extractHeaders(request);
this.securityValidator.validateHeaders(headers);
this.securityValidator.validateHeaders(name -> Collections.list(request.getHeaders(name)));
}
catch (ServerTransportSecurityException e) {
response.sendError(e.getStatusCode(), e.getMessage());
Expand Down
5 changes: 2 additions & 3 deletions ...in/java/io/modelcontextprotocol/server/transport/HttpServletStatelessServerTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Collections;
import java.util.List;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -134,8 +134,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
}

try {
Map<String, List<String>> headers = HttpServletRequestUtils.extractHeaders(request);
this.securityValidator.validateHeaders(headers);
this.securityValidator.validateHeaders(name -> Collections.list(request.getHeaders(name)));
}
catch (ServerTransportSecurityException e) {
response.sendError(e.getStatusCode(), e.getMessage());
Expand Down
10 changes: 4 additions & 6 deletions ...o/modelcontextprotocol/server/transport/HttpServletStreamableServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.io.PrintWriter;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -271,8 +272,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
}

try {
Map<String, List<String>> headers = HttpServletRequestUtils.extractHeaders(request);
this.securityValidator.validateHeaders(headers);
this.securityValidator.validateHeaders(name -> Collections.list(request.getHeaders(name)));
}
catch (ServerTransportSecurityException e) {
response.sendError(e.getStatusCode(), e.getMessage());
Expand Down Expand Up @@ -407,8 +407,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
}

try {
Map<String, List<String>> headers = HttpServletRequestUtils.extractHeaders(request);
this.securityValidator.validateHeaders(headers);
this.securityValidator.validateHeaders(name -> Collections.list(request.getHeaders(name)));
}
catch (ServerTransportSecurityException e) {
response.sendError(e.getStatusCode(), e.getMessage());
Expand Down Expand Up @@ -588,8 +587,7 @@ protected void doDelete(HttpServletRequest request, HttpServletResponse response
}

try {
Map<String, List<String>> headers = HttpServletRequestUtils.extractHeaders(request);
this.securityValidator.validateHeaders(headers);
this.securityValidator.validateHeaders(name -> Collections.list(request.getHeaders(name)));
}
catch (ServerTransportSecurityException e) {
response.sendError(e.getStatusCode(), e.getMessage());
Expand Down
11 changes: 6 additions & 5 deletions .../main/java/io/modelcontextprotocol/server/transport/ServerTransportSecurityValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package io.modelcontextprotocol.server.transport;

import java.util.List;
import java.util.Map;
import java.util.function.Function;

/**
* Interface for validating HTTP requests in server transports. Implementations can
Expand All @@ -22,15 +22,16 @@ public interface ServerTransportSecurityValidator {
/**
* A no-op validator that accepts all requests without validation.
*/
ServerTransportSecurityValidator NOOP = headers -> {
ServerTransportSecurityValidator NOOP = headerAccessor -> {
};

/**
* Validates the HTTP headers from an incoming request.
* @param headers A map of header names to their values (multi-valued headers
* supported)
* @param headerAccessor A function that returns the list of values for a given header
* name, or an empty list if the header is not present. Header name lookup should be
* case-insensitive.
* @throws ServerTransportSecurityException if validation fails
*/
void validateHeaders(Map<String, List<String>> headers) throws ServerTransportSecurityException;
void validateHeaders(Function<String, List<String>> headerAccessor) throws ServerTransportSecurityException;

}
Loading