fix(license): fix license normalization for Universal Permissive Lice…

…nse (#7766)
aquasecurity · Oct 21, 2024 · f6acdf7 · f6acdf7
1 parent 57e24aa
commit f6acdf7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/licensing/normalize.go b/pkg/licensing/normalize.go
@@ -626,7 +626,7 @@ func TrimLicenseText(text string) string {
 }
 
 // version number match
-var versionRegexpString = "([A-UW-Z)]{2,})( LICENSE)?\\s*[,(-]?\\s*(V|V\\.|VER|VER\\.|VERSION|VERSION-|-)?\\s*([1-9](\\.\\d)*)[)]?"
+var versionRegexpString = "([A-UW-Z)])( LICENSE)?\\s*[,(-]?\\s*(V|V\\.|VER|VER\\.|VERSION|VERSION-|-)?\\s*([1-9](\\.\\d)*)[)]?"
 
 // case insensitive version match anywhere in string
 var versionRegexp = regexp.MustCompile("(?i)" + versionRegexpString)

diff --git a/pkg/licensing/normalize_test.go b/pkg/licensing/normalize_test.go
@@ -209,6 +209,13 @@ func TestNormalize(t *testing.T) {
 			normalized:    " The unmapped license ",
 			normalizedKey: " The unmapped license ",
 		},
+		{
+			licenses: []string{
+				"Universal Permissive License, Version 1.0",
+			},
+			normalized:    "UPL-1.0",
+			normalizedKey: "UPL-1.0",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.normalized, func(t *testing.T) {