djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove temporary --debug-auth-code-exchange flag for OIDC client CLI.

Browse Source 
Signed-off-by: Matt Moyer <moyerm@vmware.com>
This commit is contained in:
Matt Moyer 2020-10-06 15:59:14 -05:00
parent ff545db869
commit a13d7ec5a1
No known key found for this signature in database
GPG Key ID: EAE88AD172C5AE2D
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/pinniped/cmd/login_oidc.go
View File

@ -11,7 +11,6 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"go.pinniped.dev/internal/here"
"go.pinniped.dev/internal/oidc/pkce" "go.pinniped.dev/internal/oidc/pkce"
"go.pinniped.dev/internal/oidc/state" "go.pinniped.dev/internal/oidc/state"
) )
@ -27,13 +26,12 @@ func init() {
type oidcLoginParams struct { type oidcLoginParams struct {
// These parameters capture CLI flags. // These parameters capture CLI flags.
issuer string issuer string
clientID string clientID string
listenPort uint16 listenPort uint16
scopes []string scopes []string
skipBrowser bool skipBrowser bool
usePKCE bool usePKCE bool
debugAuthCode bool
// These parameters capture dependencies that we want to mock during testing. // These parameters capture dependencies that we want to mock during testing.
generateState func() (state.State, error) generateState func() (state.State, error)
@ -56,11 +54,6 @@ func (o *oidcLoginParams) cmd() *cobra.Command {
cmd.Flags().BoolVar(&o.skipBrowser, "skip-browser", false, "Skip opening the browser (just print the URL).") cmd.Flags().BoolVar(&o.skipBrowser, "skip-browser", false, "Skip opening the browser (just print the URL).")
cmd.Flags().BoolVar(&o.usePKCE, "use-pkce", true, "Use Proof Key for Code Exchange (RFC 7636) during login.") cmd.Flags().BoolVar(&o.usePKCE, "use-pkce", true, "Use Proof Key for Code Exchange (RFC 7636) during login.")
mustMarkRequired(&cmd, "issuer", "client-id") mustMarkRequired(&cmd, "issuer", "client-id")
// TODO: temporary
cmd.Flags().BoolVar(&o.debugAuthCode, "debug-auth-code-exchange", true, "Debug the authorization code exchange (temporary).")
_ = cmd.Flags().MarkHidden("debug-auth-code-exchange")
return &cmd return &cmd
} }
@ -107,20 +100,5 @@ func (o *oidcLoginParams) runE(cmd *cobra.Command, args []string) error {
return fmt.Errorf("could not open browser (run again with --skip-browser?): %w", err) return fmt.Errorf("could not open browser (run again with --skip-browser?): %w", err)
} }
// TODO: this temporary so we can complete the auth code exchange manually
if o.debugAuthCode {
cmd.PrintErr(here.Docf(`
DEBUG INFO:
Token URL: %s
State: %s
PKCE: %s
`,
cfg.Endpoint.TokenURL,
stateParam,
pkceCode.Verifier(),
))
}
return nil return nil
} }