Timeout login command (#308)

internal/cmd/cmd.go

@@ -182,6 +182,8 @@ func updateKubeconfig(destinations []api.Destination) error {
 }
 
 func newLoginCmd() (*cobra.Command, error) {
+	var options LoginOptions
+
 	cmd := &cobra.Command{
 		Use:     "login REGISTRY",
 		Short:   "Login to an Infra Registry",
@@ -193,10 +195,12 @@ func newLoginCmd() (*cobra.Command, error) {
 				registry = args[0]
 			}
 
-			return login(registry, true)
+			return login(registry, true, options)
 		},
 	}
 
+	cmd.Flags().DurationVarP(&options.Timeout, "timeout", "t", defaultTimeout, "login timeout")
+
 	return cmd, nil
 }
 

internal/cmd/list.go

@@ -37,7 +37,7 @@ func list() error {
 		case http.StatusForbidden:
 			fmt.Fprintln(os.Stderr, "Session has expired.")
 
-			if err = login("", false); err != nil {
+			if err = login("", false, LoginOptions{}); err != nil {
 				return err
 			}
 

internal/cmd/local_server.go

@@ -7,8 +7,15 @@ import (
 	"html/template"
 	"net/http"
 	"strings"
+	"time"
 )
 
+type ErrResultTimedOut struct{}
+
+func (e *ErrResultTimedOut) Error() string {
+	return "local server timed out waiting for result"
+}
+
 type CodeResponse struct {
 	Code  string
 	State string
@@ -20,6 +27,8 @@ type LocalServer struct {
 	srv        *http.Server
 }
 
+const defaultTimeout = 300000 * time.Millisecond
+
 //go:embed pages
 var pages embed.FS
 
@@ -63,13 +72,30 @@ func newLocalServer() (*LocalServer, error) {
 	return ls, nil
 }
 
-func (l *LocalServer) wait() (string, string, error) {
-	result := <-l.ResultChan
+func (l *LocalServer) wait(timeout time.Duration) (string, string, error) {
+	var result CodeResponse
+
+	timedOut := false
+
+	if timeout <= 0 {
+		timeout = defaultTimeout
+	}
+
+	select {
+	case result = <-l.ResultChan:
+		// do nothing
+	case <-time.After(timeout):
+		timedOut = true
+	}
 
 	if err := l.srv.Shutdown(context.Background()); err != nil {
 		return "", "", err
 	}
 
+	if timedOut {
+		return "", "", &ErrResultTimedOut{}
+	}
+
 	return result.Code, result.State, result.Error
 }
 

internal/cmd/login.go

@@ -29,7 +29,11 @@ func (e *ErrUnauthenticated) Error() string {
 	return "Could not read local credentials. Are you logged in? Use \"infra login\" to login."
 }
 
-func login(registry string, useCurrentConfig bool) error {
+type LoginOptions struct {
+	Timeout time.Duration
+}
+
+func login(registry string, useCurrentConfig bool, options LoginOptions) error {
 	homeDir, err := os.UserHomeDir()
 	if err != nil {
 		return err
@@ -123,7 +127,7 @@ func login(registry string, useCurrentConfig bool) error {
 	}
 
 	if !proceed {
-		return fmt.Errorf("Could not continue with login.")
+		return fmt.Errorf("could not continue with login")
 	}
 
 	client, err := NewApiClient(selectedRegistry.Host, skipTLSVerify)
@@ -181,7 +185,7 @@ func login(registry string, useCurrentConfig bool) error {
 			return err
 		}
 
-		code, recvstate, err := ls.wait()
+		code, recvstate, err := ls.wait(options.Timeout)
 		if err != nil {
 			return err
 		}

internal/cmd/token.go

@@ -62,7 +62,7 @@ func tokenCreate(destination string) error {
 
 				fmt.Fprintln(os.Stderr, "Session has expired.")
 
-				if err = login("", false); err != nil {
+				if err = login("", false, LoginOptions{}); err != nil {
 					return err
 				}