🐛 RPM: fix match "(none)" vendor (#4791)

* fix: match (none) vendor

* fix+extend the unit test

providers/os/resources/packages/rpm_packages.go

@@ -30,7 +30,7 @@ const (
 	RpmPkgFormat = "rpm"
 )
 
-var RPM_REGEX = regexp.MustCompile(`^([\w-+]*)\s(\d*|\(none\)):([\w\d-+.:]+)\s([\w\d]*|\(none\))__([\w\d\s,/<>:\.]+)__(.*)$`)
+var RPM_REGEX = regexp.MustCompile(`^([\w-+]*)\s(\d*|\(none\)):([\w\d-+.:]+)\s([\w\d]*|\(none\))__([\w\d\s,/<>:\.|\(none\)]+)__(.*)$`)
 
 // ParseRpmPackages parses output from:
 // rpm -qa --queryformat '%{NAME} %{EPOCHNUM}:%{VERSION}-%{RELEASE} %{ARCH}__%{VENDOR}__%{SUMMARY}\n'

providers/os/resources/packages/rpm_packages_test.go

@@ -37,7 +37,7 @@ func TestRedhat8Parser(t *testing.T) {
 	}
 
 	m := ParseRpmPackages(pf, c.Stdout)
-	assert.Equal(t, 190, len(m), "detected the right amount of packages")
+	assert.Equal(t, 192, len(m), "detected the right amount of packages")
 
 	p := Package{
 		Name:        "ncurses-base",
@@ -147,6 +147,24 @@ func TestRedhat8Parser(t *testing.T) {
 	}
 	assert.Equal(t, p, findPkg(m, p.Name), p.Name)
 
+	// Package with (none) vendor and arch
+	p = Package{
+		Name:           "gpg-pubkey",
+		Version:        "d4082792-5b32db75",
+		Vendor:         "(none)",
+		Description:    "gpg(Red Hat, Inc. (auxiliary key) <[email protected]>)",
+		Format:         RpmPkgFormat,
+		FilesAvailable: PkgFilesAsync,
+		PUrl:           "pkg:rpm/rhel/gpg-pubkey@d4082792-5b32db75?distro=rhel-8.4",
+		CPEs: []string{
+			"cpe:2.3:a:\\(none\\):gpg-pubkey:d4082792-5b32db75:*:*:*:*:*:*:*",
+			"cpe:2.3:a:\\(none\\):gpg-pubkey:d4082792:*:*:*:*:*:*:*",
+			"cpe:2.3:a:\\(none\\):gpg-pubkey:d4082792-5b32db75:*:*:*:*:*:*:*",
+			"cpe:2.3:a:\\(none\\):gpg-pubkey:d4082792:*:*:*:*:*:*:*",
+		},
+	}
+	assert.Equal(t, p, findPkg(m, p.Name), p.Name)
+
 	// fetch package files
 	p = Package{
 		Name:        "which",