feat: hide password on command

Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com>

cmd/gotty-client/main.go

@@ -10,6 +10,7 @@ import (
 	gottyclient "github.com/moul/gotty-client"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 var VERSION string
@@ -67,6 +68,11 @@ func main() {
 			Usage:  "WebSocket Origin URL",
 			EnvVar: "GOTTY_CLIENT_WS_ORIGIN",
 		},
+		cli.StringFlag{
+			Name:   "user, u",
+			Usage:  "User for Basic Authentication",
+			EnvVar: "GOTTY_CLIENT_USER",
+		},
 	}
 
 	app.Action = action
@@ -121,6 +127,17 @@ func action(c *cli.Context) error {
 		}
 	}
 
+	if user := c.String("user"); user != "" {
+		client.User = user
+		fmt.Print("Password: ")
+		password, err := terminal.ReadPassword(int(os.Stdin.Fd()))
+		fmt.Println()
+		if err != nil {
+			return cli.NewExitError("Failed to get password from stdin", 2)
+		}
+		client.Password = string(password)
+	}
+
 	// loop
 	if err = client.Loop(); err != nil {
 		logrus.Fatalf("Communication error: %v", err)

gotty-client.go

@@ -11,9 +11,9 @@ import (
 	"net/url"
 	"os"
 	"regexp"
-	"syscall"
 	"strings"
 	"sync"
+	"syscall"
 	"time"
 
 	"github.com/containerd/console"
@@ -144,6 +144,8 @@ type Client struct {
 	V2              bool
 	message         *gottyMessageType
 	WSOrigin        string
+	User            string
+	Password        string
 }
 
 type querySingleType struct {
@@ -163,6 +165,10 @@ func (c *Client) GetAuthToken() (string, error) {
 	if err != nil {
 		return "", err
 	}
+	if c.User != "" {
+		basicAuth := c.User + ":" + c.Password
+		header.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(basicAuth)))
+	}
 
 	logrus.Debugf("Fetching auth token auth-token: %q", target.String())
 	req, err := http.NewRequest("GET", target.String(), nil)
@@ -220,6 +226,10 @@ func (c *Client) Connect() error {
 	if err != nil {
 		return err
 	}
+	if c.User != "" {
+		basicAuth := c.User + ":" + c.Password
+		header.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString([]byte(basicAuth)))
+	}
 	if c.WSOrigin != "" {
 		header.Add("Origin", c.WSOrigin)
 	}