mirror of
https://github.com/int128/kubelogin.git
synced 2026-08-20 03:16:15 +00:00
When useAccessToken is enabled, some OIDC providers (e.g. PingFederate) do not return an id_token on refresh_token grants. Previously, verifyToken() unconditionally required id_token before checking the useAccessToken flag, causing every token refresh to fail and fall back to the browser-based authorization code flow. Restructure verifyToken() so that when useAccessToken is enabled, the access token is verified directly and the id_token is only verified if present. The standard id_token flow when useAccessToken is disabled remains unchanged. Fixes int128/kubelogin#536 Signed-off-by: Mathias Zeller <mathias.zeller@mercedes-benz.com> Co-authored-by: Hidetake Iwata <int128@gmail.com>
121 lines
4.4 KiB
Go
121 lines
4.4 KiB
Go
package client
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"time"
|
|
|
|
gooidc "github.com/coreos/go-oidc/v3/oidc"
|
|
"github.com/int128/kubelogin/pkg/infrastructure/clock"
|
|
"github.com/int128/kubelogin/pkg/infrastructure/logger"
|
|
"github.com/int128/kubelogin/pkg/oidc"
|
|
"github.com/int128/kubelogin/pkg/pkce"
|
|
"github.com/int128/oauth2dev"
|
|
"golang.org/x/oauth2"
|
|
)
|
|
|
|
type Interface interface {
|
|
GetAuthCodeURL(in AuthCodeURLInput) string
|
|
ExchangeAuthCode(ctx context.Context, in ExchangeAuthCodeInput) (*oidc.TokenSet, error)
|
|
GetTokenByAuthCode(ctx context.Context, in GetTokenByAuthCodeInput, localServerReadyChan chan<- string) (*oidc.TokenSet, error)
|
|
NegotiatedPKCEMethod() pkce.Method
|
|
GetTokenByROPC(ctx context.Context, username, password string) (*oidc.TokenSet, error)
|
|
GetTokenByClientCredentials(ctx context.Context, in GetTokenByClientCredentialsInput) (*oidc.TokenSet, error)
|
|
GetDeviceAuthorization(ctx context.Context) (*oauth2dev.AuthorizationResponse, error)
|
|
ExchangeDeviceCode(ctx context.Context, authResponse *oauth2dev.AuthorizationResponse) (*oidc.TokenSet, error)
|
|
Refresh(ctx context.Context, refreshToken string) (*oidc.TokenSet, error)
|
|
}
|
|
|
|
type client struct {
|
|
httpClient *http.Client
|
|
provider *gooidc.Provider
|
|
oauth2Config oauth2.Config
|
|
clock clock.Interface
|
|
logger logger.Interface
|
|
negotiatedPKCEMethod pkce.Method
|
|
useAccessToken bool
|
|
}
|
|
|
|
func (c *client) wrapContext(ctx context.Context) context.Context {
|
|
if c.httpClient != nil {
|
|
ctx = context.WithValue(ctx, oauth2.HTTPClient, c.httpClient)
|
|
}
|
|
return ctx
|
|
}
|
|
|
|
// Refresh sends a refresh token request and returns a token set.
|
|
func (c *client) Refresh(ctx context.Context, refreshToken string) (*oidc.TokenSet, error) {
|
|
ctx = c.wrapContext(ctx)
|
|
currentToken := &oauth2.Token{
|
|
Expiry: time.Now(),
|
|
RefreshToken: refreshToken,
|
|
}
|
|
source := c.oauth2Config.TokenSource(ctx, currentToken)
|
|
token, err := source.Token()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not refresh the token: %w", err)
|
|
}
|
|
return c.verifyToken(ctx, token, "")
|
|
}
|
|
|
|
// verifyToken verifies the token with the certificates of the provider and the nonce.
|
|
// If the nonce is an empty string, it does not verify the nonce.
|
|
func (c *client) verifyToken(ctx context.Context, token *oauth2.Token, nonce string) (*oidc.TokenSet, error) {
|
|
idToken, hasIDToken := token.Extra("id_token").(string)
|
|
|
|
// When using access tokens, the id_token is not required (some providers
|
|
// do not return it on refresh). Verify the access token directly.
|
|
if c.useAccessToken {
|
|
accessToken, ok := token.Extra("access_token").(string)
|
|
if !ok {
|
|
return nil, fmt.Errorf("access_token is missing in the token response: %#v", accessToken)
|
|
}
|
|
|
|
// We intentionally do not perform a ClientID check here because there
|
|
// are some use cases in access_tokens where we *expect* the audience
|
|
// to differ. For example, one can explicitly set
|
|
// `audience=CLUSTER_CLIENT_ID` as an extra auth parameter.
|
|
verifier := c.provider.Verifier(&gooidc.Config{ClientID: "", Now: c.clock.Now, SkipClientIDCheck: true})
|
|
|
|
_, err := verifier.Verify(ctx, accessToken)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not verify the access token: %w", err)
|
|
}
|
|
|
|
// If an id_token is present, verify it and check the nonce.
|
|
if hasIDToken {
|
|
idVerifier := c.provider.Verifier(&gooidc.Config{ClientID: c.oauth2Config.ClientID, Now: c.clock.Now})
|
|
verifiedIDToken, err := idVerifier.Verify(ctx, idToken)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not verify the ID token: %w", err)
|
|
}
|
|
if nonce != "" && nonce != verifiedIDToken.Nonce {
|
|
return nil, fmt.Errorf("nonce did not match (wants %s but got %s)", nonce, verifiedIDToken.Nonce)
|
|
}
|
|
}
|
|
|
|
return &oidc.TokenSet{
|
|
IDToken: accessToken,
|
|
RefreshToken: token.RefreshToken,
|
|
}, nil
|
|
}
|
|
|
|
// Standard id_token flow: id_token is mandatory.
|
|
if !hasIDToken {
|
|
return nil, fmt.Errorf("id_token is missing in the token response: %#v", token)
|
|
}
|
|
verifier := c.provider.Verifier(&gooidc.Config{ClientID: c.oauth2Config.ClientID, Now: c.clock.Now})
|
|
verifiedIDToken, err := verifier.Verify(ctx, idToken)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("could not verify the ID token: %w", err)
|
|
}
|
|
if nonce != "" && nonce != verifiedIDToken.Nonce {
|
|
return nil, fmt.Errorf("nonce did not match (wants %s but got %s)", nonce, verifiedIDToken.Nonce)
|
|
}
|
|
return &oidc.TokenSet{
|
|
IDToken: idToken,
|
|
RefreshToken: token.RefreshToken,
|
|
}, nil
|
|
}
|