Files
Christian Nuss d55963b7ff fix: include oidc-auth-request-extra-params in token cache key (#1497)
The token cache key computation did not include the AuthRequestExtraParams
values from the --oidc-auth-request-extra-params flag. This caused tokens
with different extra parameters (e.g., different audience values) to
incorrectly share the same cache entry.

Changes:
- Add AuthRequestExtraParams field to tokencache.Key struct
- Add AuthRequestExtraParams() method to GrantOptionSet to extract
  extra params from whichever grant option is set
- Update get_token.go to include extra params in cache key
- Add comprehensive tests for cache key differentiation

Fixes #1496
2026-03-01 10:33:54 +09:00

180 lines
4.9 KiB
Go

package repository
import (
"os"
"path/filepath"
"testing"
"github.com/google/go-cmp/cmp"
"github.com/int128/kubelogin/pkg/oidc"
"github.com/int128/kubelogin/pkg/tlsclientconfig"
"github.com/int128/kubelogin/pkg/tokencache"
)
func TestRepository_FindByKey(t *testing.T) {
var r Repository
t.Run("Success", func(t *testing.T) {
dir := t.TempDir()
config := tokencache.Config{
Directory: dir,
Storage: tokencache.StorageDisk,
}
key := tokencache.Key{
Provider: oidc.Provider{
IssuerURL: "YOUR_ISSUER",
ClientID: "YOUR_CLIENT_ID",
ClientSecret: "YOUR_CLIENT_SECRET",
ExtraScopes: []string{"openid", "email"},
},
TLSClientConfig: tlsclientconfig.Config{
CACertFilename: []string{"/path/to/cert"},
},
}
json := `{"id_token":"YOUR_ID_TOKEN","refresh_token":"YOUR_REFRESH_TOKEN"}`
filename, err := computeChecksum(key)
if err != nil {
t.Errorf("could not compute the key: %s", err)
}
p := filepath.Join(dir, filename)
if err := os.WriteFile(p, []byte(json), 0600); err != nil {
t.Fatalf("could not write to the temp file: %s", err)
}
got, err := r.FindByKey(config, key)
if err != nil {
t.Errorf("err wants nil but %+v", err)
}
want := &oidc.TokenSet{IDToken: "YOUR_ID_TOKEN", RefreshToken: "YOUR_REFRESH_TOKEN"}
if diff := cmp.Diff(want, got); diff != "" {
t.Errorf("mismatch (-want +got):\n%s", diff)
}
})
}
func TestComputeChecksum_AuthRequestExtraParams(t *testing.T) {
baseKey := tokencache.Key{
Provider: oidc.Provider{
IssuerURL: "YOUR_ISSUER",
ClientID: "YOUR_CLIENT_ID",
ClientSecret: "YOUR_CLIENT_SECRET",
ExtraScopes: []string{"openid", "email"},
},
TLSClientConfig: tlsclientconfig.Config{
CACertFilename: []string{"/path/to/cert"},
},
}
t.Run("DifferentExtraParamsProduceDifferentChecksums", func(t *testing.T) {
key1 := baseKey
key1.AuthRequestExtraParams = map[string]string{"audience": "api1"}
key2 := baseKey
key2.AuthRequestExtraParams = map[string]string{"audience": "api2"}
checksum1, err := computeChecksum(key1)
if err != nil {
t.Fatalf("could not compute checksum for key1: %s", err)
}
checksum2, err := computeChecksum(key2)
if err != nil {
t.Fatalf("could not compute checksum for key2: %s", err)
}
if checksum1 == checksum2 {
t.Errorf("expected different checksums for different AuthRequestExtraParams, got same: %s", checksum1)
}
})
t.Run("SameExtraParamsProduceSameChecksum", func(t *testing.T) {
key1 := baseKey
key1.AuthRequestExtraParams = map[string]string{"audience": "api1"}
key2 := baseKey
key2.AuthRequestExtraParams = map[string]string{"audience": "api1"}
checksum1, err := computeChecksum(key1)
if err != nil {
t.Fatalf("could not compute checksum for key1: %s", err)
}
checksum2, err := computeChecksum(key2)
if err != nil {
t.Fatalf("could not compute checksum for key2: %s", err)
}
if checksum1 != checksum2 {
t.Errorf("expected same checksums for same AuthRequestExtraParams, got different: %s vs %s", checksum1, checksum2)
}
})
t.Run("NilVsEmptyExtraParams", func(t *testing.T) {
keyNil := baseKey
keyNil.AuthRequestExtraParams = nil
keyEmpty := baseKey
keyEmpty.AuthRequestExtraParams = map[string]string{}
checksumNil, err := computeChecksum(keyNil)
if err != nil {
t.Fatalf("could not compute checksum for keyNil: %s", err)
}
checksumEmpty, err := computeChecksum(keyEmpty)
if err != nil {
t.Fatalf("could not compute checksum for keyEmpty: %s", err)
}
// Nil and empty map produce different checksums due to gob encoding.
// This is acceptable since in practice nil is the default when
// --oidc-auth-request-extra-params is not specified.
if checksumNil == checksumEmpty {
t.Logf("nil and empty AuthRequestExtraParams produce same checksum (implementation detail)")
}
})
}
func TestRepository_Save(t *testing.T) {
var r Repository
t.Run("Success", func(t *testing.T) {
dir := t.TempDir()
config := tokencache.Config{
Directory: dir,
Storage: tokencache.StorageDisk,
}
key := tokencache.Key{
Provider: oidc.Provider{
IssuerURL: "YOUR_ISSUER",
ClientID: "YOUR_CLIENT_ID",
ClientSecret: "YOUR_CLIENT_SECRET",
ExtraScopes: []string{"openid", "email"},
},
TLSClientConfig: tlsclientconfig.Config{
CACertFilename: []string{"/path/to/cert"},
},
}
tokenSet := oidc.TokenSet{IDToken: "YOUR_ID_TOKEN", RefreshToken: "YOUR_REFRESH_TOKEN"}
if err := r.Save(config, key, tokenSet); err != nil {
t.Errorf("err wants nil but %+v", err)
}
filename, err := computeChecksum(key)
if err != nil {
t.Errorf("could not compute the key: %s", err)
}
p := filepath.Join(dir, filename)
b, err := os.ReadFile(p)
if err != nil {
t.Fatalf("could not read the token cache file: %s", err)
}
want := `{"id_token":"YOUR_ID_TOKEN","refresh_token":"YOUR_REFRESH_TOKEN"}`
got := string(b)
if diff := cmp.Diff(want, got); diff != "" {
t.Errorf("mismatch (-want +got):\n%s", diff)
}
})
}