OCI purl: fix repository URL management (#1485)

Signed-off-by: mrizzi <mrizzi@redhat.com>
guacsec · Nov 13, 2023 · c5c346c · c5c346c
1 parent 030cf7f
commit c5c346c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/assembler/helpers/purl.go b/pkg/assembler/helpers/purl.go
@@ -136,7 +136,7 @@ func purlConvert(p purl.PackageURL) (*model.PkgInputSpec, error) {
 		}
 
 		delete(qs, "repository_url")
-		ns = strings.TrimRight(ns, "/"+p.Name)
+		ns = strings.TrimSuffix(ns, "/"+p.Name)
 		r := pkg(p.Type, ns, p.Name, p.Version, p.Subpath, qs)
 		return r, nil
 	case purl.TypeDocker:

diff --git a/pkg/assembler/helpers/purl_test.go b/pkg/assembler/helpers/purl_test.go
@@ -200,6 +200,11 @@ func TestPurlConvert(t *testing.T) {
 		}, {
 			purlUri:  "pkg:swift/github.com/RxSwiftCommunity/RxFlow@2.12.4",
 			expected: pkg("swift", "github.com/RxSwiftCommunity", "RxFlow", "2.12.4", "", map[string]string{}),
+		}, {
+			purlUri: "pkg:oci/ubi9-container@sha256:8614ce95268b970880a1eca97dddfce5154fab35418d839c5f75012cccaca0d9?repository_url=registry.redhat.io/ubi9&tag=9.2-489",
+			expected: pkg("oci", "registry.redhat.io/ubi9", "ubi9-container", "sha256:8614ce95268b970880a1eca97dddfce5154fab35418d839c5f75012cccaca0d9", "", map[string]string{
+				"tag": "9.2-489",
+			}),
 		},
 	}