Hide private key entry

Author: bastjan

e2e/interactive.tcl

@@ -23,17 +23,22 @@ file delete -force "em-$cluster_id"
 set ::env(EMR_CONFIG_DIR) [pwd]
 
 log "Starting tool"
-spawn ../emergency-credentials-receive
+spawn ../emergency-credentials-receive -omit-token-output
 expect -exact "Welcome"
 
 log "Expecting private key prompt in editor"
 expect -exact "Paste your Passbolt private key"
 sleep .1
 send -- "i"
+log "Omitting user private_key input"
+log_user 0
 send -- "$private_key"
 # Escape key
 send -- "\x1b"
 send -- ":x\r"
+expect "survey*written"
+log "private_key entry done"
+log_user 1
 
 log "Expecting passphrase prompt"
 expect_prompt "Passbolt passphrase"
@@ -48,6 +53,7 @@ send -- "\r"
 log "Expecting to have valid credentials"
 expect -exact "2 buckets with credentials found"
 expect -exact "Emergency credentials found"
+expect -exact "OMITTED"
 
 log "Expecting API endpoint prompt"
 expect_prompt "Provide API endpoint"

e2e/non-interactive.tcl

@@ -18,12 +18,13 @@ log "Starting tool"
 set ::env(EMR_PASSPHRASE) "$passphrase"
 set ::env(EMR_KUBERNETES_ENDPOINT) "$api_endpoint"
 exec -- jq --null-input --arg key "$private_key" {{passbolt_key: $key}} > config.yaml
-spawn ../emergency-credentials-receive "$cluster_id"
+spawn ../emergency-credentials-receive -omit-token-output "$cluster_id"
 expect -exact "Welcome"
 
 log "Expecting to have valid credentials"
 expect -exact "2 buckets with credentials found"
 expect -exact "Emergency credentials found"
+expect -exact "OMITTED"
 expect eof
 
 test_kubeconfig "em-$cluster_id"

main.go

@@ -64,6 +64,8 @@ var (
 	tokenOutputStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#04B575"))
 	boldStyle        = lipgloss.NewStyle().Bold(true)
 	isTerminal       = term.IsTerminal(int(os.Stdout.Fd()))
+
+	omitTokenOutput bool
 )
 
 func main() {
@@ -76,6 +78,7 @@ func main() {
 
 		flag.PrintDefaults()
 	}
+	flag.BoolVar(&omitTokenOutput, "omit-token-output", false, "omit token output to STDOUT")
 	flag.Parse()
 
 	clusterId := flag.Arg(0)
@@ -280,7 +283,11 @@ func main() {
 	lf("Emergency credentials found\n\n")
 	for i, c := range emcreds {
 		fmt.Println("# ", "Token", i)
-		fmt.Println("# ", tokenOutputStyle.Render(c))
+		if omitTokenOutput {
+			fmt.Println(tokenOutputStyle.Render("*** OMITTED ***"))
+		} else {
+			fmt.Println(tokenOutputStyle.Render(c))
+		}
 	}
 
 	kep := os.Getenv("EMR_KUBERNETES_ENDPOINT")