STRLCPY/syft

Create consul binary classifier (#1738)

* Create consul binary classifier

Closes #1590

Signed-off-by: Shane Dell <[email protected]>

* Create test for consul binary classifier

Signed-off-by: Shane Dell <[email protected]>

* Update version for consul. Add note that about consul version matcher is brittle

Signed-off-by: Shane Dell <[email protected]>

---------

Signed-off-by: Shane Dell <[email protected]>

Shane Dell committed with GitHub 1 year ago

244b797a

1 parent 95176d7e

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

Total 3 files Show one by one

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/binary/cataloger_test.go

		skipped 713 lines
714	714		Metadata: metadata("ruby-binary"),
715	715		},
716	716		},
	717	+	{
	718	+	name: "positive-consul-1.15.2",
	719	+	fixtureDir: "test-fixtures/classifiers/dynamic/consul-1.15.2",
	720	+	expected: pkg.Package{
	721	+	Name: "consul",
	722	+	Version: "1.15.2",
	723	+	Type: "binary",
	724	+	PURL: "pkg:golang/github.com/hashicorp/[email protected]",
	725	+	Locations: locations("consul"),
	726	+	Metadata: metadata("consul-binary"),
	727	+	},
	728	+	},
717	729		}
718	730
719	731		for _, test := range tests {
		skipped 247 lines

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/binary/default_classifiers.go

		skipped 269 lines
270	270		PURL: mustPURL("pkg:generic/ruby@version"),
271	271		CPEs: singleCPE("cpe:2.3:a:ruby-lang:ruby::::::::"),
272	272		},
	273	+	{
	274	+	Class: "consul-binary",
	275	+	FileGlob: "**/consul",
	276	+	EvidenceMatcher: fileContentsVersionMatcher(
	277	+	// NOTE: This is brittle and may not work for past or future versions
	278	+	`CONSUL_VERSION: (?P<version>\d+\.\d+\.\d+)`,
	279	+	),
	280	+	Package: "consul",
	281	+	PURL: mustPURL("pkg:golang/github.com/hashicorp/consul@version"),
	282	+	CPEs: singleCPE("cpe:2.3:a:hashicorp:consul::::::::"),
	283	+	},
273	284		}
274	285
275	286		// in both binaries and shared libraries, the version pattern is [NUL]3.11.2[NUL]
		skipped 12 lines

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/binary/test-fixtures/Makefile

		skipped 14 lines
15	15		classifiers/dynamic/kubectl-1.25.7 \
16	16		classifiers/dynamic/kubectl-1.26.2 \
17	17		classifiers/dynamic/kustomize-4.5.7 \
18		-	classifiers/dynamic/kustomize-5.0.0
	18	+	classifiers/dynamic/kustomize-5.0.0 \
	19	+	classifiers/dynamic/consul-1.15.2
	20	+
19	21
20	22
21	23		classifiers/dynamic/python-binary-shared-lib-3.11:
		skipped 118 lines
140	142		./get-image-file.sh $($@_image) \
141	143		/usr/local/bin/kustomize \
142	144		$@/kustomize
	145	+
	146	+	classifiers/dynamic/consul-1.15.2:
	147	+	$(eval $@_image := "hashicorp/consul:1.15.2@sha256:c2169f3bb18dd947ae8eb5f6766896695c71fb439f050a3343e0007d895615b8")
	148	+	./get-image-file.sh $($@_image) \
	149	+	/bin/consul \
	150	+	$@/consul
143	151
144	152		.PHONY: clean
145	153		clean:
		skipped 7 lines