chore: simplify and cleanup

Signed-off-by: Keith Zantow <keith.zantow@anchore.com>
2026-11-03 16:06:36 +01:00 · 2026-09-22 00:23:36 -04:00
parent 53cd4254e4
commit 47cafae01b
75 changed files with 3128 additions and 8623 deletions
@@ -0,0 +1,135 @@
+package archive
+
+import (
+	"sort"
+	"testing"
+
+	"github.com/bmatcuk/doublestar/v4"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// every pattern shape is checked against matching every path the slow way, since a name-index
+// shortcut that is too eager fails silently by returning fewer files
+func Test_FilesByGlob_agreesWithBruteForce(t *testing.T) {
+	paths := []string{
+		"LICENSE",
+		"go",
+		"go.exe",
+		"gopher.txt",
+		"opt/a.jar",
+		"opt/b.war",
+		"opt/c.rar",
+		"opt/notes.txt",
+		"opt/app/lib/inner.jar",
+		"usr/local/go/bin/go",
+		"usr/lib/libstd-0123456789abcdef.so",
+		"usr/lib/libstd-short.so",
+		"usr/lib/libz.so",
+		"usr/bin/mariadb",
+		"usr/bin/mysql",
+		"usr/bin/postgres",
+		"var/lib/dpkg/status",
+		"var/lib/dpkg/status.d/base",
+		"var/lib/dpkg/status.d/nested/deep",
+		"var/lib/rpm/Packages",
+		"usr/lib/sysimage/rpm/rpmdb.sqlite",
+		"usr/lib/firefox/firefox",
+		"META-INF/MANIFEST.MF",
+		"META-INF/maven/com.example/lib/pom.xml",
+		"META-INF/maven/com.example/lib/pom.properties",
+		"WEB-INF/lib/dep.jar",
+		".hidden.jar",
+		"xyz",
+		"xaz",
+		"lib.so",
+		"log.txt",
+		"mn.txt",
+	}
+
+	entries := make(map[string]string, len(paths))
+	for _, p := range paths {
+		entries[p] = "body of " + p
+	}
+	r := indexOver(t, 1<<20, entries)
+
+	patterns := []string{
+		"**/pom.xml", "**/*.jar", "**/pom*", "**/*", "/*", "/opt/*",
+		"**/{go,go.exe}",
+		"**/libstd-????????????????.so",
+		"**/*.[jw]ar",
+		"**/libstd-*.so",
+		"**/*.?ar",
+		"**/*o*",
+		"**/?o",
+		"**/{a,b}.{jar,war}",
+		"**/{mariadb,mysql}",
+		"**/[lm]*",
+		"**/*.{jar,war}",
+		"**/pom.{xml,properties}",
+		"**/{lib,libz}.so",
+		"**/[a-c]*",
+		"**/libstd-[s0]*.so",
+		"**/x[!y]z",
+		"**/{go,*}",
+		"**/{lib,l}*",
+		"**/{lo,m}*",
+		"**/{*.jar,pom.xml}",
+		"/{META-INF,WEB-INF}/**/*.xml",
+		"/usr/{bin,lib}/*",
+		"/opt/*/lib/*.jar",
+		"/us?/lib/libstd-*.so",
+		"**/lib/**/*.jar",
+		// the name looked up also exists outside the selected directory
+		"/opt/**/*.jar",
+		"/opt/**/lib/*.jar",
+		"/usr/**/go",
+		"/{opt,WEB-INF}/**/*.jar",
+		"/META-INF/**/pom.*",
+		"/usr/**/lib*.so",
+		// alternations whose branches carry separators, as syft's catalogers write them
+		"**/var/lib/dpkg/{status,status.d/**}",
+		"**/var/lib/dpkg/{status,status.d/*}",
+		"**/{var/lib,usr/share,usr/lib/sysimage}/rpm/{Packages,Packages.db,rpmdb.sqlite}",
+		"**/{firefox,firefox.exe}",
+		"**/{java,jvm}/*/release",
+		"**", "**/**", "/**/*.so",
+	}
+
+	for _, pattern := range patterns {
+		t.Run(pattern, func(t *testing.T) {
+			locations, err := r.FilesByGlob(pattern)
+			require.NoError(t, err)
+
+			var got []string
+			for _, loc := range locations {
+				got = append(got, loc.RealPath)
+			}
+			sort.Strings(got)
+
+			assert.Equal(t, bruteForceMatches(t, pattern, paths), got)
+		})
+	}
+}
+
+func bruteForceMatches(t *testing.T, pattern string, paths []string) []string {
+	t.Helper()
+	trimmed := trimArchiveRoot(pattern)
+	var out []string
+	for _, p := range paths {
+		matched, err := doublestar.Match(trimmed, p)
+		require.NoError(t, err)
+		if matched {
+			out = append(out, p)
+		}
+	}
+	sort.Strings(out)
+	return out
+}
+
+func trimArchiveRoot(pattern string) string {
+	for len(pattern) > 0 && pattern[0] == '/' {
+		pattern = pattern[1:]
+	}
+	return pattern
+}