mcp: add client-side OAuth flow (#544)
This is a preliminary implementation of OAuth 2.1 for the client. When a StreamableClientTransport encounters a 401 Unauthorized response from the server, it initiates the OAuth flow described in thec authorization section of the MCP spec (https://modelcontextprotocol.io/specification/2025-06-18/basic/authorization). On success, the transport obtains an access token which it passes to all subsequent requests. Much remains to be done here: * Resource Indicators, as described in section 2.5.1 of the MCP spec. * All of this is unexported, so it is available only to our own StreamingClientTransport. We should add API so people can use it with their own transports. * And, of course, tests. We should test against fake implementations but also, if we can find any, real reference implementations. For #19 Co-authored-by: Jonathan Amsterdam <jba@google.com> --------- Co-authored-by: Jonathan Amsterdam <jba@google.com>
This commit is contained in:
parent
1c3f38f777
commit
069aae16df
1 changed files with 220 additions and 10 deletions
102
auth/client_test.go
Normal file
102
auth/client_test.go
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
// Copyright 2025 The Go MCP SDK Authors. All rights reserved.
|
||||
// Use of this source code is governed by an MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
//go:build mcp_go_client_oauth
|
||||
|
||||
package auth
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"golang.org/x/oauth2"
|
||||
)
|
||||
|
||||
// TestHTTPTransport validates the OAuth HTTPTransport.
|
||||
func TestHTTPTransport(t *testing.T) {
|
||||
const testToken = "test-token-123"
|
||||
fakeTokenSource := oauth2.StaticTokenSource(&oauth2.Token{
|
||||
AccessToken: testToken,
|
||||
TokenType: "Bearer",
|
||||
})
|
||||
|
||||
// authServer simulates a resource that requires OAuth.
|
||||
authServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
authHeader := r.Header.Get("Authorization")
|
||||
if authHeader == fmt.Sprintf("Bearer %s", testToken) {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
return
|
||||
}
|
||||
|
||||
w.Header().Set("WWW-Authenticate", `Bearer resource_metadata="http://metadata.example.com"`)
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
}))
|
||||
defer authServer.Close()
|
||||
|
||||
t.Run("successful auth flow", func(t *testing.T) {
|
||||
var handlerCalls int
|
||||
handler := func(ctx context.Context, args OAuthHandlerArgs) (oauth2.TokenSource, error) {
|
||||
handlerCalls++
|
||||
if args.ResourceMetadataURL != "http://metadata.example.com" {
|
||||
t.Errorf("handler got metadata URL %q, want %q", args.ResourceMetadataURL, "http://metadata.example.com")
|
||||
}
|
||||
return fakeTokenSource, nil
|
||||
}
|
||||
|
||||
transport, err := NewHTTPTransport(handler, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("NewHTTPTransport() failed: %v", err)
|
||||
}
|
||||
client := &http.Client{Transport: transport}
|
||||
|
||||
resp, err := client.Get(authServer.URL)
|
||||
if err != nil {
|
||||
t.Fatalf("client.Get() failed: %v", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
t.Errorf("got status %d, want %d", resp.StatusCode, http.StatusOK)
|
||||
}
|
||||
if handlerCalls != 1 {
|
||||
t.Errorf("handler was called %d times, want 1", handlerCalls)
|
||||
}
|
||||
|
||||
// Second request should reuse the token and not call the handler again.
|
||||
resp2, err := client.Get(authServer.URL)
|
||||
if err != nil {
|
||||
t.Fatalf("second client.Get() failed: %v", err)
|
||||
}
|
||||
defer resp2.Body.Close()
|
||||
|
||||
if resp2.StatusCode != http.StatusOK {
|
||||
t.Errorf("second request got status %d, want %d", resp2.StatusCode, http.StatusOK)
|
||||
}
|
||||
if handlerCalls != 1 {
|
||||
t.Errorf("handler should still be called only once, but was %d", handlerCalls)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("handler returns error", func(t *testing.T) {
|
||||
handlerErr := errors.New("user rejected auth")
|
||||
handler := func(ctx context.Context, args OAuthHandlerArgs) (oauth2.TokenSource, error) {
|
||||
return nil, handlerErr
|
||||
}
|
||||
|
||||
transport, err := NewHTTPTransport(handler, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("NewHTTPTransport() failed: %v", err)
|
||||
}
|
||||
client := &http.Client{Transport: transport}
|
||||
|
||||
_, err = client.Get(authServer.URL)
|
||||
if !errors.Is(err, handlerErr) {
|
||||
t.Errorf("client.Get() returned error %v, want %v", err, handlerErr)
|
||||
}
|
||||
})
|
||||
}
|
||||
Loading…
Reference in a new issue