fix detecting unbalanced quotes (fixes #225)

Author: sni

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/shirou/gopsutil/v4 v4.25.3
 	github.com/sni/check_http_go/pkg/checkhttp v0.0.0-20250317143157-caa67455f3bb
 	github.com/sni/go-flags v0.0.0-20241025124417-5e271e4d4cc9
-	github.com/sni/shelltoken v0.0.0-20241125181525-84152f22ccd3
+	github.com/sni/shelltoken v0.0.0-20250505124910-1de4f4c2c936
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
 	github.com/stretchr/testify v1.10.0

go.sum

@@ -96,8 +96,8 @@ github.com/sni/check_http_go/pkg/checkhttp v0.0.0-20250317143157-caa67455f3bb h1
 github.com/sni/check_http_go/pkg/checkhttp v0.0.0-20250317143157-caa67455f3bb/go.mod h1:Ja52a8d0K4032zY9tOXLcIh2E0e/NprRnl7nXJjebI0=
 github.com/sni/go-flags v0.0.0-20241025124417-5e271e4d4cc9 h1:UDgM4SP5Fd2PKVRdeUFlA/WRNHkvMNeIx0Nmw7sn21k=
 github.com/sni/go-flags v0.0.0-20241025124417-5e271e4d4cc9/go.mod h1:VXyAUYIG8zcjjzf5DO9KlhWTStq/PQZTZfbgW93GOPg=
-github.com/sni/shelltoken v0.0.0-20241125181525-84152f22ccd3 h1:ewNzm/u2121rlYTFpmieP6oFWOzF19nBbRzBGg+Lcc0=
-github.com/sni/shelltoken v0.0.0-20241125181525-84152f22ccd3/go.mod h1:49JJKFONnNNVv6h4WVK54oXj4KC+laTyzC0qXdAiUPw=
+github.com/sni/shelltoken v0.0.0-20250505124910-1de4f4c2c936 h1:q7RpM2D0LMUVscxJdthSIkw4E+OzBq/tYtSJpwnyjV0=
+github.com/sni/shelltoken v0.0.0-20250505124910-1de4f4c2c936/go.mod h1:+l+z+QVOUPYcXdCDwMU7+xUbVaZ7nq0EihwadTJM2gM=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=

pkg/utils/utils.go

@@ -8,6 +8,7 @@ import (
 	"crypto/sha512"
 	"crypto/tls"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"hash"
 	"io"
@@ -27,6 +28,7 @@ import (
 
 	"github.com/consol-monitoring/snclient/pkg/convert"
 	"github.com/kdar/factorlog"
+	st "github.com/sni/shelltoken"
 )
 
 var reMountPassword = regexp.MustCompile(`//.*:.*@`)
@@ -298,22 +300,25 @@ func TrimQuotesList(list []string) (res []string, err error) {
 // TrimQuotes returns string with quotes removed
 func TrimQuotes(str string) (res string, err error) {
 	switch {
-	case strings.HasPrefix(str, "'"):
-		if !strings.HasSuffix(str, "'") || len(str) == 1 {
-			return "", fmt.Errorf("unbalanced quotes in '%s'", str)
+	case strings.HasPrefix(str, "'"),
+		strings.HasSuffix(str, "'"),
+		strings.HasPrefix(str, `"`),
+		strings.HasSuffix(str, `"`):
+		_, err = st.SplitQuotes(str, st.Whitespace, st.SplitKeepAll)
+		if err != nil && errors.Is(err, &st.UnbalancedQuotesError{}) {
+			return str, fmt.Errorf("unbalanced quotes in '%s'", str)
 		}
 		str = strings.TrimPrefix(str, "'")
 		str = strings.TrimSuffix(str, "'")
-	case strings.HasPrefix(str, `"`):
-		if !strings.HasSuffix(str, `"`) || len(str) == 1 {
-			return "", fmt.Errorf("unbalanced quotes in '%s'", str)
-		}
+	}
+
+	switch {
+	case strings.HasPrefix(str, "'") && strings.HasSuffix(str, "'") && len(str) >= 2:
+		str = strings.TrimPrefix(str, "'")
+		str = strings.TrimSuffix(str, "'")
+	case strings.HasPrefix(str, `"`) && strings.HasSuffix(str, `"`) && len(str) >= 2:
 		str = strings.TrimPrefix(str, `"`)
 		str = strings.TrimSuffix(str, `"`)
-	case strings.HasSuffix(str, "'"):
-		return "", fmt.Errorf("unbalanced quotes in '%s'", str)
-	case strings.HasSuffix(str, `"`):
-		return "", fmt.Errorf("unbalanced quotes in '%s'", str)
 	}
 
 	return str, nil