Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(auth): allow hosted MCP client OAuth callbacks in dynamic client registration (#20447)
Danny Xu47d2522552ce
diff --git a/backend/api/oauth2/oauth2.go b/backend/api/oauth2/oauth2.goindex 6061f1a291..23f5246002 100644--- a/backend/api/oauth2/oauth2.go+++ b/backend/api/oauth2/oauth2.go@@ -9,7 +9,9 @@ import ("log/slog""net/http""net/url"+ "path""slices"+ "strings""time""github.com/labstack/echo/v5"@@ -181,7 +183,7 @@ func isAllowedDynamicClientRedirectURI(uri string) bool {switch parsed.Scheme {case "http", "https":- return isLocalhostURI(uri)+ return isLocalhostURI(uri) || isAllowedHostedRedirectURI(parsed)case "cursor", "vscode", "vscode-insiders":return truecase "jetbrains":@@ -191,6 +193,49 @@ func isAllowedDynamicClientRedirectURI(uri string) bool {}}+// isAllowedHostedRedirectURI whitelists the fixed, vendor-controlled OAuth+// callback URLs used by popular hosted MCP clients (web/desktop apps that+// connect to remote MCP servers). These serve the same role as the cursor://,+// vscode://, and jetbrains://gateway/... schemes above. Each entry is pinned to+// an exact host (plus an exact or prefix path) so an attacker still cannot+// register an arbitrary https:// redirect URI and exfiltrate authorization+// codes.+func isAllowedHostedRedirectURI(u *url.URL) bool {+ if u.Scheme != "https" {+ return false+ }+ // Only the default https port is the real vendor callback; reject any other+ // port so a code can't be steered to a non-OAuth service on the vendor host.+ if port := u.Port(); port != "" && port != "443" {+ return false+ }+ // Reject "."/".." path segments (u.Path is already percent-decoded, so this+ // also covers %2e%2e). Otherwise a prefix match like /connector/oauth/../evil+ // passes here, but the browser normalizes it and delivers the code to a+ // different path on the vendor host than the pinned callback.+ if u.Path != path.Clean(u.Path) {+ return false+ }+ // Hosts are case-insensitive (RFC 3986); normalize via Hostname()+ToLower so+ // the exact-match cases below hold. Paths stay case-sensitive (matched verbatim).+ switch strings.ToLower(u.Hostname()) {+ case "claude.ai":+ // Claude.ai web, Claude Desktop, mobile, and Cowork.+ return u.Path == "/api/mcp/auth_callback"+ case "chatgpt.com":+ // ChatGPT connectors: per-connector path (current) and legacy fixed path.+ return strings.HasPrefix(u.Path, "/connector/oauth/") || u.Path == "/connector_platform_oauth_redirect"+ case "vscode.dev", "insiders.vscode.dev":+ // VS Code for the Web (complements the vscode:// scheme above).+ return u.Path == "/redirect"+ case "antigravity.google":+ // Google Antigravity.+ return u.Path == "/oauth-callback"+ default:+ return false+ }+}+func oauth2Error(c *echo.Context, statusCode int, errorCode, description string) error {return c.JSON(statusCode, map[string]string{"error": errorCode,diff --git a/backend/api/oauth2/oauth2_test.go b/backend/api/oauth2/oauth2_test.gonew file mode 100644index 0000000000..4e6a18c91b--- /dev/null+++ b/backend/api/oauth2/oauth2_test.go@@ -0,0 +1,69 @@+package oauth2++import (+ "testing"++ "github.com/stretchr/testify/require"+)++func TestIsAllowedDynamicClientRedirectURI(t *testing.T) {+ testCases := []struct {+ name string+ uri string+ want bool+ }{+ // Localhost (loopback) callbacks — covers Claude Code, Gemini CLI, etc.+ {name: "localhost http", uri: "http://localhost:8080/callback", want: true},+ {name: "127.0.0.1 http", uri: "http://127.0.0.1:53682/callback", want: true},+ {name: "localhost https", uri: "https://localhost/callback", want: true},++ // Native app custom schemes already supported.+ {name: "cursor scheme", uri: "cursor://anysphere.cursor-mcp/oauth/callback", want: true},+ {name: "vscode scheme", uri: "vscode://anysphere.cursor/callback", want: true},+ {name: "vscode-insiders scheme", uri: "vscode-insiders://foo/callback", want: true},+ {name: "jetbrains gateway", uri: "jetbrains://gateway/auth/callback", want: true},+ {name: "jetbrains no path", uri: "jetbrains://gateway", want: false},++ // Hosted MCP client callbacks — Claude (web, Desktop, mobile, Cowork).+ {name: "claude.ai exact", uri: "https://claude.ai/api/mcp/auth_callback", want: true},+ {name: "claude.ai wrong path", uri: "https://claude.ai/evil", want: false},+ {name: "claude.ai over http", uri: "http://claude.ai/api/mcp/auth_callback", want: false},+ {name: "claude.ai subdomain spoof", uri: "https://claude.ai.evil.com/api/mcp/auth_callback", want: false},+ // Host should match case-insensitively and allow only the default https port.+ {name: "claude.ai uppercase host", uri: "https://CLAUDE.AI/api/mcp/auth_callback", want: true},+ {name: "claude.ai explicit port 443", uri: "https://claude.ai:443/api/mcp/auth_callback", want: true},+ {name: "claude.ai non-default port", uri: "https://claude.ai:8443/api/mcp/auth_callback", want: false},+ {name: "chatgpt non-default port", uri: "https://chatgpt.com:444/connector/oauth/x", want: false},+ // Userinfo spoof must resolve to the real (non-allowlisted) host and be rejected.+ {name: "claude.ai userinfo spoof", uri: "https://[email protected]/api/mcp/auth_callback", want: false},++ // ChatGPT connectors — current per-connector path + legacy fixed path.+ {name: "chatgpt connector prefix", uri: "https://chatgpt.com/connector/oauth/abc123", want: true},+ {name: "chatgpt legacy exact", uri: "https://chatgpt.com/connector_platform_oauth_redirect", want: true},+ {name: "chatgpt wrong path", uri: "https://chatgpt.com/evil", want: false},+ {name: "chatgpt dot-segment traversal", uri: "https://chatgpt.com/connector/oauth/../evil", want: false},+ {name: "chatgpt encoded traversal", uri: "https://chatgpt.com/connector/oauth/%2e%2e/evil", want: false},+ {name: "chatgpt empty connector id", uri: "https://chatgpt.com/connector/oauth/", want: false},++ // VS Code for the Web.+ {name: "vscode.dev redirect", uri: "https://vscode.dev/redirect", want: true},+ {name: "insiders.vscode.dev redirect", uri: "https://insiders.vscode.dev/redirect", want: true},+ {name: "vscode.dev wrong path", uri: "https://vscode.dev/evil", want: false},++ // Antigravity.+ {name: "antigravity callback", uri: "https://antigravity.google/oauth-callback", want: true},+ {name: "antigravity wrong path", uri: "https://antigravity.google/evil", want: false},++ // Arbitrary HTTPS / HTTP must stay rejected (the #20033 protection).+ {name: "arbitrary https", uri: "https://evil.com/callback", want: false},+ {name: "non-localhost http", uri: "http://evil.com/callback", want: false},+ {name: "unknown scheme", uri: "ftp://example.com/callback", want: false},+ {name: "malformed", uri: "://nonsense", want: false},+ }++ for _, tc := range testCases {+ t.Run(tc.name, func(t *testing.T) {+ require.Equal(t, tc.want, isAllowedDynamicClientRedirectURI(tc.uri))+ })+ }+}diff --git a/backend/api/oauth2/register.go b/backend/api/oauth2/register.goindex 7dbdcc2546..ade719d02e 100644--- a/backend/api/oauth2/register.go+++ b/backend/api/oauth2/register.go@@ -67,7 +67,7 @@ func (s *Service) handleRegister(c *echo.Context) error {return oauth2Error(c, http.StatusBadRequest, "invalid_redirect_uri", "redirect URI is too long")}if !isAllowedDynamicClientRedirectURI(uri) {- return oauth2Error(c, http.StatusBadRequest, "invalid_redirect_uri", "redirect URI must be a localhost URL or a whitelisted app scheme (cursor://, vscode://, vscode-insiders://, jetbrains://gateway/...)")+ return oauth2Error(c, http.StatusBadRequest, "invalid_redirect_uri", "redirect URI must be a localhost URL, a recognized hosted MCP client callback (e.g. claude.ai, chatgpt.com), or a whitelisted app scheme (cursor://, vscode://, vscode-insiders://, jetbrains://gateway/...)")}}