feat(account): support configuring credentials with browser login

Author: kangasta

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/UpCloudLtd/upcloud-go-api/v8 v8.16.0
 	github.com/adrg/xdg v0.3.2
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
+	github.com/cli/browser v1.3.0
 	github.com/gemalto/flume v0.12.0
 	github.com/jedib0t/go-pretty/v6 v6.4.9
 	github.com/m7shapan/cidr v0.0.0-20200427124835-7eba0889a5d2

go.sum

@@ -39,6 +39,8 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M=
 github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo=
+github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=

internal/commands/account/login.go

@@ -5,7 +5,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/UpCloudLtd/progress/messages"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands"
+	"github.com/UpCloudLtd/upcloud-cli/v3/internal/commands/account/tokenreceiver"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/config"
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/output"
 	"github.com/spf13/pflag"
@@ -47,6 +49,46 @@ func (s *loginCommand) ExecuteWithoutArguments(exec commands.Executor) (output.O
 		return s.executeWithToken(exec)
 	}
 
+	return s.execute(exec)
+}
+
+func (s *loginCommand) execute(exec commands.Executor) (output.Output, error) {
+	msg := "Waiting to receive token from browser."
+	exec.PushProgressStarted(msg)
+
+	receiver := tokenreceiver.New()
+	err := receiver.Start()
+	if err != nil {
+		return commands.HandleError(exec, msg, err)
+	}
+
+	err = receiver.OpenBrowser()
+	if err != nil {
+		url := receiver.GetLoginURL()
+		exec.PushProgressUpdate(messages.Update{
+			Message: "Failed to open browser.",
+			Status:  messages.MessageStatusError,
+			Details: fmt.Sprintf("Please open a browser and navigate to %s to continue with the login.", url),
+		})
+	}
+
+	token, err := receiver.Wait(exec.Context())
+	if err != nil {
+		return commands.HandleError(exec, msg, err)
+	}
+
+	exec.PushProgressUpdate(messages.Update{
+		Key:     msg,
+		Message: "Saving created token to the system keyring.",
+	})
+
+	err = config.SaveTokenToKeyring(token)
+	if err != nil {
+		return commands.HandleError(exec, msg, fmt.Errorf("failed to save token to keyring: %w", err))
+	}
+
+	exec.PushProgressSuccess(msg)
+
 	return output.None{}, nil
 }
 

internal/commands/account/tokenreceiver/server.go

@@ -0,0 +1,85 @@
+package tokenreceiver
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/http"
+	"time"
+
+	"github.com/cli/browser"
+)
+
+type ReceiverServer struct {
+	server *http.Server
+	token  string
+	port   string
+}
+
+func New() *ReceiverServer {
+	return &ReceiverServer{}
+}
+
+func getPort(listener net.Listener) string {
+	_, port, _ := net.SplitHostPort(listener.Addr().String())
+	return port
+}
+
+func getURL(target string) string {
+	return fmt.Sprintf("http://localhost:3000/account/upctl-login/%s", target)
+}
+
+func (s *ReceiverServer) GetLoginURL() string {
+	return getURL(s.port)
+}
+
+func (s *ReceiverServer) Start() error {
+	handler := http.NewServeMux()
+	handler.HandleFunc("/", func(w http.ResponseWriter, req *http.Request) {
+		token := req.URL.Query().Get("token")
+		if token == "" {
+			http.Redirect(w, req, getURL("error"), http.StatusSeeOther)
+			return
+		}
+		s.token = token
+		http.Redirect(w, req, getURL("success"), http.StatusSeeOther)
+	})
+
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		return fmt.Errorf("failed to create receiver server: %w", err)
+	}
+
+	go func() {
+		defer listener.Close()
+		s.server = &http.Server{
+			Handler:           handler,
+			ReadHeaderTimeout: time.Second,
+		}
+		_ = s.server.Serve(listener)
+	}()
+	s.port = getPort(listener)
+	return nil
+}
+
+func (s *ReceiverServer) OpenBrowser() error {
+	return browser.OpenURL(s.GetLoginURL())
+}
+
+func (s *ReceiverServer) Wait(ctx context.Context) (string, error) {
+	ticker := time.NewTicker(time.Second * 2)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ctx.Done():
+			_ = s.server.Shutdown(context.TODO())
+			return "", ctx.Err()
+		case <-ticker.C:
+			if s.token != "" {
+				_ = s.server.Shutdown(context.TODO())
+				return s.token, nil
+			}
+		}
+	}
+}

internal/commands/all/all.go

@@ -117,6 +117,7 @@ func BuildCommands(rootCmd *cobra.Command, conf *config.Config) {
 	accountCommand := commands.BuildCommand(account.BaseAccountCommand(), rootCmd, conf)
 	commands.BuildCommand(account.LoginCommand(), accountCommand.Cobra(), conf)
 	commands.BuildCommand(account.ShowCommand(), accountCommand.Cobra(), conf)
+	commands.BuildCommand(account.LoginCommand(), accountCommand.Cobra(), conf)
 	commands.BuildCommand(account.ListCommand(), accountCommand.Cobra(), conf)
 	commands.BuildCommand(account.DeleteCommand(), accountCommand.Cobra(), conf)