From f9942101176ddebda875f906ca844e1a22ead34b Mon Sep 17 00:00:00 2001 From: lan-yonghui Date: Sun, 8 Nov 2026 12:08:42 +0800 Subject: [PATCH] fix: prevent tar option injection --- agent/utils/files/tar.go | 2 +- agent/utils/files/tar_gz.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/utils/files/tar.go b/agent/utils/files/tar.go index bb6508420..97d79b3b2 100644 --- a/agent/utils/files/tar.go +++ b/agent/utils/files/tar.go @@ -43,7 +43,7 @@ func (t TarArchiver) Compress(ctx context.Context, sourcePaths []string, dstFile return err } baseDir := filepath.Dir(sourcePaths[0]) - args := []string{t.getOptionStr("compress"), dstFile, "-C", baseDir} + args := []string{t.getOptionStr("compress"), dstFile, "-C", baseDir, "--"} for _, sourcePath := range sourcePaths { args = append(args, filepath.Base(sourcePath)) } diff --git a/agent/utils/files/tar_gz.go b/agent/utils/files/tar_gz.go index 4f4ed3e71..46894d188 100644 --- a/agent/utils/files/tar_gz.go +++ b/agent/utils/files/tar_gz.go @@ -55,9 +55,9 @@ func (t TarGzArchiver) Compress(ctx context.Context, sourcePaths []string, dstFi aheadDir = "/" } if len(secret) != 0 { - err = runTarGzEncryptToFile(cmd.NewCommandMgr(cmd.WithContext(ctx)), tmpFile, secret, append([]string{"-C", aheadDir}, itemDirs...)...) + err = runTarGzEncryptToFile(cmd.NewCommandMgr(cmd.WithContext(ctx)), tmpFile, secret, append([]string{"-C", aheadDir, "--"}, itemDirs...)...) } else { - err = runTarGzToFile(cmd.NewCommandMgr(cmd.WithContext(ctx)), tmpFile, append([]string{"-C", aheadDir}, itemDirs...)...) + err = runTarGzToFile(cmd.NewCommandMgr(cmd.WithContext(ctx)), tmpFile, append([]string{"-C", aheadDir, "--"}, itemDirs...)...) } if err != nil { return err