Skip to content

Commit 5ebb311

Browse files
committed
chore: Expanding lll coverage to vfs
1 parent f1b83f8 commit 5ebb311

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ linters:
114114
# trying to get this merged in.
115115
- linters:
116116
- lll
117-
path-except: '^(internal/awshelper/|internal/cas/|internal/cli/commands/(backend/(delete|migrate)|catalog/tui/command|exec|find|help|list|stack)/|internal/cloner/|internal/configbridge/|internal/engine/|internal/errorconfig/|internal/errors/|internal/experiment/|internal/gcphelper/|internal/git/|internal/prepare/|internal/runner/(common|graph|run/creds/providers/(amazonsts|externalcmd))/|internal/stacks/(generate|output)/|internal/tf/cache/(controllers|middleware)/|internal/tips/|pkg/log/(format/placeholders|writer)/)'
117+
path-except: '^(internal/awshelper/|internal/cas/|internal/cli/commands/(backend/(delete|migrate)|catalog/tui/command|exec|find|help|list|stack)/|internal/cloner/|internal/configbridge/|internal/engine/|internal/errorconfig/|internal/errors/|internal/experiment/|internal/gcphelper/|internal/git/|internal/prepare/|internal/runner/(common|graph|run/creds/providers/(amazonsts|externalcmd))/|internal/stacks/(generate|output)/|internal/tf/cache/(controllers|middleware)/|internal/tips/|internal/vfs/|pkg/log/(format/placeholders|writer)/)'
118118
paths:
119119
- docs
120120
- _ci

internal/vfs/vfs.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,9 @@ func (z *ZipDecompressor) Unzip(l log.Logger, fs FS, dst, src string, umask os.F
418418
}
419419

420420
// extractZipFile extracts a single file from a zip archive.
421-
func (z *ZipDecompressor) extractZipFile(l log.Logger, fs FS, dst string, zipFile *zip.File, umask os.FileMode, totalSize *int64) error {
421+
func (z *ZipDecompressor) extractZipFile(
422+
l log.Logger, fs FS, dst string, zipFile *zip.File, umask os.FileMode, totalSize *int64,
423+
) error {
422424
destPath, err := sanitizeZipPath(dst, zipFile.Name)
423425
if err != nil {
424426
return err

internal/vfs/vfs_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,9 @@ func TestUnzipSymlinkEscape(t *testing.T) {
707707
dstPath := filepath.Join(tempDir, "dst")
708708

709709
// Create symlink pointing outside destination with ..
710-
zipData := createZipArchiveWithSymlink(t, "target.txt", []byte("target content"), "evil_link.txt", "../../../etc/passwd")
710+
zipData := createZipArchiveWithSymlink(
711+
t, "target.txt", []byte("target content"), "evil_link.txt", "../../../etc/passwd",
712+
)
711713
require.NoError(t, vfs.WriteFile(fs, zipPath, zipData, 0644))
712714

713715
err := vfs.NewZipDecompressor().Unzip(l, fs, dstPath, zipPath, 0)
@@ -1059,7 +1061,9 @@ func createZipArchiveWithMode(t *testing.T, name string, content []byte, mode os
10591061
}
10601062

10611063
// createZipArchiveWithSymlink creates a zip archive with a regular file and a symlink to it.
1062-
func createZipArchiveWithSymlink(t *testing.T, targetName string, targetContent []byte, linkName, linkTarget string) []byte {
1064+
func createZipArchiveWithSymlink(
1065+
t *testing.T, targetName string, targetContent []byte, linkName, linkTarget string,
1066+
) []byte {
10631067
t.Helper()
10641068

10651069
var buf bytes.Buffer

0 commit comments

Comments
 (0)