From cf2ce643c3c06f0fca6f35137bd3fb114be986a8 Mon Sep 17 00:00:00 2001
From: witchcraze <67056980+witchcraze@users.noreply.github.com>
Date: Mon, 1 Jun 2026 23:21:57 +0900
Subject: [PATCH] update helm classifier (#4922)

Signed-off-by: witchcraze <witchcraze@gmail.com>
---
 .../binary/classifier_cataloger_test.go       |  66 ++++++++++++++++++
 syft/pkg/cataloger/binary/classifiers.go      |  13 +++-
 .../helm/2.0.0-beta.2/linux-amd64/helm        | Bin 0 -> 349 bytes
 .../helm/2.17.0-rc.1/linux-amd64/helm         | Bin 0 -> 349 bytes
 .../helm/3.0.0-alpha.1/linux-amd64/helm       | Bin 0 -> 349 bytes
 .../3.12.0/linux-unknown-454d5f53333930/helm  | Bin 0 -> 649 bytes
 .../snippets/helm/3.15.2/linux-amd64/helm     | Bin 0 -> 349 bytes
 .../4.1.4/linux-unknown-454d5f53333930/helm   | Bin 0 -> 349 bytes
 .../pkg/cataloger/binary/testdata/config.yaml |  42 +++++++++++
 9 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/2.0.0-beta.2/linux-amd64/helm
 create mode 100644 syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/2.17.0-rc.1/linux-amd64/helm
 create mode 100644 syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/3.0.0-alpha.1/linux-amd64/helm
 create mode 100644 syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/3.12.0/linux-unknown-454d5f53333930/helm
 create mode 100644 syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/3.15.2/linux-amd64/helm
 create mode 100644 syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/4.1.4/linux-unknown-454d5f53333930/helm

diff --git a/syft/pkg/cataloger/binary/classifier_cataloger_test.go b/syft/pkg/cataloger/binary/classifier_cataloger_test.go
index 56a3d9d63..3d79df2e8 100644
--- a/syft/pkg/cataloger/binary/classifier_cataloger_test.go
+++ b/syft/pkg/cataloger/binary/classifier_cataloger_test.go
@@ -509,6 +509,39 @@ func Test_Cataloger_PositiveCases(t *testing.T) {
 				Metadata:  metadata("haproxy-binary"),
 			},
 		},
+		{
+			logicalFixture: "helm/4.1.4/linux-s390x",
+			expected: pkg.Package{
+				Name:      "helm",
+				Version:   "4.1.4",
+				Type:      "binary",
+				PURL:      "pkg:golang/helm.sh/helm@4.1.4",
+				Locations: locations("helm"),
+				Metadata:  metadata("helm"),
+			},
+		},
+		{
+			logicalFixture: "helm/3.15.2/linux-amd64",
+			expected: pkg.Package{
+				Name:      "helm",
+				Version:   "3.15.2",
+				Type:      "binary",
+				PURL:      "pkg:golang/helm.sh/helm@3.15.2",
+				Locations: locations("helm"),
+				Metadata:  metadata("helm"),
+			},
+		},
+		{
+			logicalFixture: "helm/3.12.0/linux-s390x",
+			expected: pkg.Package{
+				Name:      "helm",
+				Version:   "3.12.0",
+				Type:      "binary",
+				PURL:      "pkg:golang/helm.sh/helm@3.12.0",
+				Locations: locations("helm"),
+				Metadata:  metadata("helm"),
+			},
+		},
 		{
 			logicalFixture: "helm/3.11.1/linux-amd64",
 			expected: pkg.Package{
@@ -520,6 +553,39 @@ func Test_Cataloger_PositiveCases(t *testing.T) {
 				Metadata:  metadata("helm"),
 			},
 		},
+		{
+			logicalFixture: "helm/3.0.0-alpha.1/linux-amd64",
+			expected: pkg.Package{
+				Name:      "helm",
+				Version:   "3.0.0-alpha.1",
+				Type:      "binary",
+				PURL:      "pkg:golang/helm.sh/helm@3.0.0-alpha.1",
+				Locations: locations("helm"),
+				Metadata:  metadata("helm"),
+			},
+		},
+		{
+			logicalFixture: "helm/2.17.0-rc.1/linux-amd64",
+			expected: pkg.Package{
+				Name:      "helm",
+				Version:   "2.17.0-rc.1",
+				Type:      "binary",
+				PURL:      "pkg:golang/helm.sh/helm@2.17.0-rc.1",
+				Locations: locations("helm"),
+				Metadata:  metadata("helm"),
+			},
+		},
+		{
+			logicalFixture: "helm/2.0.0-beta.2/linux-amd64",
+			expected: pkg.Package{
+				Name:      "helm",
+				Version:   "2.0.0-beta.2",
+				Type:      "binary",
+				PURL:      "pkg:golang/helm.sh/helm@2.0.0-beta.2",
+				Locations: locations("helm"),
+				Metadata:  metadata("helm"),
+			},
+		},
 		{
 			logicalFixture: "helm/3.10.3/linux-amd64",
 			expected: pkg.Package{
diff --git a/syft/pkg/cataloger/binary/classifiers.go b/syft/pkg/cataloger/binary/classifiers.go
index d76eca517..ff6b72504 100644
--- a/syft/pkg/cataloger/binary/classifiers.go
+++ b/syft/pkg/cataloger/binary/classifiers.go
@@ -132,8 +132,17 @@ func DefaultClassifiers() []binutils.Classifier {
 		{
 			Class:    "helm",
 			FileGlob: "**/helm",
-			EvidenceMatcher: m.FileContentsVersionMatcher(
-				`(?m)\x00v(?P<version>[0-9]+\.[0-9]+\.[0-9]+)\x00`),
+			EvidenceMatcher: binutils.MatchAny(
+				// [NUL]v1.21.2[NUL].......[NUL][NUL]v4.1.4[NUL][NUL][NUL]
+				// [NUL]v2.0.0-beta.2[NUL][NUL][NUL]
+				m.FileContentsVersionMatcher(`\x00v(?P<version>[0-9]+\.[0-9]+\.[0-9]+(-alpha\.[0-9]|-beta\.[0-9]|-rc\.[0-9])?)\x00{2,}`),
+				// [NUK]'[DLE]v3.12.0[NUL][NUL]...go1.20.3[NUL][NUL]
+				m.FileContentsVersionMatcher(`v(?P<version>[0-9]+\.[0-9]+\.[0-9]+(-alpha\.[0-9]|-beta\.[0-9]|-rc\.[0-9])?)\x00+.{1,500}go[0-9]+\.[0-9]+\.[0-9]+\x00+`),
+				// [NUL]v3.11.1[NUL]�[NUL]
+				m.FileContentsVersionMatcher(`\x00v(?P<version>[0-9]+\.[0-9]+\.[0-9]+(-alpha\.[0-9]|-beta\.[0-9]|-rc\.[0-9])?)\x00`),
+				// [NUL]@�@v3.15.2[NUL][NUL]
+				m.FileContentsVersionMatcher(`@v(?P<version>[0-9]+\.[0-9]+\.[0-9]+(-alpha\.[0-9]|-beta\.[0-9]|-rc\.[0-9])?)\x00`),
+			),
 			Package: "helm",
 			PURL:    mustPURL("pkg:golang/helm.sh/helm@version"),
 			CPEs:    singleCPE("cpe:2.3:a:helm:helm:*:*:*:*:*:*:*", cpe.NVDDictionaryLookupSource),
diff --git a/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/2.0.0-beta.2/linux-amd64/helm b/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/2.0.0-beta.2/linux-amd64/helm
new file mode 100644
index 0000000000000000000000000000000000000000..82c54f145eb91b50e901bfe82b8cef17366c4c88
GIT binary patch
literal 349
zcmZvW&q~8U5Qo#GjqR%S;>puWE`k_l|L^8Ce1hH0tSO{Pp+WH}eI*mH;GrMPVSeAt
zFoQp0Lp$t`WK8LdQ$x9C(tzTm$Khk@8p=43^KdwwaC+}NSGu9jaAg!aDY%a+Mi-ng
zj+qpL5#GxfP)byDu0dLrS`S)S)=ESjwQ?jKdb}KKAtdR%2wpotbVhLpQh?T62Bs`T
z&8*<sv1Cnag$!-5JfTP77(*naswx`3C!~LG(rKh=?ECSH&WdC+Kw(>!FF$3GvGrq?
zeexP=cndiBnlJttcID=EU*u1lY#vxGOaFM--{0Mm-S(#3tc!e=<+EGr!nOVvb3jMV

literal 0
HcmV?d00001

diff --git a/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/2.17.0-rc.1/linux-amd64/helm b/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/2.17.0-rc.1/linux-amd64/helm
new file mode 100644
index 0000000000000000000000000000000000000000..445c77baf7b9a5d86466cc83168c09d5a5e3d63d
GIT binary patch
literal 349
zcmZvWO-{o=422OpW(VQ`BV|oBcE<CQ8?fdC^J9}rX;RS$#O;}+AU3t%TReY~?Kz!z
z&?8SLwTN7J9W+|RV7yZk&+qFvXh5Sb^YMJ<^=(W@ZqRHzp`h4IMmVKZ*an9IB}(f1
zn7kJ;IR_39swBuE`Vy=-0CvGCIZphytWf1ZR0*lrfVq!QG5X$1YjoaLgV4rM3&xTh
zY}axI%EmaNqEy#)I)AUMf8W&WqGg$;<x4lD?rzj49>5>W%SSoDhVPr7n_qYR=Z$T3
Ri$Asb<E|^;^24rc{sATTMn(Vt

literal 0
HcmV?d00001

diff --git a/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/3.0.0-alpha.1/linux-amd64/helm b/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/3.0.0-alpha.1/linux-amd64/helm
new file mode 100644
index 0000000000000000000000000000000000000000..78abc91a2c3a477df8e3dae4f8869c4547380d24
GIT binary patch
literal 349
zcmYk$J5Iwu5C&ie2ohURQAHFRjA#(n?0eToNJGI1_A!eiId-I2AdUcvxBv&^Ce$RB
zk@&mspV4SKzrmU|*ltLl^A3laa$&iYMw1r1=b@=7<3M)Zdb`EpsqtLtnz|gdFfk?u
z-kBsp1QmHs901X>2<Q-uNy;f1qf=1?VXe@?D{ollB(GciJC=l(T4bA8<iSfRv(dtX
zgup?dvMN{`4lyXTWYz`eYzkU1h1zi+2`S5xhPMIf^d=p8n)|lxU+G~)ibG%t7w7Z)
z%hQv^yg0imUPJ{IJot9o_=*+9?6~wV@#lT4mQ(k&`WSsX`R02++D=|ve~x~fyt>=Z
FegSk6O}795

literal 0
HcmV?d00001

diff --git a/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/3.12.0/linux-unknown-454d5f53333930/helm b/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/3.12.0/linux-unknown-454d5f53333930/helm
new file mode 100644
index 0000000000000000000000000000000000000000..27a3616488077b57786874b20a737fb2b244343b
GIT binary patch
literal 649
zcmZ9}Jxjwt7y#g_A0Pqo0~K`fprBj5+($0y(n7&S(7{neF1fq5k~U(4qD$TV6aESZ
z6)Eoi0snxDU`Odv)8=gv-yzTYarbhNwrZI&ZkV{`B-VCJTE<KYPZG|Z*tF|uql`Hv
zPN&_xxG?E)Ls8+CvBwQ#GKjR#Xc%y=J!Oa>MoaEmA{n!xas_j>Piz=!<r^V_kSjvD
zFp*}CZN_G@%v!CjA5k3{;{`;Bh%&{PCYA?MOD3(aM5MDm5w7P^<3@oW_}X`c3>B4*
zQ!Ey7c#|3o&%|khZ4$@HHO@v3LTDS!WZ!A*E?=>dOG{+Z89=fM*1@H{ex4nHZ+%oi
zsPf%~x&~GT@1LWSm5<x6*Qdk%A@sXHuxTr|M!+fv=c=1|{eS=Tem?ecPzSsO&%skL
z0$0E_Fnjwr7Qqd04x9xsxIT9Nq?gx)yIiEe9q?>q;qj$6_W9sp?4P=xxFt$TEc+Gr
M3!`Bc(`<;)FK~@<vH$=8

literal 0
HcmV?d00001

diff --git a/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/3.15.2/linux-amd64/helm b/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/3.15.2/linux-amd64/helm
new file mode 100644
index 0000000000000000000000000000000000000000..dc5d315599a35c75afb5ce96a2fc1857a3a8186a
GIT binary patch
literal 349
zcmXwzzfQw25QkGC3YdQrNHAIIh!oj(b{uDFC3XgQ0XsRjmC~lD0mQ}|u))Ry@E}YK
z9oSfT2UcQ<-16z}zTfGVZb1c~QN3VI2y1E!j>=dg0a;DUX*(;p1i{wJ`D#V&^~{0J
z3Qk%mOQo<{VaSm{Nc0s1T}qRKbV8XD6&gh%Q#Rz8w@PTQTrPAOoMB;JQ-2JqGM5%I
zpr9RQAiE?$MF8k+KwBwr5I|<i=R}=`nM4OJM~{*WFg6;ExPNSk|G&xGhKHuEn+M*l
zSdt{?<EKG~zQ)hvdrYNHAxSn@TX8&XWD1a~Ug`ODad{J?FDE}Ak(<}EyU4fX{WCg~
Y;q7<qC#Qqo$m65KgMGHQyEEMW1IhVOasU7T

literal 0
HcmV?d00001

diff --git a/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/4.1.4/linux-unknown-454d5f53333930/helm b/syft/pkg/cataloger/binary/testdata/classifiers/snippets/helm/4.1.4/linux-unknown-454d5f53333930/helm
new file mode 100644
index 0000000000000000000000000000000000000000..df4bd3c25887aee954f40c5f34742e3d9bcbf8aa
GIT binary patch
literal 349
zcmXv|J5Iwu6kOUp0@X_CgV(!nKW<zgQ6VTe!G7N2NE<s+ED$ul3g@7ppyvWyfCh<_
zh{iaH^Q5QId^DQYt+8Sa<~8k7+G1ZZ2?_)UMKiYdeN!=B7IfRLHXH2k8drj<nBd&#
zP`Usv`Tzw;Od)CT(!>N7ML^G$Hd=t@Mw-Hk6txn*Fx;XtG_5k8%3_L9@=`e+gizp+
z19&vZlXVdHrLyqSn&4HiO8aDtbq+)1lc-Ffbg@`4|I{O!XR^Lysmr;0WRpd&UkDk7
zaU7=)8C^>Vd5}xKl#{-j$aJ?eUd;HuBWHxvKjX}Y-(&7_=Jn_E_uK2uRsHwzb#Ts)
J{;6-D{|6+bVnqM|

literal 0
HcmV?d00001

diff --git a/syft/pkg/cataloger/binary/testdata/config.yaml b/syft/pkg/cataloger/binary/testdata/config.yaml
index 4f933c25c..e1603524b 100644
--- a/syft/pkg/cataloger/binary/testdata/config.yaml
+++ b/syft/pkg/cataloger/binary/testdata/config.yaml
@@ -868,6 +868,27 @@ from-images:
       - /usr/local/lib/libruby.so.2.6.10
       - /usr/local/lib/libruby.so.2.6
 
+  - version: 4.1.4
+    images:
+      - ref: alpine/helm:4.1.4@sha256:d69c97f71f38128c3ed4b8bcd70b4de65efad9e09494c85d158661e7ffd8b719
+        platform: linux/s390x
+    paths:
+      - /usr/bin/helm
+
+  - version: 3.15.2
+    images:
+      - ref: alpine/helm:3.15.2@sha256:61185768b41810085cb57a9bc8de9003bea78ac0dd417e5b0b16223a6a0aa812
+        platform: linux/amd64
+    paths:
+      - /usr/bin/helm
+
+  - version: 3.12.0
+    images:
+      - ref: alpine/helm:3.12.0@sha256:6f6e18df0710af82188ab8b27d3890b6d519c501c0982f3a76f3fdbff39ff3c7
+        platform: linux/s390x
+    paths:
+      - /usr/bin/helm
+
   - version: 3.11.1
     images:
       - ref: alpine/helm:3.11.1@sha256:8628e3695fb743a8b9de89626f1b7a221280c2152c0e288c2504e59b68233e8b
@@ -882,6 +903,27 @@ from-images:
     paths:
       - /usr/local/bin/helm
 
+  - version: 3.0.0-alpha.1
+    images:
+      - ref: alpine/helm:3.0.0-alpha.1@sha256:95bd39add326ac58a333815666aace6d4a28606a79eef96d4e44287b11540b69
+        platform: linux/amd64
+    paths:
+      - /usr/bin/helm
+
+  - version: 2.17.0-rc.1
+    images:
+      - ref: alpine/helm:2.17.0-rc.1@sha256:3938b9f291794fe88489dae2a87e0ad9d634464c686186d4a3ca33beef84278d
+        platform: linux/amd64
+    paths:
+      - /usr/bin/helm
+
+  - version: 2.0.0-beta.2
+    images:
+      - ref: alpine/helm:2.0.0-beta.2@sha256:97d97b27a723b28c459d6c92e7b0591c553e88e483a248235fbdaa4dacb2e6d5
+        platform: linux/amd64
+    paths:
+      - /usr/bin/helm
+
   - version: 1.15.2
     images:
       - ref: hashicorp/consul:1.15.2@sha256:c2169f3bb18dd947ae8eb5f6766896695c71fb439f050a3343e0007d895615b8