From 8c1eaf3d65fdfbbef7c39c74f9a27cd9487bd785 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Fri, 17 May 2024 12:25:10 -0400 Subject: [PATCH] Fix import cycle (over SSH keyfile passphrase input) --- src/cli/init.go | 4 ++-- src/cli/utilitiesMisc.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cli/init.go b/src/cli/init.go index c3a2b42..d727378 100644 --- a/src/cli/init.go +++ b/src/cli/init.go @@ -32,7 +32,7 @@ func TempInitCli() { configSSH := inputBinary("Configure SSH settings (for synchronization)?") if configSSH { // necessary SSH info - fmt.Print(AnsiBold+"Note:"+backend.AnsiReset, "Only key-based authentication is supported (keys may optionally be passphrase-protected).\nThe remote server must already be in your ~/.ssh/known_hosts file.\n\n") + fmt.Println(AnsiBold + "\nNote:" + backend.AnsiReset + " Only key-based authentication is supported (keys may optionally be passphrase-protected).\nThe remote server must already be in your ~/.ssh/known_hosts file.") sshUser := input("Remote SSH username:") sshIP := input("Remote SSH IP address:") sshPort := input("Remote SSH port:") @@ -40,7 +40,7 @@ func TempInitCli() { sshKeyProtected := inputBinary("Is the identity file password-protected?") // write config file - backend.TempInit(map[string]string{"textEditor": textEditor, "gpgID": gpgID, "sshUser": sshUser, "sshIP": sshIP, "sshPort": sshPort, "sshIdentity": sshKey, "sshIDProtected": strconv.FormatBool(sshKeyProtected)}) + backend.TempInit(map[string]string{"textEditor": textEditor, "gpgID": gpgID, "sshUser": sshUser, "sshIP": sshIP, "sshPort": sshPort, "sshKey": sshKey, "sshKeyProtected": strconv.FormatBool(sshKeyProtected)}) // generate device ID sync.DeviceIDGen() diff --git a/src/cli/utilitiesMisc.go b/src/cli/utilitiesMisc.go index 8c68c88..2ebad10 100644 --- a/src/cli/utilitiesMisc.go +++ b/src/cli/utilitiesMisc.go @@ -25,8 +25,8 @@ func input(prompt string) string { return strings.TrimRight(userInput, "\n\r ") // remove trailing newlines, carriage returns, and spaces } -// InputHidden prompts the user for input and returns the input as a string, hiding the input from the terminal -func InputHidden(prompt string) string { +// inputHidden prompts the user for input and returns the input as a string, hiding the input from the terminal +func inputHidden(prompt string) string { fmt.Print("\n" + prompt + " ") byteInput, _ := terminal.ReadPassword(int(os.Stdin.Fd())) password := string(byteInput)