Skip to content

Commit

Permalink
fix legacy publisher url usage
Browse files Browse the repository at this point in the history
Signed-off-by: Javan lacerda <javanlacerda@google.com>
  • Loading branch information
javanlacerda committed May 6, 2024
1 parent 69243da commit e165eb6
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions warehouse/forklift/legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -676,16 +676,17 @@ 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 = {}
if meta.project_urls:
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
)

Expand Down Expand Up @@ -804,7 +805,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),
},
)
Expand Down Expand Up @@ -1120,7 +1125,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),
},
Expand Down

0 comments on commit e165eb6

Please sign in to comment.