From c51f24936e8c58831e1977eec83fafb1c6a2776f Mon Sep 17 00:00:00 2001 From: Javan lacerda Date: Mon, 6 May 2024 20:46:17 +0000 Subject: [PATCH] fix legacy publisher url usage Signed-off-by: Javan lacerda --- warehouse/forklift/legacy.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/warehouse/forklift/legacy.py b/warehouse/forklift/legacy.py index acbec544063f..907cb0940c70 100644 --- a/warehouse/forklift/legacy.py +++ b/warehouse/forklift/legacy.py @@ -676,7 +676,7 @@ def file_upload(request): ), ) from None - publisher_url = ( + publisher_base_url = ( request.oidc_publisher.publisher_base_url if request.oidc_publisher else None ) project_urls = {} @@ -684,8 +684,8 @@ def file_upload(request): for name, url in meta.project_urls.items(): striped_url = url.rstrip("/") + "/" verified = ( - striped_url[: len(publisher_url)].lower() == publisher_url.lower() - if publisher_url + striped_url[: len(publisher_base_url)].lower() == publisher_base_url.lower() + if publisher_base_url else False ) @@ -804,7 +804,11 @@ def file_upload(request): request.user.username if request.user else "OpenID created token" ), "canonical_version": release.canonical_version, - "publisher_url": publisher_url, + "publisher_url": ( + request.oidc_publisher.publisher_url(request.oidc_claims) + if request.oidc_publisher + else None + ), "uploaded_via_trusted_publisher": bool(request.oidc_publisher), }, ) @@ -1120,7 +1124,11 @@ def file_upload(request): request.user.username if request.user else "OpenID created token" ), "canonical_version": release.canonical_version, - "publisher_url": publisher_url, + "publisher_url": ( + request.oidc_publisher.publisher_url(request.oidc_claims) + if request.oidc_publisher + else None + ), "project_id": str(project.id), "uploaded_via_trusted_publisher": bool(request.oidc_publisher), },