mirror of
https://github.com/pomerium/pomerium.git
synced 2025-07-21 18:48:06 +02:00
mcp: delete upstream oauth2 token (#5707)
## Summary Adds `POST /.pomerium/mcp/routes/disconnect` that allows an MCP client application to request upstream OAuth2 tokens to be purged, so that a user may get a new ones with possibly different scopes. ## Related issues Fix https://linear.app/pomerium/issue/ENG-2545/mcp-user-should-be-able-to-purge-their-upstream-oauth2-token ## User Explanation <!-- How would you explain this change to the user? If this change doesn't create any user-facing changes, you can leave this blank. If filled out, add the `docs` label --> ## Checklist - [x] reference any related issues - [x] updated unit tests - [x] add appropriate label (`enhancement`, `bug`, `breaking`, `dependencies`, `ci`) - [x] ready for review
This commit is contained in:
parent
f5c5326c72
commit
8a89c975d9
5 changed files with 141 additions and 12 deletions
|
@ -1,6 +1,7 @@
|
|||
package mcp
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
|
@ -15,16 +16,11 @@ import (
|
|||
|
||||
const InternalConnectClientID = "pomerium-connect-7549ebe0-a67d-4d2b-a90d-d0a483b85f72"
|
||||
|
||||
// Connect is a helper method for MCP clients to ensure that the current user
|
||||
// ConnectGet is a helper method for MCP clients to ensure that the current user
|
||||
// has an active upstream Oauth2 session for the route.
|
||||
// GET /mcp/connect?redirect_url=<url>
|
||||
// It will redirect to the provided redirect_url once the user has an active session.
|
||||
func (srv *Handler) Connect(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodGet {
|
||||
http.Error(w, "invalid method", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
|
||||
func (srv *Handler) ConnectGet(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
|
||||
redirectURL, err := srv.checkClientRedirectURL(r)
|
||||
|
@ -118,3 +114,100 @@ func (srv *Handler) checkClientRedirectURL(r *http.Request) (string, error) {
|
|||
}
|
||||
return redirectURL, nil
|
||||
}
|
||||
|
||||
// DisconnectRoutes is a bulk helper method for MCP clients to purge upstream OAuth2 tokens
|
||||
// for multiple routes. This is necessary because frontend clients cannot execute direct
|
||||
// DELETE calls to other routes.
|
||||
//
|
||||
// POST /mcp/routes/disconnect
|
||||
//
|
||||
// Request body should contain a JSON object with a "routes" array:
|
||||
//
|
||||
// {
|
||||
// "routes": ["https://server1.example.com", "https://server2.example.com"]
|
||||
// }
|
||||
//
|
||||
// Response returns the same format as GET /mcp/routes, showing the updated connection status:
|
||||
//
|
||||
// {
|
||||
// "servers": [
|
||||
// {
|
||||
// "name": "Server 1",
|
||||
// "url": "https://server1.example.com",
|
||||
// "connected": false,
|
||||
// "needs_oauth": true
|
||||
// },
|
||||
// {
|
||||
// "name": "Server 2",
|
||||
// "url": "https://server2.example.com",
|
||||
// "connected": false,
|
||||
// "needs_oauth": true
|
||||
// }
|
||||
// ]
|
||||
// }
|
||||
func (srv *Handler) DisconnectRoutes(w http.ResponseWriter, r *http.Request) {
|
||||
ctx := r.Context()
|
||||
|
||||
claims, err := getClaimsFromRequest(r)
|
||||
if err != nil {
|
||||
log.Ctx(ctx).Error().Err(err).Msg("failed to get claims from request")
|
||||
http.Error(w, "invalid request", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
userID, ok := getUserIDFromClaims(claims)
|
||||
if !ok {
|
||||
log.Ctx(ctx).Error().Msg("user id is not present, this is a misconfigured request")
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
type disconnectRequest struct {
|
||||
Routes []string `json:"routes"`
|
||||
}
|
||||
|
||||
var req disconnectRequest
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||
log.Ctx(ctx).Error().Err(err).Msg("failed to decode disconnect request")
|
||||
http.Error(w, "invalid request body", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
if len(req.Routes) == 0 {
|
||||
log.Ctx(ctx).Error().Msg("no routes provided in disconnect request")
|
||||
http.Error(w, "no routes provided", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
for _, routeURL := range req.Routes {
|
||||
parsedURL, err := url.Parse(routeURL)
|
||||
if err != nil {
|
||||
log.Ctx(ctx).Error().Err(err).Str("url", routeURL).Msg("failed to parse route URL")
|
||||
continue
|
||||
}
|
||||
|
||||
host := parsedURL.Host
|
||||
if host == "" {
|
||||
log.Ctx(ctx).Error().Str("url", routeURL).Msg("route URL has no host")
|
||||
continue
|
||||
}
|
||||
|
||||
requiresUpstreamOAuth2Token := srv.hosts.HasOAuth2ConfigForHost(host)
|
||||
if !requiresUpstreamOAuth2Token {
|
||||
log.Ctx(ctx).Debug().Str("host", host).Msg("host does not require oauth2 token - ignoring")
|
||||
continue
|
||||
}
|
||||
|
||||
err = srv.storage.DeleteUpstreamOAuth2Token(ctx, host, userID)
|
||||
if err != nil {
|
||||
log.Ctx(ctx).Error().Err(err).Str("host", host).Msg("failed to delete upstream oauth2 token")
|
||||
}
|
||||
}
|
||||
|
||||
err = srv.listMCPServersForUser(ctx, w, userID)
|
||||
if err != nil {
|
||||
log.Ctx(ctx).Error().Err(err).Msg("failed to list MCP servers after disconnect")
|
||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue