From 99d9916e3ae0e26822869382364925c272d2e125 Mon Sep 17 00:00:00 2001
From: Laurent Goderre <laurent.goderre@docker.com>
Date: Wed, 10 Apr 2024 11:13:32 -0400
Subject: [PATCH] Fix binary character in java version

Fixes #2750
---
 .../binary/classifier_cataloger_test.go       |  22 ++++++++++++++++++
 syft/pkg/cataloger/binary/classifiers.go      |   2 +-
 .../11.0.22/linux-arm64/java                  | Bin 0 -> 345 bytes
 .../11.0.22/linux-amd64/java                  | Bin 0 -> 345 bytes
 .../binary/test-fixtures/config.yaml          |  16 +++++++++++++
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/java-jre-openjdk-arm64-eclipse/11.0.22/linux-arm64/java
 create mode 100644 syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/java-jre-openjdk-eclipse/11.0.22/linux-amd64/java

diff --git a/syft/pkg/cataloger/binary/classifier_cataloger_test.go b/syft/pkg/cataloger/binary/classifier_cataloger_test.go
index 669a4ae9721..85f9be6af47 100644
--- a/syft/pkg/cataloger/binary/classifier_cataloger_test.go
+++ b/syft/pkg/cataloger/binary/classifier_cataloger_test.go
@@ -627,6 +627,28 @@ func Test_Cataloger_PositiveCases(t *testing.T) {
 				Metadata:  metadata("java-binary-openjdk", "java"),
 			},
 		},
+		{
+			logicalFixture: "java-jre-openjdk-eclipse/11.0.22/linux-amd64",
+			expected: pkg.Package{
+				Name:      "java/jre",
+				Version:   "11.0.22+7",
+				Type:      "binary",
+				PURL:      "pkg:generic/java/jre@11.0.22%2B7",
+				Locations: locations("java"),
+				Metadata:  metadata("java-binary-oracle", "java"),
+			},
+		},
+		{
+			logicalFixture: "java-jre-openjdk-arm64-eclipse/11.0.22/linux-arm64",
+			expected: pkg.Package{
+				Name:      "java/jre",
+				Version:   "11.0.22+7",
+				Type:      "binary",
+				PURL:      "pkg:generic/java/jre@11.0.22%2B7",
+				Locations: locations("java"),
+				Metadata:  metadata("java-binary-oracle", "java"),
+			},
+		},
 		{
 			logicalFixture: "java-graal-openjdk/17.0.3+7-jvmci-22.1-b06/linux-amd64",
 			expected: pkg.Package{
diff --git a/syft/pkg/cataloger/binary/classifiers.go b/syft/pkg/cataloger/binary/classifiers.go
index d99e16bdf57..0163659aac9 100644
--- a/syft/pkg/cataloger/binary/classifiers.go
+++ b/syft/pkg/cataloger/binary/classifiers.go
@@ -93,7 +93,7 @@ func DefaultClassifiers() []Classifier {
 					// [NUL]openjdk[NUL]java[NUL]1.8[NUL]1.8.0_352-b08[NUL]
 					// Equivalent to the following regexp with lookahead support:
 					// (?m)\x00openjdk\x00java\x00(?P<release>[0-9]+[.0-9]*)\x00(?P<release>[0-9]+[.0-9]*) (?P<version>[0-9]+[^-\x00]+(-(?!jvmci)[^-\x00]+)+)
-					`(?m)\x00openjdk\x00java\x00(?P<release>[0-9]+[.0-9]*)\x00(?P<version>[0-9]+[^-\s]+(-([^-j\x00][^-\x00]?|[^-\x00][^-v\x00][^-\x00]?|[^-\x00][^-\x00][^-m\x00][^-\x00]?|[^-\x00][^-\x00][^-\x00][^-c\x00][^-\x00]?|[^-\x00][^-\x00][^-\x00][^-\x00][^-i\s].?|[^-\x00]{6,}))+)\x00`,
+					`(?m)\x00openjdk\x00java\x00(?P<release>[0-9]+[.0-9]*)\x00(?P<version>[0-9]+[^-\s\x00]+(-([^-j\x00][^-\x00]?|[^-\x00][^-v\x00][^-\x00]?|[^-\x00][^-\x00][^-m\x00][^-\x00]?|[^-\x00][^-\x00][^-\x00][^-c\x00][^-\x00]?|[^-\x00][^-\x00][^-\x00][^-\x00][^-i\s].?|[^-\x00]{6,}))+)\x00`,
 				),
 				FileContentsVersionMatcher(
 					`(?m)\x00(?P<release>[0-9]+[.0-9]*)\x00+(?P<version>[0-9]+[^-\s]+(-([^-j\x00][^-\x00]?|[^-\x00][^-v\x00][^-\x00]?|[^-\x00][^-\x00][^-m\x00][^-\x00]?|[^-\x00][^-\x00][^-\x00][^-c\x00][^-\x00]?|[^-\x00][^-\x00][^-\x00][^-\x00][^-i\s].?|[^-\x00]{6,}))+)\x00+openjdk\x00java`,
diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/java-jre-openjdk-arm64-eclipse/11.0.22/linux-arm64/java b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/java-jre-openjdk-arm64-eclipse/11.0.22/linux-arm64/java
new file mode 100644
index 0000000000000000000000000000000000000000..411aa4706efbebb2bb480cbe824a32b14dadd196
GIT binary patch
literal 345
zcmXv~%TB{E5Ojf)#gSVPSgJT7DtjHj!XI#iD;Gc3v?Wa<B|N{E?;tn@Mw%V%>}s^y
z*6*=qJOAowm-B#Q&7^~hHrPImo0<vWbZEDIkK@C}gVHriE@>@Q3|s<c8>COD1!e?Y
zX&VIR(OD&ob>0Odos3a{RaG)PdE*1k+Xnx`ppunS86+xgOM<f8LY|jBhX4qUi(DeS
z_eL3;qLE1ljU1zjA~;G{s}&0$BeK6U+1Rn%HBI-%%80U;o?Q)fAt8Lt$qXUZd<}4I
z4jmy~kL@l!llcv^b#r&KAMBnimdCf}r9UeC`kp3R^l_S|zUYjzUm=UndvfxAu~?p7
I9-OMwA7PtT8~^|S

literal 0
HcmV?d00001

diff --git a/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/java-jre-openjdk-eclipse/11.0.22/linux-amd64/java b/syft/pkg/cataloger/binary/test-fixtures/classifiers/snippets/java-jre-openjdk-eclipse/11.0.22/linux-amd64/java
new file mode 100644
index 0000000000000000000000000000000000000000..292799f0d5b0bd471c13c8e6757e1365e63cf7f6
GIT binary patch
literal 345
zcmXxfOG*Pl5CG5~M3lyb3wPNxL_rWk^>3zoyn!px6IB09;$$W;gGNu0rAP1xE<J{K
z5ga?H1;s0<qNr+d6>GM{N2Fa!eH>~gl{U1A?fo#X85cnNcClW^;ckvXmo*Ehqf1@|
zWla!VD-=G;<dOyr3c&{iUMg?72&HyqidC@I14nJVh?=HF6aSYfCjo4U1`Rg}LhzL}
zTnfn@k6uNc2e?hLGKd%*=E_$f113<x8b#@JI%V#8i0to7Hgqg?P18NG+@fba>DIAb
zh6l3ylE4fI=QEfIaZ!=W>&sPdR-~BhT`5Aye$Ml+alFZz>?Zq~-Dcmu$MGZkp8d@3
X;^Y@nyxfvvb6iZ04i2{kA*bXA8Vh0a

literal 0
HcmV?d00001

diff --git a/syft/pkg/cataloger/binary/test-fixtures/config.yaml b/syft/pkg/cataloger/binary/test-fixtures/config.yaml
index 07f17882d9f..ec0f658081b 100644
--- a/syft/pkg/cataloger/binary/test-fixtures/config.yaml
+++ b/syft/pkg/cataloger/binary/test-fixtures/config.yaml
@@ -203,6 +203,22 @@ from-images:
     paths:
       - /usr/lib/jvm/java-11-amazon-corretto/bin/java
 
+  - name: java-jre-openjdk-eclipse
+    version: 11.0.22
+    images:
+      - ref: eclipse-temurin:11.0.22_7-jre@sha256:137960b9ec016cddeb366b7137546d37207d0f284f9492c23abf16a9c171dd51
+        platform: linux/amd64
+    paths:
+      - /opt/java/openjdk/bin/java
+
+  - name: java-jre-openjdk-arm64-eclipse
+    version: 11.0.22
+    images:
+      - ref: eclipse-temurin:11.0.22_7-jre@sha256:9bb82e8801e12e5377222fde83b5c91d87dc16f76c89e9f8affa678208f56797
+        platform: linux/arm64
+    paths:
+      - /opt/java/openjdk/bin/java
+
   - name: java-graal-openjdk
     version: 17.0.3+7-jvmci-22.1-b06
     images: