@@ -391,14 +391,27 @@ private void writeJson(HttpServletResponse response, int status, JSONRPCResponse
391391 /**
392392 * Validates {@code Mcp-Method}, {@code MCP-Protocol-Version} and, for the three named
393393 * methods, {@code Mcp-Name} against the request body.
394+ * <p>
395+ * Each of these headers must appear on exactly one header line. Intermediaries
396+ * disagree on which copy of a repeated header counts (the first, the last, or all of
397+ * them joined with {@code ", "}), so accepting a repeated header would let a request
398+ * be routed or authorized on one value while the server validates another.
399+ * <p>
400+ * Values already joined into one line by an intermediary are only caught by the body
401+ * comparison. A joined {@code Mcp-Name} can still match when the name or URI itself
402+ * contains {@code ", "}.
394403 * @return a human-readable mismatch description, or {@code null} if the headers are
395404 * consistent with the body
396405 */
397406 private String validateHeaders (HttpServletRequest request , JSONRPCRequest jsonRpcRequest ) {
398- String methodHeader = request .getHeader ("Mcp-Method" );
399- if (methodHeader == null ) {
407+ List < String > methodHeaders = Collections . list ( request .getHeaders ("Mcp-Method" ) );
408+ if (methodHeaders . isEmpty () ) {
400409 return "Missing required header: Mcp-Method" ;
401410 }
411+ if (methodHeaders .size () > 1 ) {
412+ return "Mcp-Method header has more than one value" ;
413+ }
414+ String methodHeader = methodHeaders .get (0 );
402415 if (!methodHeader .equals (jsonRpcRequest .method ())) {
403416 return "Mcp-Method header does not match request method" ;
404417 }
@@ -407,10 +420,14 @@ private String validateHeaders(HttpServletRequest request, JSONRPCRequest jsonRp
407420 // which answers it with -32602.
408421 String bodyVersion = protocolVersionFromMeta (jsonRpcRequest .params ());
409422 if (bodyVersion != null ) {
410- String versionHeader = request .getHeader ("MCP-Protocol-Version" );
411- if (versionHeader == null ) {
423+ List < String > versionHeaders = Collections . list ( request .getHeaders ("MCP-Protocol-Version" ) );
424+ if (versionHeaders . isEmpty () ) {
412425 return "Missing required header: MCP-Protocol-Version" ;
413426 }
427+ if (versionHeaders .size () > 1 ) {
428+ return "MCP-Protocol-Version header has more than one value" ;
429+ }
430+ String versionHeader = versionHeaders .get (0 );
414431 if (!versionHeader .equals (bodyVersion )) {
415432 return "MCP-Protocol-Version header does not match _meta protocol version" ;
416433 }
@@ -427,10 +444,14 @@ private String validateHeaders(HttpServletRequest request, JSONRPCRequest jsonRp
427444 if (!(paramsMap .get (nameKey ) instanceof String expectedName )) {
428445 return null ;
429446 }
430- String nameHeader = request .getHeader ("Mcp-Name" );
431- if (nameHeader == null ) {
447+ List < String > nameHeaders = Collections . list ( request .getHeaders ("Mcp-Name" ) );
448+ if (nameHeaders . isEmpty () ) {
432449 return "Missing required header: Mcp-Name" ;
433450 }
451+ if (nameHeaders .size () > 1 ) {
452+ return "Mcp-Name header has more than one value" ;
453+ }
454+ String nameHeader = nameHeaders .get (0 );
434455 String decoded = McpHeaderDecoder .decodeValue (nameHeader );
435456 if (decoded == null ) {
436457 return "Mcp-Name header has a malformed value" ;
0 commit comments