exposed passdir for customers to set dir where pass is stored

common-fate · Sep 23, 2024 · 20d60a8 · 20d60a8
1 parent b114bb5
commit 20d60a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -94,6 +94,7 @@ type KeyringConfig struct {
 	KeychainName            *string `toml:",omitempty"`
 	FileDir                 *string `toml:",omitempty"`
 	LibSecretCollectionName *string `toml:",omitempty"`
+	PassDir                 *string `toml:",omitempty"` // PassDir is the pass password-store directory, ~/ is resolved to the users' home dir
 }
 
 type Registry struct {

diff --git a/pkg/granted/settings/set.go b/pkg/granted/settings/set.go
@@ -36,6 +36,7 @@ var SetConfigCommand = cli.Command{
 		fieldMap["Keyring.KeychainName"] = keyringFields{&cfg.Keyring.KeychainName}
 		fieldMap["Keyring.FileDir"] = keyringFields{&cfg.Keyring.FileDir}
 		fieldMap["Keyring.LibSecretCollectionName"] = keyringFields{&cfg.Keyring.LibSecretCollectionName}
+		fieldMap["Keyring.PassDir"] = keyringFields{&cfg.Keyring.PassDir}
 
 		fields := make([]string, 0, len(fieldMap))
 		for k := range fieldMap {

diff --git a/pkg/securestorage/securestorage.go b/pkg/securestorage/securestorage.go
@@ -153,6 +153,9 @@ func (s *SecureStorage) openKeyring() (keyring.Keyring, error) {
 		if cfg.Keyring.LibSecretCollectionName != nil {
 			c.LibSecretCollectionName = *cfg.Keyring.LibSecretCollectionName
 		}
+		if cfg.Keyring.PassDir != nil {
+			c.PassDir = *cfg.Keyring.PassDir
+		}
 	}
 
 	k, err := keyring.Open(c)