Skip to content

mcp: support auth provider by HTTP basic auth #2886

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.

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.springframework.ai.mcp.server.autoconfigure;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.modelcontextprotocol.server.McpServerAuthProvider;
import io.modelcontextprotocol.server.transport.WebFluxSseServerTransportProvider;
import io.modelcontextprotocol.spec.McpServerTransportProvider;

Expand Down Expand Up @@ -61,9 +62,11 @@
* }</pre>
*
* @author Christian Tzolov
* @author lambochen
* @since 1.0.0
* @see McpServerProperties
* @see WebFluxSseServerTransportProvider
* @see McpServerAuthProvider
*/
@AutoConfiguration
@ConditionalOnClass({ WebFluxSseServerTransportProvider.class })
Expand All @@ -75,9 +78,16 @@ public class McpWebFluxServerAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public WebFluxSseServerTransportProvider webFluxTransport(ObjectProvider<ObjectMapper> objectMapperProvider,
ObjectProvider<McpServerAuthProvider> mcpServerAuthProviderObjectProvider,
McpServerProperties serverProperties) {
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
return new WebFluxSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint());
McpServerAuthProvider authProvider = mcpServerAuthProviderObjectProvider.getIfAvailable(() -> null);
return WebFluxSseServerTransportProvider.builder()
.sseEndpoint(serverProperties.getSseEndpoint())
.messageEndpoint(serverProperties.getSseMessageEndpoint())
.objectMapper(objectMapper)
.authProvider(authProvider)
.build();
}

// Router function for SSE transport used by Spring WebFlux to start an HTTP server.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.springframework.ai.mcp.server.autoconfigure;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.modelcontextprotocol.server.McpServerAuthProvider;
import io.modelcontextprotocol.server.transport.WebMvcSseServerTransportProvider;
import io.modelcontextprotocol.spec.McpServerTransportProvider;

Expand Down Expand Up @@ -56,9 +57,11 @@
* }</pre>
*
* @author Christian Tzolov
* @author lambochen
* @since 1.0.0
* @see McpServerProperties
* @see WebMvcSseServerTransportProvider
* @see McpServerAuthProvider
*/
@AutoConfiguration
@ConditionalOnClass({ WebMvcSseServerTransportProvider.class })
Expand All @@ -70,9 +73,13 @@ public class McpWebMvcServerAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public WebMvcSseServerTransportProvider webMvcSseServerTransportProvider(
ObjectProvider<ObjectMapper> objectMapperProvider, McpServerProperties serverProperties) {
ObjectProvider<ObjectMapper> objectMapperProvider,
ObjectProvider<McpServerAuthProvider> mcpServerAuthProviderObjectProvider,
McpServerProperties serverProperties) {
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
return new WebMvcSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint());
McpServerAuthProvider authProvider = mcpServerAuthProviderObjectProvider.getIfAvailable(() -> null);
return new WebMvcSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint(),
serverProperties.getSseMessageEndpoint(), serverProperties.getSseEndpoint(), authProvider);
}

@Bean
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
<okhttp3.version>4.12.0</okhttp3.version>

<!-- MCP-->
<mcp.sdk.version>0.9.0</mcp.sdk.version>
<mcp.sdk.version>0.10.0-SNAPSHOT</mcp.sdk.version>

<!-- plugin versions -->
<antlr.version>4.13.1</antlr.version>
Expand Down