match SSH questions

mikew · Oct 21, 2024 · 8fa983b · 8fa983b
1 parent 62e53cc
commit 8fa983b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/nvrh_ssh/internal_ssh.go b/src/nvrh_ssh/internal_ssh.go
@@ -39,7 +39,7 @@ func GetSshClientForServer(endpoint *SshEndpoint) (*ssh.Client, error) {
 	}))
 
 	authMethods = append(authMethods, ssh.PasswordCallback(func() (string, error) {
-		password, err := askForPassword(fmt.Sprintf("Password for %s: ", endpoint))
+		password, err := askForPassword(fmt.Sprintf("%s's password: ", endpoint))
 		if err != nil {
 			slog.Error("Error reading password", "err", err)
 			return "", err
@@ -89,7 +89,7 @@ func getSignerForIdentityFile(hostname string) (ssh.Signer, error) {
 	signer, err := ssh.ParsePrivateKey(key)
 	if err != nil {
 		if _, ok := err.(*ssh.PassphraseMissingError); ok {
-			passPhrase, _ := askForPassword(fmt.Sprintf("Passphrase for %s: ", identityFile))
+			passPhrase, _ := askForPassword(fmt.Sprintf("Enter passphrase for key '%s': ", identityFile))
 
 			signer, signerErr := ssh.ParsePrivateKeyWithPassphrase(key, passPhrase)
 			if signerErr != nil {

diff --git a/src/nvrh_ssh/ssh_endpoint.go b/src/nvrh_ssh/ssh_endpoint.go
@@ -22,7 +22,12 @@ type SshEndpoint struct {
 }
 
 func (e *SshEndpoint) String() string {
-	return fmt.Sprintf("%s@%s:%s", e.FinalUser(), e.GivenHost, e.FinalPort())
+	portPart := ""
+	if e.FinalPort() != "22" {
+		portPart = fmt.Sprintf(":%s", e.FinalPort())
+	}
+
+	return fmt.Sprintf("%s@%s%s", e.FinalUser(), e.FinalHost(), portPart)
 }
 
 func (e *SshEndpoint) FinalUser() string {