Skip to content

fix(auth): defer resource binding for dynamic clients #146

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.

Sign up for GitHub

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

Merged
stefan-ernst merged 1 commit into from
Jul 23, 2026
Merged

fix(auth): defer resource binding for dynamic clients #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions internal/handlers/oauth_mcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,11 @@ type dynamicClientRegistrationResponse struct {
}

// RegisterDynamicClient implements a constrained RFC 7591 registration
// endpoint for MCP clients. It creates public clients only: authorization-code
// plus refresh-token grants, S256 PKCE, and HTTPS or loopback callbacks.
// endpoint for public OAuth clients. It creates public clients only:
// authorization-code plus refresh-token grants, S256 PKCE, and HTTPS or
// loopback callbacks. Registration does not select a protected-resource
// audience; clients that need one (such as MCP clients) bind it on the
// authorization request via RFC 8707's resource parameter.
func (h *OAuthHandler) RegisterDynamicClient(w http.ResponseWriter, r *http.Request) {
r.Body = http.MaxBytesReader(w, r.Body, oauthRegistrationMaxBytes)
var req dynamicClientRegistrationRequest
Expand All @@ -117,15 +120,15 @@ func (h *OAuthHandler) RegisterDynamicClient(w http.ResponseWriter, r *http.Requ
}
displayName := strings.TrimSpace(req.ClientName)
if displayName == "" {
displayName = "MCP client"
displayName = "OAuth client"
}
slug := "mcp-" + strings.TrimPrefix(clientID, "wsoc_")[:16]
slug := "oauth-" + strings.TrimPrefix(clientID, "wsoc_")[:16]
redirectsJSON, _ := json.Marshal(req.RedirectURIs)
allowedScopes := nonAdminOAuthScopes()
scopesJSON, _ := json.Marshal(allowedScopes)

err = repository.NewOAuthClientRepository(h.db).CreateDynamicPublicClient(
slug, displayName, clientID, string(redirectsJSON), string(scopesJSON), h.mcpResourceURI,
slug, displayName, clientID, string(redirectsJSON), string(scopesJSON), "",
)
if err != nil {
if errors.Is(err, repository.ErrDuplicateEntry) {
Expand Down
Loading