STRLCPY/syft

Update the CPE generation for spring-security-core (#1789)

* Update the CPE generation for spring-security-core
* Add vendor test for spring-security

Signed-off-by: Josh Bressers <[email protected]>

---------

Signed-off-by: Josh Bressers <[email protected]>

Josh Bressers committed with GitHub 1 year ago

0f1aed44

1 parent ddb338d8

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

Total 2 files Show one by one

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/common/cpe/candidate_by_package_type.go

		skipped 32 lines
33	33		candidateAddition{AdditionalProducts: []string{"spring_framework", "springsource_spring_framework"}, AdditionalVendors: []string{"pivotal_software", "springsource", "vmware"}},
34	34		},
35	35		{
	36	+	// example image: docker.io/jenkins/jenkins:latest
	37	+	pkg.JavaPkg,
	38	+	candidateKey{PkgName: "spring-security-core"},
	39	+	candidateAddition{AdditionalProducts: []string{"spring_security"}, AdditionalVendors: []string{"vmware"}},
	40	+	},
	41	+	{
36	42		// example image: docker.io/nuxeo:latest
37	43		pkg.JavaPkg,
38	44		candidateKey{PkgName: "elasticsearch"}, // , Vendor: "elasticsearch"},
		skipped 457 lines

■ ■ ■ ■ ■ ■

syft/pkg/cataloger/common/cpe/generate_test.go

		skipped 768 lines
769	769		expected: []string{"spring_framework", "springsource_spring_framework" /* <-- known good names \| default guess --> */, "springframework"},
770	770		},
771	771		{
	772	+	name: "spring-security-core",
	773	+	p: pkg.Package{
	774	+	Name: "spring-security-core",
	775	+	Type: pkg.JavaPkg,
	776	+	},
	777	+	expected: []string{"spring-security-core", "spring_security", "spring_security_core"},
	778	+	},
	779	+	{
772	780		name: "java",
773	781		p: pkg.Package{
774	782		Name: "some-java-package-with-group-id",
		skipped 81 lines
856	864		Type: pkg.JavaPkg,
857	865		},
858	866		expected: []string{"elastic" /* <-- known good names \| default guess --> */, "elasticsearch"},
	867	+	},
	868	+	{
	869	+	name: "spring-security",
	870	+	p: pkg.Package{
	871	+	Name: "spring-security-core",
	872	+	Type: pkg.JavaPkg,
	873	+	},
	874	+	expected: []string{"vmware" /* <-- known good names \| default guess --> */, "spring", "spring-security", "spring-security-core", "spring_security_core", "spring_security"},
859	875		},
860	876		{
861	877		name: "log4j",
		skipped 95 lines