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

Merge branch 'main' of github.com:vmware-tanzu/pinniped into active-directory-identity-provider

Browse Source
This commit is contained in:
Margo Crawford 2021-07-27 15:16:52 -07:00
commit f075d95183
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/oidcclient/login.go
View File

@ -18,7 +18,6 @@ import (
"os" "os"
"sort" "sort"
"strings" "strings"
"syscall"
"time" "time"
"github.com/coreos/go-oidc/v3/oidc" "github.com/coreos/go-oidc/v3/oidc"
@ -70,6 +69,9 @@ const (
debugLogLevel = 4 debugLogLevel = 4
) )
// stdin returns the file descriptor for stdin as an int.
func stdin() int { return int(os.Stdin.Fd()) }
type handlerState struct { type handlerState struct {
// Basic parameters. // Basic parameters.
ctx context.Context ctx context.Context
@ -541,7 +543,7 @@ func (h *handlerState) webBrowserBasedAuth(authorizeOptions *[]oauth2.AuthCodeOp
// If the listener failed to start and stdin is not a TTY, then we have no hope of succeeding, // If the listener failed to start and stdin is not a TTY, then we have no hope of succeeding,
// since we won't be able to receive the web callback and we can't prompt for the manual auth code. // since we won't be able to receive the web callback and we can't prompt for the manual auth code.
if listener == nil && !h.isTTY(syscall.Stdin) { if listener == nil && !h.isTTY(stdin()) {
return nil, fmt.Errorf("login failed: must have either a localhost listener or stdin must be a TTY") return nil, fmt.Errorf("login failed: must have either a localhost listener or stdin must be a TTY")
} }
@ -598,7 +600,7 @@ func (h *handlerState) promptForWebLogin(ctx context.Context, authorizeURL strin
// If stdin is not a TTY, print the URL but don't prompt for the manual paste, // If stdin is not a TTY, print the URL but don't prompt for the manual paste,
// since we have no way of reading it. // since we have no way of reading it.
if !h.isTTY(syscall.Stdin) { if !h.isTTY(stdin()) {
return return
} }
@ -624,7 +626,7 @@ func (h *handlerState) promptForWebLogin(ctx context.Context, authorizeURL strin
} }
func promptForValue(ctx context.Context, promptLabel string) (string, error) { func promptForValue(ctx context.Context, promptLabel string) (string, error) {
if !term.IsTerminal(int(os.Stdin.Fd())) { if !term.IsTerminal(stdin()) {
return "", errors.New("stdin is not connected to a terminal") return "", errors.New("stdin is not connected to a terminal")
} }
_, err := fmt.Fprint(os.Stderr, promptLabel) _, err := fmt.Fprint(os.Stderr, promptLabel)
@ -649,7 +651,7 @@ func promptForValue(ctx context.Context, promptLabel string) (string, error) {
} }
func promptForSecret(ctx context.Context, promptLabel string) (string, error) { func promptForSecret(ctx context.Context, promptLabel string) (string, error) {
if !term.IsTerminal(int(os.Stdin.Fd())) { if !term.IsTerminal(stdin()) {
return "", errors.New("stdin is not connected to a terminal") return "", errors.New("stdin is not connected to a terminal")
} }
_, err := fmt.Fprint(os.Stderr, promptLabel) _, err := fmt.Fprint(os.Stderr, promptLabel)
@ -673,7 +675,7 @@ func promptForSecret(ctx context.Context, promptLabel string) (string, error) {
_, _ = fmt.Fprint(os.Stderr, "\n") _, _ = fmt.Fprint(os.Stderr, "\n")
}() }()
password, err := term.ReadPassword(syscall.Stdin) password, err := term.ReadPassword(stdin())
if err != nil { if err != nil {
return "", fmt.Errorf("could not read password: %w", err) return "", fmt.Errorf("could not read password: %w", err)
} }