From 89903672a75f0c4dde09f72008604a51ab5c0b2f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 26 Jun 2024 02:08:00 +0200 Subject: [PATCH] pkg/archive: reformat code to make #nosec comment work again Looks like the way it picks up #nosec comments changed, causing the linter error to re-appear; pkg/archive/archive_linux.go:57:17: G305: File traversal when extracting zip/tar archive (gosec) Name: filepath.Join(hdr.Name, WhiteoutOpaqueDir), ^ Signed-off-by: Sebastiaan van Stijn (cherry picked from commit d4160d5aa75100eba75a6099f376ffdf9087e480) Signed-off-by: Austin Vazquez --- pkg/archive/archive_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/archive/archive_linux.go b/pkg/archive/archive_linux.go index 2c3786cd50..40d4750859 100644 --- a/pkg/archive/archive_linux.go +++ b/pkg/archive/archive_linux.go @@ -48,7 +48,7 @@ func (overlayWhiteoutConverter) ConvertWrite(hdr *tar.Header, path string, fi os wo = &tar.Header{ Typeflag: tar.TypeReg, Mode: hdr.Mode & int64(os.ModePerm), - Name: filepath.Join(hdr.Name, WhiteoutOpaqueDir), + Name: filepath.Join(hdr.Name, WhiteoutOpaqueDir), // #nosec G305 -- An archive is being created, not extracted. Size: 0, Uid: hdr.Uid, Uname: hdr.Uname, @@ -56,7 +56,7 @@ func (overlayWhiteoutConverter) ConvertWrite(hdr *tar.Header, path string, fi os Gname: hdr.Gname, AccessTime: hdr.AccessTime, ChangeTime: hdr.ChangeTime, - } //#nosec G305 -- An archive is being created, not extracted. + } } }