v0.0.3: add sudo prompt warning

Author: geemus

trust/trust.go

@@ -20,6 +20,10 @@ import (
 	"github.com/anchordotdev/cli/truststore"
 )
 
+const (
+	sudoWarning = "! Anchor needs sudo permission to add the specified certificates to your local trust stores."
+)
+
 type Command struct {
 	Config *cli.Config
 }
@@ -88,6 +92,8 @@ func (c *Command) run(ctx context.Context, tty termenv.File) error {
 		log.Fatal(err)
 	}
 
+	fmt.Fprintln(tty, sudoWarning)
+
 	rootFS := truststore.RootFS()
 	systemStore := &truststore.Platform{
 		HomeDir: homeDir,
@@ -131,23 +137,26 @@ func (c *Command) run(ctx context.Context, tty termenv.File) error {
 			UniqueName: uniqueName,
 		}
 
-		if c.Config.Trust.MockMode {
-			fmt.Fprintf(tty, "\"%s\" %s cert (%s) installed in the mock store\n", ca.Subject.CommonName, ca.PublicKeyAlgorithm, uniqueName)
+		if ca.SignatureAlgorithm == x509.PureEd25519 {
+			fmt.Fprintf(tty, "Installing \"%s\" %s (%s) certificate:\n", ca.Subject.CommonName, ca.PublicKeyAlgorithm, uniqueName)
+			fmt.Fprintf(tty, "  - skipped awaiting broader support.\n")
 			continue
 		}
 
-		if ca.SignatureAlgorithm == x509.PureEd25519 {
-			fmt.Fprintf(tty, "skipping \"%s\" %s cert (%s), Ed25519 certificates are not yet supported\n", ca.Subject.CommonName, ca.PublicKeyAlgorithm, uniqueName)
+		fmt.Fprintf(tty, "Installing \"%s\" %s (%s) certificate:\n", ca.Subject.CommonName, ca.PublicKeyAlgorithm, uniqueName)
+
+		if c.Config.Trust.MockMode {
+			fmt.Fprintf(tty, "  - installed in the mock store.\n")
 			continue
 		}
 
 		if installed, err := systemStore.InstallCA(ca); installed {
-			fmt.Fprintf(tty, "\"%s\" %s cert (%s) installed in the system store\n", ca.Subject.CommonName, ca.PublicKeyAlgorithm, uniqueName)
+			fmt.Fprintf(tty, "  - installed in the system store.\n")
 		} else if err != nil {
 			return err
 		}
 		if installed, err := nssStore.InstallCA(ca); installed {
-			fmt.Fprintf(tty, "\"%s\" %s cert (%s) installed in the NSS store\n", ca.Subject.CommonName, ca.PublicKeyAlgorithm, uniqueName)
+			fmt.Fprintf(tty, "  - installed in the Network Security Services (NSS) store.\n")
 		} else if err != nil {
 			return err
 		}

trust/trust_test.go

@@ -1,12 +1,12 @@
 package trust
 
 import (
+	"bufio"
 	"context"
 	"encoding/json"
 	"flag"
 	"os"
 	"regexp"
-	"strings"
 	"testing"
 
 	"github.com/anchordotdev/cli"
@@ -45,6 +45,10 @@ func TestTrust(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	headerPattern := regexp.MustCompile(`Installing "[^"]+ - AnchorCA" \w+ \([a-z0-9]+\) certificate:$`)
+	installPattern := regexp.MustCompile(`  - installed in the mock store.$`)
+	skipPattern := regexp.MustCompile(`  - skipped awaiting broader support.$`)
+
 	t.Run("default to personal org and localhost realm", func(t *testing.T) {
 		cmd := &Command{
 			Config: cfg,
@@ -55,15 +59,24 @@ func TestTrust(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		msgPattern := regexp.MustCompile(` - AnchorCA" \w+ cert \([a-z0-9]+\) installed in the mock store$`)
+		scanner := bufio.NewScanner(buf)
+		if !scanner.Scan() {
+			t.Fatalf("want sudo warning line got %q %v (nil is EOF)", scanner.Err(), scanner.Err())
+		}
+		if line := scanner.Text(); line != sudoWarning {
+			t.Errorf("want output %q to match %q", line, sudoWarning)
+		}
+		for scanner.Scan() {
+			if line := scanner.Text(); !headerPattern.MatchString(line) {
+				t.Errorf("want output %q to match %q", line, headerPattern)
+			}
 
-		for _, line := range strings.Split(buf.String(), "\n") {
-			if len(line) == 0 {
-				continue
+			if !scanner.Scan() {
+				t.Fatalf("want detail line got %q %v (nil is EOF)", scanner.Err(), scanner.Err())
 			}
 
-			if !msgPattern.MatchString(line) {
-				t.Errorf("want output %q to match %q", line, msgPattern)
+			if line := scanner.Text(); !(installPattern.MatchString(line) || skipPattern.MatchString(line)) {
+				t.Errorf("want output %q to match %q or %q", line, installPattern, skipPattern)
 			}
 		}
 	})
@@ -81,15 +94,24 @@ func TestTrust(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		msgPattern := regexp.MustCompile(` - AnchorCA" \w+ cert \([a-z0-9]+\) installed in the mock store$`)
+		scanner := bufio.NewScanner(buf)
+		if !scanner.Scan() {
+			t.Fatalf("want sudo warning line got %q %v (nil is EOF)", scanner.Err(), scanner.Err())
+		}
+		if line := scanner.Text(); line != sudoWarning {
+			t.Errorf("want output %q to match %q", line, sudoWarning)
+		}
+		for scanner.Scan() {
+			if line := scanner.Text(); !headerPattern.MatchString(line) {
+				t.Errorf("want output %q to match %q", line, headerPattern)
+			}
 
-		for _, line := range strings.Split(buf.String(), "\n") {
-			if len(line) == 0 {
-				continue
+			if !scanner.Scan() {
+				t.Fatalf("want detail line got %q %v (nil is EOF)", scanner.Err(), scanner.Err())
 			}
 
-			if !msgPattern.MatchString(line) {
-				t.Errorf("want output %q to match %q", line, msgPattern)
+			if line := scanner.Text(); !(installPattern.MatchString(line) || skipPattern.MatchString(line)) {
+				t.Errorf("want output %q to match %q or %q", line, installPattern, skipPattern)
 			}
 		}
 	})