fix: Restore user args to keepassxc-cli in cache password mode

twpayne · Jan 12, 2024 · 85464dd · 85464dd
1 parent 9437b62
commit 85464dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/internal/cmd/keepassxctemplatefuncs.go b/internal/cmd/keepassxctemplatefuncs.go
@@ -157,7 +157,10 @@ func (c *Config) keepassxcOutput(command string, args ...string) ([]byte, error)
 // keepassxcOutputCachePassword returns the output of command and args,
 // prompting the user for the password and caching it for later use.
 func (c *Config) keepassxcOutputCachePassword(command string, args ...string) ([]byte, error) {
-	cmdArgs := append([]string{command, c.Keepassxc.Database.String()}, args...)
+	cmdArgs := []string{command}
+	cmdArgs = append(cmdArgs, c.Keepassxc.Args...)
+	cmdArgs = append(cmdArgs, c.Keepassxc.Database.String())
+	cmdArgs = append(cmdArgs, args...)
 	cmd := exec.Command(c.Keepassxc.Command, cmdArgs...) //nolint:gosec
 	if c.Keepassxc.password == "" && c.Keepassxc.Prompt {
 		password, err := c.readPassword(fmt.Sprintf("Enter password to unlock %s: ", c.Keepassxc.Database))

diff --git a/internal/cmd/testdata/scripts/keepassxc.txtar b/internal/cmd/testdata/scripts/keepassxc.txtar
@@ -23,10 +23,10 @@ case "$*" in
 "--version")
     echo "2.7.0"
     ;;
-"attachment-export /secrets.kdbx --quiet --stdout example.com attachment")
+"attachment-export --key-file /secrets.key /secrets.kdbx --quiet --stdout example.com attachment")
     echo "# contents of attachment"
     ;;
-"show /secrets.kdbx --quiet --show-protected example.com")
+"show --key-file /secrets.key /secrets.kdbx --quiet --show-protected example.com")
     cat <<EOF
 Title: example.com
 UserName: examplelogin
@@ -35,7 +35,7 @@ URL:
 Notes:
 EOF
     ;;
-"show /secrets.kdbx example.com --attributes host-name --quiet --show-protected")
+"show --key-file /secrets.key /secrets.kdbx example.com --attributes host-name --quiet --show-protected")
     echo "example.com"
     ;;
 *)
@@ -46,22 +46,23 @@ esac
 @echo off
 IF "%*" == "--version" (
     echo 2.7.0
-) ELSE IF "%*" == "attachment-export C:/secrets.kdbx --quiet --stdout example.com attachment" (
+) ELSE IF "%*" == "attachment-export --key-file /secrets.key C:/secrets.kdbx --quiet --stdout example.com attachment" (
     echo.# contents of attachment
-) ELSE IF "%*" == "show C:/secrets.kdbx --quiet --show-protected example.com" (
+) ELSE IF "%*" == "show --key-file /secrets.key C:/secrets.kdbx --quiet --show-protected example.com" (
     echo.Title: example.com
     echo.UserName: examplelogin
     echo.Password: examplepassword
     echo.URL:
     echo.Notes:
-) ELSE IF "%*" == "show C:/secrets.kdbx example.com --attributes host-name --quiet --show-protected" (
+) ELSE IF "%*" == "show --key-file /secrets.key C:/secrets.kdbx example.com --attributes host-name --quiet --show-protected" (
     echo.example.com
 ) ELSE (
     echo keepass-test: invalid command: %*
     exit /b 1
 )
 -- home/user/.config/chezmoi/chezmoi.toml --
 [keepassxc]
+    args = ["--key-file", "/secrets.key"]
     database = "/secrets.kdbx"
 -- home/user/input --
 fakepassword