Use shlex instead of shellquote

danilobuerger · danilobuerger · commit c858af78613e · 2025-03-24T20:21:22.000+01:00
Signed-off-by: Danilo Bürger &lt;danilo.buerger@helsing.ai&gt;
diff --git a/age/keysource.go b/age/keysource.go
@@ -19,7 +19,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/getsops/sops/v3/logging"
-	"github.com/kballard/go-shellquote"
+	"github.com/google/shlex"
 )
 
 const (
@@ -316,13 +316,13 @@ func (key *MasterKey) loadIdentities() (ParsedIdentities, error) {
 	}
 
 	if ageKeyCmd, ok := os.LookupEnv(SopsAgeKeyCmdEnv); ok {
-		args, err := shellquote.Split(ageKeyCmd)
+		args, err := shlex.Split(ageKeyCmd)
 		if err != nil {
-			return nil, fmt.Errorf("failed to parse command %s: %w", ageKeyCmd, err)
+			return nil, fmt.Errorf("failed to parse command %s from %s: %w", ageKeyCmd, SopsAgeKeyCmdEnv, err)
 		}
 		out, err := exec.Command(args[0], args[1:]...).Output()
 		if err != nil {
-			return nil, fmt.Errorf("failed to execute command %s: %w", ageKeyCmd, err)
+			return nil, fmt.Errorf("failed to execute command %s from %s: %w", ageKeyCmd, SopsAgeKeyCmdEnv, err)
 		}
 		readers[SopsAgeKeyCmdEnv] = bytes.NewReader(out)
 	}
diff --git a/go.mod b/go.mod
@@ -1,6 +1,7 @@
 module github.com/getsops/sops/v3
 
-go 1.22
+go 1.23.0
+
 toolchain go1.24.1
 
 require (
@@ -26,7 +27,6 @@ require (
 	github.com/goware/prefixer v0.0.0-20160118172347-395022866408
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/hashicorp/vault/api v1.16.0
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/lib/pq v1.10.9
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/go-wordwrap v1.0.1
diff --git a/go.sum b/go.sum
@@ -205,8 +205,6 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/vault/api v1.16.0 h1:nbEYGJiAPGzT9U4oWgaaB0g+Rj8E59QuHKyA5LhwQN4=
 github.com/hashicorp/vault/api v1.16.0/go.mod h1:KhuUhzOD8lDSk29AtzNjgAu2kxRA9jL9NAbkFlqvkBA=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6 h1:IsMZxCuZqKuao2vNdfD82fjjgPLfyHLpR41Z88viRWs=
 github.com/keybase/go-keychain v0.0.0-20231219164618-57a3676c3af6/go.mod h1:3VeWNIJaW+O5xpRQbPp0Ybqu1vJd/pm7s2F473HRrkw=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"github.com/sirupsen/logrus"`
`20`	`20`
`21`	`21`	`"github.com/getsops/sops/v3/logging"`
`22`		`- "github.com/kballard/go-shellquote"`
	`22`	`+ "github.com/google/shlex"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`const (`
`@@ -316,13 +316,13 @@ func (key *MasterKey) loadIdentities() (ParsedIdentities, error) {`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`if ageKeyCmd, ok := os.LookupEnv(SopsAgeKeyCmdEnv); ok {`
`319`		`- args, err := shellquote.Split(ageKeyCmd)`
	`319`	`+ args, err := shlex.Split(ageKeyCmd)`
`320`	`320`	`if err != nil {`
`321`		`- return nil, fmt.Errorf("failed to parse command %s: %w", ageKeyCmd, err)`
	`321`	`+ return nil, fmt.Errorf("failed to parse command %s from %s: %w", ageKeyCmd, SopsAgeKeyCmdEnv, err)`
`322`	`322`	`}`
`323`	`323`	`out, err := exec.Command(args[0], args[1:]...).Output()`
`324`	`324`	`if err != nil {`
`325`		`- return nil, fmt.Errorf("failed to execute command %s: %w", ageKeyCmd, err)`
	`325`	`+ return nil, fmt.Errorf("failed to execute command %s from %s: %w", ageKeyCmd, SopsAgeKeyCmdEnv, err)`
`326`	`326`	`}`
`327`	`327`	`readers[SopsAgeKeyCmdEnv] = bytes.NewReader(out)`
`328`	`328`	`}`