From 67c27fea145855f5df8d75db2a4291bb936f074f Mon Sep 17 00:00:00 2001
From: Joel Lau <joellau@protonmail.com>
Date: Tue, 29 Oct 2024 03:43:27 +0800
Subject: [PATCH] specify ssh dir

Signed-off-by: Joel Lau <joellau@protonmail.com>
---
 internal/backend/crypto/age/ssh.go | 36 ++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/internal/backend/crypto/age/ssh.go b/internal/backend/crypto/age/ssh.go
index 6b0655e0c2..fd9d244661 100644
--- a/internal/backend/crypto/age/ssh.go
+++ b/internal/backend/crypto/age/ssh.go
@@ -32,14 +32,11 @@ func (a *Age) getSSHIdentities(ctx context.Context) (map[string]age.Identity, er
 		return sshCache, nil
 	}
 
-	// notice that this respects the GOPASS_HOMEDIR env variable, and won't
-	// find a .ssh folder in your home directory if you set GOPASS_HOMEDIR
-	uhd := appdir.UserHome()
-	sshDir := filepath.Join(uhd, ".ssh")
-	if !fsutil.IsDir(sshDir) {
-		debug.Log("no .ssh directory found at %s. Ignoring SSH identities", sshDir)
+	sshDir, err := getSSHDir()
+	if err != nil {
+		debug.Log("asdf: %s", err)
 
-		return nil, fmt.Errorf("no identities found: %w", ErrNoSSHDir)
+		return nil, fmt.Errorf("asdf: %w", err)
 	}
 
 	files, err := os.ReadDir(sshDir)
@@ -69,6 +66,31 @@ func (a *Age) getSSHIdentities(ctx context.Context) (map[string]age.Identity, er
 	return ids, nil
 }
 
+func getSSHDir() (string, error) {
+	preferredPath := os.Getenv("GOPASS_SSHDIR")
+	if preferredPath != "" {
+		return preferredPath, nil
+	}
+	sshDir := filepath.Join(preferredPath, ".ssh")
+	if !fsutil.IsDir(sshDir) {
+		debug.Log("no .ssh directory found at %s. Ignoring SSH identities", sshDir)
+
+		return "", fmt.Errorf("no identities found: %w", ErrNoSSHDir)
+	}
+
+	// notice that this respects the GOPASS_HOMEDIR env variable, and won't
+	// find a .ssh folder in your home directory if you set GOPASS_HOMEDIR
+	uhd := appdir.UserHome()
+	sshDir = filepath.Join(uhd, ".ssh")
+	if !fsutil.IsDir(sshDir) {
+		debug.Log("no .ssh directory found at %s. Ignoring SSH identities", sshDir)
+
+		return "", fmt.Errorf("no identities found: %w", ErrNoSSHDir)
+	}
+
+	return "", nil
+}
+
 // parseSSHIdentity parses a SSH public key file and returns the recipient and the identity.
 func (a *Age) parseSSHIdentity(ctx context.Context, pubFn string) (string, age.Identity, error) {
 	privFn := strings.TrimSuffix(pubFn, ".pub")