From aedc29cbaa6cf461e481e9cf7965b42defc251a6 Mon Sep 17 00:00:00 2001 From: Adrien Schildknecht Date: Mon, 11 Mar 2024 16:37:21 +0100 Subject: [PATCH 1/2] url2purl: add cran ecosystem As defined here: https://github.com/package-url/purl-spec/blob/master/PURL-TYPES.rst#cran Make sure we handle urls from both cran and rstduio. Test plan: added unit tests --- src/packageurl/contrib/purl2url.py | 12 ++++++++++++ src/packageurl/contrib/url2purl.py | 16 ++++++++++++++++ tests/contrib/data/url2purl.json | 4 +++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/packageurl/contrib/purl2url.py b/src/packageurl/contrib/purl2url.py index bbe14e6..58a321e 100644 --- a/src/packageurl/contrib/purl2url.py +++ b/src/packageurl/contrib/purl2url.py @@ -185,6 +185,18 @@ def build_rubygems_repo_url(purl): elif name: return f"https://rubygems.org/gems/{name}" +@repo_router.route("pkg:cran/.*") +def build_cran_repo_url(purl): + """ + Return a cran repo URL from the `purl` string. + """ + purl_data = PackageURL.from_string(purl) + + name = purl_data.name + version = purl_data.version + + return f"https://cran.r-project.org/src/contrib/{name}_{version}.tar.gz" + @repo_router.route("pkg:npm/.*") def build_npm_repo_url(purl): diff --git a/src/packageurl/contrib/url2purl.py b/src/packageurl/contrib/url2purl.py index 0693af6..784162a 100644 --- a/src/packageurl/contrib/url2purl.py +++ b/src/packageurl/contrib/url2purl.py @@ -277,6 +277,22 @@ def build_rubygems_purl(uri): return purl_from_pattern("gem", rubygems_pattern, uri) +# https://cran.r-project.org/src/contrib/jsonlite_1.8.8.tar.gz +# https://packagemanager.rstudio.com/cran/2022-06-23/src/contrib/curl_4.3.2.tar.gz" +@purl_router.route( + "https?://cran.r-project.org/.*", + "https?://packagemanager.rstudio.com/cran/.*", +) +def build_cran_purl(uri): + cran_pattern = ( + r"^https?://(cran\.r-project\.org|packagemanager\.rstudio\.com/cran)/.*?src/contrib/(?P.+)_(?P.+)\.tar.gz$" + ) + qualifiers = {} + if "//cran.r-project.org/" not in uri: + qualifiers["download_url"] = uri + return purl_from_pattern("cran", cran_pattern, uri, qualifiers) + + # https://pypi.org/packages/source/a/anyjson/anyjson-0.3.3.tar.gz # https://pypi.python.org/packages/source/a/anyjson/anyjson-0.3.3.tar.gz # https://pypi.python.org/packages/2.6/t/threadpool/threadpool-1.2.7-py2.6.egg diff --git a/tests/contrib/data/url2purl.json b/tests/contrib/data/url2purl.json index 3e0cf41..68d8fab 100644 --- a/tests/contrib/data/url2purl.json +++ b/tests/contrib/data/url2purl.json @@ -267,5 +267,7 @@ "https://salsa.debian.org/lxc-team/lxc/-/archive/master/lxc-master.tar.gz": "pkg:generic/lxc-master.tar.gz?download_url=https://salsa.debian.org/lxc-team/lxc/-/archive/master/lxc-master.tar.gz", "http://apt-rpm.org/": null, "": null, - "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android-notifier/android-notifier-desktop-0.5.1-1.i386.rpm": "pkg:generic/code.google.com/android-notifier?download_url=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android-notifier/android-notifier-desktop-0.5.1-1.i386.rpm" + "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android-notifier/android-notifier-desktop-0.5.1-1.i386.rpm": "pkg:generic/code.google.com/android-notifier?download_url=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/android-notifier/android-notifier-desktop-0.5.1-1.i386.rpm", + "https://cran.r-project.org/src/contrib/jsonlite_1.8.8.tar.gz": "pkg:cran/jsonlite@1.8.8", + "https://packagemanager.rstudio.com/cran/2022-06-23/src/contrib/curl_4.3.2.tar.gz": "pkg:cran/curl@4.3.2?download_url=https://packagemanager.rstudio.com/cran/2022-06-23/src/contrib/curl_4.3.2.tar.gz" } From c34054ca8f03b2259d157036f86f7261ac4fdff8 Mon Sep 17 00:00:00 2001 From: Adrien Schildknecht Date: Mon, 11 Mar 2024 16:57:57 +0100 Subject: [PATCH 2/2] url2purl: linter -> reformat cran functions --- src/packageurl/contrib/purl2url.py | 1 + src/packageurl/contrib/url2purl.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/packageurl/contrib/purl2url.py b/src/packageurl/contrib/purl2url.py index 58a321e..c9425a2 100644 --- a/src/packageurl/contrib/purl2url.py +++ b/src/packageurl/contrib/purl2url.py @@ -185,6 +185,7 @@ def build_rubygems_repo_url(purl): elif name: return f"https://rubygems.org/gems/{name}" + @repo_router.route("pkg:cran/.*") def build_cran_repo_url(purl): """ diff --git a/src/packageurl/contrib/url2purl.py b/src/packageurl/contrib/url2purl.py index 784162a..7356a0d 100644 --- a/src/packageurl/contrib/url2purl.py +++ b/src/packageurl/contrib/url2purl.py @@ -284,9 +284,7 @@ def build_rubygems_purl(uri): "https?://packagemanager.rstudio.com/cran/.*", ) def build_cran_purl(uri): - cran_pattern = ( - r"^https?://(cran\.r-project\.org|packagemanager\.rstudio\.com/cran)/.*?src/contrib/(?P.+)_(?P.+)\.tar.gz$" - ) + cran_pattern = r"^https?://(cran\.r-project\.org|packagemanager\.rstudio\.com/cran)/.*?src/contrib/(?P.+)_(?P.+)\.tar.gz$" qualifiers = {} if "//cran.r-project.org/" not in uri: qualifiers["download_url"] = uri