Perform case insensitive matching in GlobMatch

Signed-off-by: Colm O hEigeartaigh <coheigea@apache.org>
anchore · Oct 17, 2023 · 8f09379 · 8f09379
1 parent 144ed72
commit 8f09379
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/internal/file/zip_file_manifest.go b/internal/file/zip_file_manifest.go
@@ -38,7 +38,7 @@ func (z ZipFileManifest) Add(entry string, info os.FileInfo) {
 	z[entry] = info
 }
 
-// GlobMatch returns the path keys that match the given value(s).
+// GlobMatch returns the path keys that match the given value(s). Performs case insensitive matching
 func (z ZipFileManifest) GlobMatch(patterns ...string) []string {
 	uniqueMatches := internal.NewStringSet()
 
@@ -48,7 +48,7 @@ func (z ZipFileManifest) GlobMatch(patterns ...string) []string {
 			// so that glob logic is consistent inside and outside of ZIP archives
 			normalizedEntry := normalizeZipEntryName(entry)
 
-			if GlobMatch(pattern, normalizedEntry) {
+			if GlobMatch(strings.ToLower(pattern), normalizedEntry) {
 				uniqueMatches.Add(entry)
 			}
 		}
@@ -63,8 +63,8 @@ func (z ZipFileManifest) GlobMatch(patterns ...string) []string {
 // normalizeZipEntryName takes the given path entry and ensures it is prefixed with "/".
 func normalizeZipEntryName(entry string) string {
 	if !strings.HasPrefix(entry, "/") {
-		return "/" + entry
+		return strings.ToLower("/" + entry)
 	}
 
-	return entry
+	return strings.ToLower(entry)
 }
diff --git a/internal/file/zip_file_manifest_test.go b/internal/file/zip_file_manifest_test.go
@@ -116,6 +116,14 @@ func TestZipFileManifest_GlobMatch(t *testing.T) {
 			"*/a-file.txt",
 			"some-dir/a-file.txt",
 		},
+		{
+			"*/A-file.txt",
+			"some-dir/a-file.txt",
+		},
+		{
+			"*/a-file.txt",
+			"some-dir/A-file.txt",
+		},
 		{
 			"**/*.zip",
 			"nested.zip",

diff --git a/internal/licenses/list.go b/internal/licenses/list.go
@@ -19,7 +19,6 @@ var (
 		"LICENSE",
 		"LICENSE.md",
 		"LICENSE.markdown",
-		"license.txt",
 		"LICENSE.txt",
 		"LICENSE-2.0.txt",
 		"LICENCE-2.0.txt",