0256babc9d
Manual OAuth bearer tokens worked on Console and Connect but were rejected by MCP, which only ran the personal API key middleware. Align MCP with the shared bearer chain used elsewhere: API key, OAuth access token, then identity presence. Drop the local RequireAPIKeyHandler. Add e2e coverage for MCP calls authenticated with a manual OAuth token, including scope enforcement. Signed-off-by: Ludovic Vielle <ludovic@probo.com>
103 lines
3.0 KiB
Go
103 lines
3.0 KiB
Go
// Copyright (c) 2025-2026 Probo Inc <hello@probo.com>.
|
|
//
|
|
// Permission to use, copy, modify, and/or distribute this software for any
|
|
// purpose with or without fee is hereby granted, provided that the above
|
|
// copyright notice and this permission notice appear in all copies.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
|
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
|
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
|
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
// PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
package mcp_v1
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/go-chi/chi/v5"
|
|
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
"go.gearno.de/kit/log"
|
|
mcpgenmcp "go.probo.inc/mcpgen/mcp"
|
|
"go.probo.inc/probo/pkg/accessreview"
|
|
"go.probo.inc/probo/pkg/baseurl"
|
|
"go.probo.inc/probo/pkg/cookiebanner"
|
|
"go.probo.inc/probo/pkg/filemanager"
|
|
"go.probo.inc/probo/pkg/iam"
|
|
"go.probo.inc/probo/pkg/probo"
|
|
"go.probo.inc/probo/pkg/riskmanagement"
|
|
"go.probo.inc/probo/pkg/server/api/authn"
|
|
"go.probo.inc/probo/pkg/server/api/mcp/mcputils"
|
|
"go.probo.inc/probo/pkg/server/api/mcp/v1/server"
|
|
"go.probo.inc/probo/pkg/thirdparty"
|
|
)
|
|
|
|
func NewMux(
|
|
logger *log.Logger,
|
|
proboSvc *probo.Service,
|
|
thirdPartySvc *thirdparty.Service,
|
|
iamSvc *iam.Service,
|
|
accessReviewSvc *accessreview.Service,
|
|
cookieBannerSvc *cookiebanner.Service,
|
|
riskManagementSvc *riskmanagement.Service,
|
|
tokenSecret string,
|
|
fileManagerSvc *filemanager.Service,
|
|
baseURL *baseurl.BaseURL,
|
|
) *chi.Mux {
|
|
logger = logger.Named("mcp.v1")
|
|
|
|
logger.Info("initializing MCP server")
|
|
|
|
resolver := &Resolver{
|
|
proboSvc: proboSvc,
|
|
thirdPartySvc: thirdPartySvc,
|
|
iamSvc: iamSvc,
|
|
accessReview: accessReviewSvc,
|
|
cookieBanner: cookieBannerSvc,
|
|
riskManagement: riskManagementSvc,
|
|
logger: logger,
|
|
fileManager: fileManagerSvc,
|
|
baseURL: baseURL,
|
|
}
|
|
|
|
mcpServer := server.New(resolver, mcpgenmcp.WithRecoverFunc(mcputils.NewRecoverFunc(logger)))
|
|
|
|
mcpServer.AddReceivingMiddleware(mcputils.LoggingMiddleware(logger))
|
|
|
|
getServer := func(r *http.Request) *mcp.Server { return mcpServer }
|
|
eventStore := mcp.NewMemoryEventStore(nil)
|
|
|
|
handler := mcp.NewStreamableHTTPHandler(
|
|
getServer,
|
|
&mcp.StreamableHTTPOptions{
|
|
Stateless: true,
|
|
// SessionTimeout: 30 * time.Minute,
|
|
EventStore: eventStore,
|
|
Logger: nil, // TODO put logger here
|
|
},
|
|
)
|
|
protectedHandler := http.NewCrossOriginProtection().Handler(handler)
|
|
|
|
r := chi.NewMux()
|
|
r.Use(authn.NewAPIKeyMiddleware(iamSvc, tokenSecret))
|
|
r.Use(authn.NewOAuth2AccessTokenMiddleware(iamSvc))
|
|
r.Use(authn.NewIdentityPresenceMiddleware())
|
|
r.Handle("/", protectedHandler)
|
|
|
|
logger.Info("MCP server initialized successfully")
|
|
|
|
return r
|
|
}
|
|
|
|
func UnwrapOmittable[T any](field mcpgenmcp.Omittable[T]) *T {
|
|
if !field.IsSet() {
|
|
return nil
|
|
}
|
|
|
|
value, _ := field.Value()
|
|
|
|
return &value
|
|
}
|