fix: openjdk detection pattern (#1415)

anchore · Dec 20, 2022 · b1d6dae · b1d6dae
1 parent 0f1e8fc
commit b1d6dae
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/syft/pkg/cataloger/binary/cataloger_test.go b/syft/pkg/cataloger/binary/cataloger_test.go
@@ -116,6 +116,20 @@ func TestClassifierCataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:       "positive-java-openjdk-lts",
+			fixtureDir: "test-fixtures/classifiers/positive/openjdk-lts",
+			expected: pkg.Package{
+				Name:      "java",
+				Version:   "11.0.17+8-LTS",
+				Type:      "binary",
+				Locations: singleLocation("java"),
+				Metadata: pkg.BinaryMetadata{
+					Classifier:  "java-binary-openjdk",
+					VirtualPath: "java",
+				},
+			},
+		},
 		{
 			name:       "positive-java-oracle",
 			fixtureDir: "test-fixtures/classifiers/positive/oracle",

diff --git a/syft/pkg/cataloger/binary/default_classifiers.go b/syft/pkg/cataloger/binary/default_classifiers.go
@@ -38,8 +38,9 @@ var defaultClassifiers = []classifier{
 		Class:    "java-binary-openjdk",
 		FileGlob: "**/java",
 		EvidenceMatcher: fileContentsVersionMatcher(
+			// [NUL]openjdk[NUL]java[NUL]0.0[NUL]11.0.17+8-LTS[NUL]
 			// [NUL]openjdk[NUL]java[NUL]1.8[NUL]1.8.0_352-b08[NUL]
-			`(?m)\x00openjdk\x00java\x00(?P<release>[0-9]+[.0-9]+)\x00(?P<version>[0-9]+[-._a-zA-Z0-9]+)\x00`),
+			`(?m)\x00openjdk\x00java\x00(?P<release>[0-9]+[.0-9]*)\x00(?P<version>[0-9]+[^\x00]+)\x00`),
 		Package: "java",
 		// TODO the updates might need to be part of the CPE, like: 1.8.0:update152
 		CPEs: singleCPE("cpe:2.3:a:oracle:openjdk:*:*:*:*:*:*:*:*"),

diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/openjdk-lts/java b/syft/pkg/cataloger/binary/test-fixtures/classifiers/positive/openjdk-lts/java