litcli: prepare for a client connection without a macaroon

ellemouton · ellemouton · commit 143876d1ec8b · 2023-09-22T11:59:24.000+02:00
In preparation for an upcoming commit where litcli commands for the
Status server are added, the `getClientConn` method is updated with a
`noMac` parameter. If true, them the connection will be made without a
macaroon.
diff --git a/cmd/litcli/accounts.go b/cmd/litcli/accounts.go
@@ -78,7 +78,7 @@ var createAccountCommand = cli.Command{
 
 func createAccount(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -185,7 +185,7 @@ var updateAccountCommand = cli.Command{
 
 func updateAccount(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -253,7 +253,7 @@ var listAccountsCommand = cli.Command{
 
 func listAccounts(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -293,7 +293,7 @@ var accountInfoCommand = cli.Command{
 
 func accountInfo(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -341,7 +341,7 @@ var removeAccountCommand = cli.Command{
 
 func removeAccount(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/litcli/actions.go b/cmd/litcli/actions.go
@@ -99,7 +99,7 @@ var listActionsCommand = cli.Command{
 
 func listActions(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/litcli/autopilot.go b/cmd/litcli/autopilot.go
@@ -116,7 +116,7 @@ var listAutopilotSessionsCmd = cli.Command{
 
 func revokeAutopilotSession(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -144,7 +144,7 @@ func revokeAutopilotSession(ctx *cli.Context) error {
 
 func listAutopilotSessions(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -165,7 +165,7 @@ func listAutopilotSessions(ctx *cli.Context) error {
 
 func listFeatures(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -189,7 +189,7 @@ func initAutopilotSession(ctx *cli.Context) error {
 	sessionExpiry := time.Now().Add(sessionLength).Unix()
 
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/litcli/main.go b/cmd/litcli/main.go
@@ -89,13 +89,15 @@ func fatal(err error) {
 	os.Exit(1)
 }
 
-func connectClient(ctx *cli.Context) (grpc.ClientConnInterface, func(), error) {
+func connectClient(ctx *cli.Context, noMac bool) (grpc.ClientConnInterface,
+	func(), error) {
+
 	rpcServer := ctx.GlobalString("rpcserver")
 	tlsCertPath, macPath, err := extractPathArgs(ctx)
 	if err != nil {
 		return nil, nil, err
 	}
-	conn, err := getClientConn(rpcServer, tlsCertPath, macPath)
+	conn, err := getClientConn(rpcServer, tlsCertPath, macPath, noMac)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -104,18 +106,20 @@ func connectClient(ctx *cli.Context) (grpc.ClientConnInterface, func(), error) {
 	return conn, cleanup, nil
 }
 
-func getClientConn(address, tlsCertPath, macaroonPath string) (*grpc.ClientConn,
-	error) {
-
-	// We always need to send a macaroon.
-	macOption, err := readMacaroon(macaroonPath)
-	if err != nil {
-		return nil, err
-	}
+func getClientConn(address, tlsCertPath, macaroonPath string, noMac bool) (
+	*grpc.ClientConn, error) {
 
 	opts := []grpc.DialOption{
 		grpc.WithDefaultCallOptions(maxMsgRecvSize),
-		macOption,
+	}
+
+	if !noMac {
+		macOption, err := readMacaroon(macaroonPath)
+		if err != nil {
+			return nil, err
+		}
+
+		opts = append(opts, macOption)
 	}
 
 	// TLS cannot be disabled, we'll always have a cert file to read.
diff --git a/cmd/litcli/privacy_map.go b/cmd/litcli/privacy_map.go
@@ -58,7 +58,7 @@ var privacyMapConvertStrCommand = cli.Command{
 
 func privacyMapConvertStr(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -112,7 +112,7 @@ var privacyMapConvertUint64Command = cli.Command{
 
 func privacyMapConvertUint64(ctx *cli.Context) error {
 	ctxb := context.Background()
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/litcli/proxy.go b/cmd/litcli/proxy.go
@@ -53,7 +53,7 @@ var litCommands = []cli.Command{
 }
 
 func getInfo(ctx *cli.Context) error {
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -72,7 +72,7 @@ func getInfo(ctx *cli.Context) error {
 }
 
 func shutdownLit(ctx *cli.Context) error {
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -109,7 +109,7 @@ func bakeSuperMacaroon(ctx *cli.Context) error {
 	}
 	suffix := binary.BigEndian.Uint32(suffixBytes[:])
 
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/litcli/sessions.go b/cmd/litcli/sessions.go
@@ -96,7 +96,7 @@ var addSessionCommand = cli.Command{
 }
 
 func addSession(ctx *cli.Context) error {
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}
@@ -229,7 +229,7 @@ var sessionStateMap = map[litrpc.SessionState]sessionFilter{
 
 func listSessions(filter sessionFilter) func(ctx *cli.Context) error {
 	return func(ctx *cli.Context) error {
-		clientConn, cleanup, err := connectClient(ctx)
+		clientConn, cleanup, err := connectClient(ctx, false)
 		if err != nil {
 			return err
 		}
@@ -279,7 +279,7 @@ var revokeSessionCommand = cli.Command{
 }
 
 func revokeSession(ctx *cli.Context) error {
-	clientConn, cleanup, err := connectClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx, false)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ var listActionsCommand = cli.Command{`
`99`	`99`
`100`	`100`	`func listActions(ctx *cli.Context) error {`
`101`	`101`	`ctxb := context.Background()`
`102`		`- clientConn, cleanup, err := connectClient(ctx)`
	`102`	`+ clientConn, cleanup, err := connectClient(ctx, false)`
`103`	`103`	`if err != nil {`
`104`	`104`	`return err`
`105`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ var litCommands = []cli.Command{`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func getInfo(ctx *cli.Context) error {`
`56`		`- clientConn, cleanup, err := connectClient(ctx)`
	`56`	`+ clientConn, cleanup, err := connectClient(ctx, false)`
`57`	`57`	`if err != nil {`
`58`	`58`	`return err`
`59`	`59`	`}`
`@@ -72,7 +72,7 @@ func getInfo(ctx *cli.Context) error {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`func shutdownLit(ctx *cli.Context) error {`
`75`		`- clientConn, cleanup, err := connectClient(ctx)`
	`75`	`+ clientConn, cleanup, err := connectClient(ctx, false)`
`76`	`76`	`if err != nil {`
`77`	`77`	`return err`
`78`	`78`	`}`
`@@ -109,7 +109,7 @@ func bakeSuperMacaroon(ctx *cli.Context) error {`
`109`	`109`	`}`
`110`	`110`	`suffix := binary.BigEndian.Uint32(suffixBytes[:])`
`111`	`111`
`112`		`- clientConn, cleanup, err := connectClient(ctx)`
	`112`	`+ clientConn, cleanup, err := connectClient(ctx, false)`
`113`	`113`	`if err != nil {`
`114`	`114`	`return err`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ var addSessionCommand = cli.Command{`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`func addSession(ctx *cli.Context) error {`
`99`		`- clientConn, cleanup, err := connectClient(ctx)`
	`99`	`+ clientConn, cleanup, err := connectClient(ctx, false)`
`100`	`100`	`if err != nil {`
`101`	`101`	`return err`
`102`	`102`	`}`
`@@ -229,7 +229,7 @@ var sessionStateMap = map[litrpc.SessionState]sessionFilter{`
`229`	`229`
`230`	`230`	`func listSessions(filter sessionFilter) func(ctx *cli.Context) error {`
`231`	`231`	`return func(ctx *cli.Context) error {`
`232`		`- clientConn, cleanup, err := connectClient(ctx)`
	`232`	`+ clientConn, cleanup, err := connectClient(ctx, false)`
`233`	`233`	`if err != nil {`
`234`	`234`	`return err`
`235`	`235`	`}`
`@@ -279,7 +279,7 @@ var revokeSessionCommand = cli.Command{`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`func revokeSession(ctx *cli.Context) error {`
`282`		`- clientConn, cleanup, err := connectClient(ctx)`
	`282`	`+ clientConn, cleanup, err := connectClient(ctx, false)`
`283`	`283`	`if err != nil {`
`284`	`284`	`return err`
`285`	`285`	`}`