Skip to content

feat!: replace deprecated PKCE flag #168

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
merged 3 commits into from
Oct 20, 2025
Merged

feat!: replace deprecated PKCE flag #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30761c9
fix: replace deprecated PKCE flag
ValentinGerlach Oct 20, 2025
f8d3b4a
make PKCE method configurable
ValentinGerlach Oct 20, 2025
6a56e16
Fix comment for WithPKCEMethod function
ValentinGerlach Oct 20, 2025
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
20 changes: 14 additions & 6 deletions pkg/clusteraccess/access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,8 @@ func createOIDCKubeconfig(opts *CreateOIDCKubeconfigOptions) ([]byte, error) {
for _, extraScope := range opts.ExtraScopes {
exec.Args = append(exec.Args, "--oidc-extra-scope="+extraScope)
}
if opts.UsePKCE {
exec.Args = append(exec.Args, "--oidc-use-pkce")
if opts.PKCEMethod != "" {
exec.Args = append(exec.Args, "--oidc-pkce-method="+string(opts.PKCEMethod))
}
if opts.ForceRefresh {
exec.Args = append(exec.Args, "--force-refresh")
Expand Down Expand Up @@ -434,7 +434,7 @@ type CreateOIDCKubeconfigOptions struct {
ClientID string
ClientSecret string
ExtraScopes []string
UsePKCE bool
PKCEMethod PKCEMethod
ForceRefresh bool
GrantType OIDCGrantType
}
Expand All @@ -449,6 +449,14 @@ const (
GrantTypeDeviceCode OIDCGrantType = "device-code"
)

type PKCEMethod string

const (
PKCEMethodAuto PKCEMethod = "auto"
PKCEMethodNo PKCEMethod = "no"
PKCEMethodS256 PKCEMethod = "S256"
)

type CreateOIDCKubeconfigOption func(*CreateOIDCKubeconfigOptions)

// WithExtraScope is an option for CreateOIDCKubeconfig that adds an extra scope to the oidc-login subcommand.
Expand All @@ -459,10 +467,10 @@ func WithExtraScope(scope string) CreateOIDCKubeconfigOption {
}
}

// UsePKCE is an option for CreateOIDCKubeconfig that enforces the use of PKCE.
func UsePKCE() CreateOIDCKubeconfigOption {
// WithPKCEMethod is an option for CreateOIDCKubeconfig that sets the PKCE method.
func WithPKCEMethod(m PKCEMethod) CreateOIDCKubeconfigOption {
return func(opts *CreateOIDCKubeconfigOptions) {
opts.UsePKCE = true
opts.PKCEMethod = m
}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/clusteraccess/access_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ var _ = Describe("ClusterAccess", func() {
kcfgBytes, err := clusteraccess.CreateOIDCKubeconfig("testuser", "https://api.example.com", []byte("test-ca"), "https://example.com/oidc", "test-client-id",
clusteraccess.WithExtraScope("foo"),
clusteraccess.WithExtraScope("bar"),
clusteraccess.UsePKCE(),
clusteraccess.WithPKCEMethod(clusteraccess.PKCEMethodAuto),
clusteraccess.ForceRefresh(),
clusteraccess.WithClientSecret("test-client-secret"),
clusteraccess.WithGrantType(clusteraccess.GrantTypePassword),
Expand Down Expand Up @@ -523,7 +523,7 @@ var _ = Describe("ClusterAccess", func() {
"--grant-type=password",
"--oidc-extra-scope=foo",
"--oidc-extra-scope=bar",
"--oidc-use-pkce",
"--oidc-pkce-method=auto",
"--force-refresh",
))
})
Expand Down
Loading