mirror of
https://github.com/anchore/syft.git
synced 2026-06-10 06:18:24 +02:00
* chore(deps): bump the go-minor-patch group across 2 directories with 14 updates Bumps the go-minor-patch group with 9 updates in the / directory: | Package | From | To | | --- | --- | --- | | [github.com/CycloneDX/cyclonedx-go](https://github.com/CycloneDX/cyclonedx-go) | `0.10.0` | `0.11.0` | | [github.com/Masterminds/semver/v3](https://github.com/Masterminds/semver) | `3.4.0` | `3.5.0` | | [github.com/diskfs/go-diskfs](https://github.com/diskfs/go-diskfs) | `1.7.0` | `1.9.3` | | [github.com/github/go-spdx/v2](https://github.com/github/go-spdx) | `2.4.0` | `2.7.0` | | [github.com/google/go-containerregistry](https://github.com/google/go-containerregistry) | `0.21.5` | `0.21.6` | | [github.com/gookit/color](https://github.com/gookit/color) | `1.6.0` | `1.6.1` | | [github.com/invopop/jsonschema](https://github.com/invopop/jsonschema) | `0.13.0` | `0.14.0` | | [github.com/jedib0t/go-pretty/v6](https://github.com/jedib0t/go-pretty) | `6.7.8` | `6.7.10` | | [modernc.org/sqlite](https://gitlab.com/cznic/sqlite) | `1.46.2` | `1.50.1` | Bumps the go-minor-patch group with 1 update in the /.make directory: [github.com/anchore/go-make](https://github.com/anchore/go-make). Updates `github.com/CycloneDX/cyclonedx-go` from 0.10.0 to 0.11.0 - [Release notes](https://github.com/CycloneDX/cyclonedx-go/releases) - [Commits](https://github.com/CycloneDX/cyclonedx-go/compare/v0.10.0...v0.11.0) Updates `github.com/Masterminds/semver/v3` from 3.4.0 to 3.5.0 - [Release notes](https://github.com/Masterminds/semver/releases) - [Changelog](https://github.com/Masterminds/semver/blob/master/CHANGELOG.md) - [Commits](https://github.com/Masterminds/semver/compare/v3.4.0...v3.5.0) Updates `github.com/diskfs/go-diskfs` from 1.7.0 to 1.9.3 - [Commits](https://github.com/diskfs/go-diskfs/compare/v1.7.0...v1.9.3) Updates `github.com/github/go-spdx/v2` from 2.4.0 to 2.7.0 - [Release notes](https://github.com/github/go-spdx/releases) - [Commits](https://github.com/github/go-spdx/compare/v2.4.0...v2.7.0) Updates `github.com/google/go-containerregistry` from 0.21.5 to 0.21.6 - [Release notes](https://github.com/google/go-containerregistry/releases) - [Commits](https://github.com/google/go-containerregistry/compare/v0.21.5...v0.21.6) Updates `github.com/gookit/color` from 1.6.0 to 1.6.1 - [Release notes](https://github.com/gookit/color/releases) - [Commits](https://github.com/gookit/color/compare/v1.6.0...v1.6.1) Updates `github.com/invopop/jsonschema` from 0.13.0 to 0.14.0 - [Release notes](https://github.com/invopop/jsonschema/releases) - [Commits](https://github.com/invopop/jsonschema/compare/v0.13.0...v0.14.0) Updates `github.com/jedib0t/go-pretty/v6` from 6.7.8 to 6.7.10 - [Release notes](https://github.com/jedib0t/go-pretty/releases) - [Commits](https://github.com/jedib0t/go-pretty/compare/v6.7.8...v6.7.10) Updates `github.com/klauspost/compress` from 1.18.5 to 1.18.6 - [Release notes](https://github.com/klauspost/compress/releases) - [Commits](https://github.com/klauspost/compress/compare/v1.18.5...v1.18.6) Updates `golang.org/x/mod` from 0.35.0 to 0.36.0 - [Commits](https://github.com/golang/mod/compare/v0.35.0...v0.36.0) Updates `golang.org/x/net` from 0.53.0 to 0.54.0 - [Commits](https://github.com/golang/net/compare/v0.53.0...v0.54.0) Updates `golang.org/x/tools` from 0.44.0 to 0.45.0 - [Release notes](https://github.com/golang/tools/releases) - [Commits](https://github.com/golang/tools/compare/v0.44.0...v0.45.0) Updates `modernc.org/sqlite` from 1.46.2 to 1.50.1 - [Changelog](https://gitlab.com/cznic/sqlite/blob/master/CHANGELOG.md) - [Commits](https://gitlab.com/cznic/sqlite/compare/v1.46.2...v1.50.1) Updates `github.com/anchore/go-make` from 0.4.0 to 0.5.0 - [Release notes](https://github.com/anchore/go-make/releases) - [Commits](https://github.com/anchore/go-make/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: github.com/CycloneDX/cyclonedx-go dependency-version: 0.11.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch - dependency-name: github.com/Masterminds/semver/v3 dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch - dependency-name: github.com/diskfs/go-diskfs dependency-version: 1.9.3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch - dependency-name: github.com/github/go-spdx/v2 dependency-version: 2.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch - dependency-name: github.com/google/go-containerregistry dependency-version: 0.21.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-minor-patch - dependency-name: github.com/gookit/color dependency-version: 1.6.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-minor-patch - dependency-name: github.com/invopop/jsonschema dependency-version: 0.14.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch - dependency-name: github.com/jedib0t/go-pretty/v6 dependency-version: 6.7.10 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-minor-patch - dependency-name: github.com/klauspost/compress dependency-version: 1.18.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go-minor-patch - dependency-name: golang.org/x/mod dependency-version: 0.36.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch - dependency-name: golang.org/x/net dependency-version: 0.54.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch - dependency-name: golang.org/x/tools dependency-version: 0.45.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch - dependency-name: modernc.org/sqlite dependency-version: 1.50.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch - dependency-name: github.com/anchore/go-make dependency-version: 0.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go-minor-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com> * fix: update signatures to return fs.FileInfo after breaking changes Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com> * fix: lint-fix Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com> Co-authored-by: Christopher Phillips <32073428+spiffcs@users.noreply.github.com>
251 lines
6.1 KiB
Go
251 lines
6.1 KiB
Go
package file
|
|
|
|
import (
|
|
"io/fs"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/diskfs/go-diskfs/backend/file"
|
|
"github.com/diskfs/go-diskfs/filesystem"
|
|
"github.com/diskfs/go-diskfs/filesystem/squashfs"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func createTestFS(t *testing.T) filesystem.FileSystem {
|
|
dir := t.TempDir()
|
|
|
|
filename := "test.squashfs"
|
|
f, err := os.Create(filepath.Join(dir, filename))
|
|
require.NoError(t, err)
|
|
|
|
b := file.New(f, false)
|
|
fsys, err := squashfs.Create(b, 0, 0, 4096)
|
|
require.NoError(t, err)
|
|
|
|
testFiles := []struct {
|
|
path string
|
|
content string
|
|
isDir bool
|
|
}{
|
|
{"/file1.txt", "content of file1", false},
|
|
{"/file2.txt", "content of file2", false},
|
|
{"/dir1", "", true},
|
|
{"/dir1/subfile1.txt", "content of subfile1", false},
|
|
{"/dir1/subfile2.txt", "content of subfile2", false},
|
|
{"/dir1/subdir1", "", true},
|
|
{"/dir1/subdir1/deepfile.txt", "deep content", false},
|
|
{"/dir2", "", true},
|
|
{"/dir2/anotherfile.txt", "another content", false},
|
|
{"/emptydir", "", true},
|
|
}
|
|
|
|
for _, tf := range testFiles {
|
|
if tf.isDir {
|
|
err := fsys.Mkdir(ToFSPath(tf.path))
|
|
require.NoError(t, err)
|
|
} else {
|
|
f, err := fsys.OpenFile(ToFSPath(tf.path), os.O_CREATE|os.O_RDWR)
|
|
require.NoError(t, err)
|
|
_, err = f.Write([]byte(tf.content))
|
|
require.NoError(t, err)
|
|
f.Close()
|
|
}
|
|
}
|
|
|
|
return fsys
|
|
}
|
|
|
|
func TestWalkDiskDir_CompleteTraversal(t *testing.T) {
|
|
fsys := createTestFS(t)
|
|
|
|
var visitedPaths []string
|
|
err := WalkDiskDir(fsys, "/", func(fsys filesystem.FileSystem, path string, d os.FileInfo, err error) error {
|
|
require.NoError(t, err)
|
|
visitedPaths = append(visitedPaths, path)
|
|
return nil
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
|
|
expectedPaths := []string{
|
|
"/file1.txt",
|
|
"/file2.txt",
|
|
"/dir1",
|
|
"/dir1/subfile1.txt",
|
|
"/dir1/subfile2.txt",
|
|
"/dir1/subdir1",
|
|
"/dir1/subdir1/deepfile.txt",
|
|
"/dir2",
|
|
"/dir2/anotherfile.txt",
|
|
"/emptydir",
|
|
}
|
|
|
|
assert.ElementsMatch(t, expectedPaths, visitedPaths)
|
|
}
|
|
|
|
func TestWalkDiskDir_FileInfoCorrect(t *testing.T) {
|
|
fsys := createTestFS(t)
|
|
|
|
var fileInfos []struct {
|
|
path string
|
|
isDir bool
|
|
name string
|
|
}
|
|
|
|
err := WalkDiskDir(fsys, "/", func(fsys filesystem.FileSystem, path string, d os.FileInfo, err error) error {
|
|
require.NoError(t, err)
|
|
require.NotNil(t, d)
|
|
fileInfos = append(fileInfos, struct {
|
|
path string
|
|
isDir bool
|
|
name string
|
|
}{
|
|
path: path,
|
|
isDir: d.IsDir(),
|
|
name: d.Name(),
|
|
})
|
|
return nil
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
|
|
for _, fi := range fileInfos {
|
|
expectedName := filepath.Base(fi.path)
|
|
assert.Equal(t, expectedName, fi.name)
|
|
|
|
if fi.path == "/dir1" || fi.path == "/dir2" || fi.path == "/emptydir" || fi.path == "/dir1/subdir1" {
|
|
assert.True(t, fi.isDir, "Expected %s to be directory", fi.path)
|
|
} else {
|
|
assert.False(t, fi.isDir, "Expected %s to be file", fi.path)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestWalkDiskDir_SkipDir(t *testing.T) {
|
|
fsys := createTestFS(t)
|
|
|
|
var visitedPaths []string
|
|
err := WalkDiskDir(fsys, "/", func(fsys filesystem.FileSystem, path string, d os.FileInfo, err error) error {
|
|
require.NoError(t, err)
|
|
visitedPaths = append(visitedPaths, path)
|
|
if path == "/dir1" {
|
|
return fs.SkipDir
|
|
}
|
|
return nil
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
|
|
assert.Contains(t, visitedPaths, "/dir1")
|
|
assert.NotContains(t, visitedPaths, "/dir1/subfile1.txt")
|
|
assert.NotContains(t, visitedPaths, "/dir1/subfile2.txt")
|
|
assert.NotContains(t, visitedPaths, "/dir1/subdir1")
|
|
assert.NotContains(t, visitedPaths, "/dir1/subdir1/deepfile.txt")
|
|
|
|
assert.Contains(t, visitedPaths, "/dir2")
|
|
assert.Contains(t, visitedPaths, "/dir2/anotherfile.txt")
|
|
}
|
|
|
|
func TestWalkDiskDir_SkipAll(t *testing.T) {
|
|
fsys := createTestFS(t)
|
|
|
|
var visitedPaths []string
|
|
err := WalkDiskDir(fsys, "/", func(fsys filesystem.FileSystem, path string, d os.FileInfo, err error) error {
|
|
require.NoError(t, err)
|
|
visitedPaths = append(visitedPaths, path)
|
|
if path == "/dir1" {
|
|
return fs.SkipAll
|
|
}
|
|
return nil
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
|
|
assert.Contains(t, visitedPaths, "/dir1")
|
|
|
|
assert.NotContains(t, visitedPaths, "/file1.txt")
|
|
assert.NotContains(t, visitedPaths, "/file2.txt")
|
|
assert.NotContains(t, visitedPaths, "/dir1/subfile1.txt")
|
|
assert.NotContains(t, visitedPaths, "/dir2")
|
|
assert.NotContains(t, visitedPaths, "/dir2/anotherfile.txt")
|
|
assert.NotContains(t, visitedPaths, "/emptydir")
|
|
}
|
|
|
|
func TestWalkDiskDir_EmptyDirectory(t *testing.T) {
|
|
fs := createTestFS(t)
|
|
|
|
var visitedPaths []string
|
|
err := WalkDiskDir(fs, "/emptydir", func(fsys filesystem.FileSystem, path string, d os.FileInfo, err error) error {
|
|
require.NoError(t, err)
|
|
visitedPaths = append(visitedPaths, path)
|
|
return nil
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
assert.Empty(t, visitedPaths)
|
|
}
|
|
|
|
func TestWalkDiskDir_NonexistentPath(t *testing.T) {
|
|
fs := createTestFS(t)
|
|
|
|
err := WalkDiskDir(fs, "/nonexistent", func(fsys filesystem.FileSystem, path string, d os.FileInfo, err error) error {
|
|
return nil
|
|
})
|
|
|
|
assert.Error(t, err)
|
|
}
|
|
|
|
func TestWalkDiskDir_WalkFunctionError(t *testing.T) {
|
|
fs := createTestFS(t)
|
|
|
|
customErr := assert.AnError
|
|
err := WalkDiskDir(fs, "/", func(fsys filesystem.FileSystem, path string, d os.FileInfo, err error) error {
|
|
if path == "/file1.txt" {
|
|
return customErr
|
|
}
|
|
return nil
|
|
})
|
|
|
|
assert.Error(t, err)
|
|
assert.Equal(t, customErr, err)
|
|
}
|
|
|
|
func TestWalkDiskDir_SubdirectoryTraversal(t *testing.T) {
|
|
fs := createTestFS(t)
|
|
|
|
var visitedPaths []string
|
|
err := WalkDiskDir(fs, "/dir1", func(fsys filesystem.FileSystem, path string, d os.FileInfo, err error) error {
|
|
require.NoError(t, err)
|
|
visitedPaths = append(visitedPaths, path)
|
|
return nil
|
|
})
|
|
|
|
require.NoError(t, err)
|
|
|
|
expectedPaths := []string{
|
|
"/dir1/subfile1.txt",
|
|
"/dir1/subfile2.txt",
|
|
"/dir1/subdir1",
|
|
"/dir1/subdir1/deepfile.txt",
|
|
}
|
|
|
|
assert.ElementsMatch(t, expectedPaths, visitedPaths)
|
|
}
|
|
|
|
func TestWalkDiskDir_SingleFile(t *testing.T) {
|
|
fs := createTestFS(t)
|
|
|
|
var visitedPaths []string
|
|
err := WalkDiskDir(fs, "/file1.txt", func(fsys filesystem.FileSystem, path string, d os.FileInfo, err error) error {
|
|
require.NoError(t, err)
|
|
visitedPaths = append(visitedPaths, path)
|
|
return nil
|
|
})
|
|
|
|
// we are providing a file path, not a directory
|
|
require.Error(t, err)
|
|
assert.Empty(t, visitedPaths)
|
|
}
|