GitHubMirror/MUTN
1
0
Fork 0
mirror of https://github.com/rwinkhart/MUTN.git synced 2026-09-05 08:37:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix import cycle (over SSH keyfile passphrase input)

Browse Source
This commit is contained in:
RandyTheSilly
2024-05-17 12:25:10 -04:00
parent 66995c3c06
commit 8c1eaf3d65
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/init.go
+2 -2
View File
@@ -32,7 +32,7 @@ func TempInitCli() {
configSSH := inputBinary("Configure SSH settings (for synchronization)?") configSSH := inputBinary("Configure SSH settings (for synchronization)?")
if configSSH { if configSSH {
// necessary SSH info // 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:") sshUser := input("Remote SSH username:")
sshIP := input("Remote SSH IP address:") sshIP := input("Remote SSH IP address:")
sshPort := input("Remote SSH port:") sshPort := input("Remote SSH port:")
@@ -40,7 +40,7 @@ func TempInitCli() {
sshKeyProtected := inputBinary("Is the identity file password-protected?") sshKeyProtected := inputBinary("Is the identity file password-protected?")
// write config file // 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 // generate device ID
sync.DeviceIDGen() sync.DeviceIDGen()
src/cli/utilitiesMisc.go
+2 -2
View File
@@ -25,8 +25,8 @@ func input(prompt string) string {
return strings.TrimRight(userInput, "\n\r ") // remove trailing newlines, carriage returns, and spaces 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 // inputHidden prompts the user for input and returns the input as a string, hiding the input from the terminal
func InputHidden(prompt string) string { func inputHidden(prompt string) string {
fmt.Print("\n" + prompt + " ") fmt.Print("\n" + prompt + " ")
byteInput, _ := terminal.ReadPassword(int(os.Stdin.Fd())) byteInput, _ := terminal.ReadPassword(int(os.Stdin.Fd()))
password := string(byteInput) password := string(byteInput)