Skip to content

Commit e165eb6

Browse files
committed
fix legacy publisher url usage
Signed-off-by: Javan lacerda <[email protected]>
1 parent 69243da commit e165eb6

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

warehouse/forklift/legacy.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -676,16 +676,17 @@ def file_upload(request):
676676
),
677677
) from None
678678

679-
publisher_url = (
679+
publisher_base_url = (
680680
request.oidc_publisher.publisher_base_url if request.oidc_publisher else None
681681
)
682682
project_urls = {}
683683
if meta.project_urls:
684684
for name, url in meta.project_urls.items():
685685
striped_url = url.rstrip("/") + "/"
686686
verified = (
687-
striped_url[: len(publisher_url)].lower() == publisher_url.lower()
688-
if publisher_url
687+
striped_url[: len(publisher_base_url)].lower()
688+
== publisher_base_url.lower()
689+
if publisher_base_url
689690
else False
690691
)
691692

@@ -804,7 +805,11 @@ def file_upload(request):
804805
request.user.username if request.user else "OpenID created token"
805806
),
806807
"canonical_version": release.canonical_version,
807-
"publisher_url": publisher_url,
808+
"publisher_url": (
809+
request.oidc_publisher.publisher_url(request.oidc_claims)
810+
if request.oidc_publisher
811+
else None
812+
),
808813
"uploaded_via_trusted_publisher": bool(request.oidc_publisher),
809814
},
810815
)
@@ -1120,7 +1125,11 @@ def file_upload(request):
11201125
request.user.username if request.user else "OpenID created token"
11211126
),
11221127
"canonical_version": release.canonical_version,
1123-
"publisher_url": publisher_url,
1128+
"publisher_url": (
1129+
request.oidc_publisher.publisher_url(request.oidc_claims)
1130+
if request.oidc_publisher
1131+
else None
1132+
),
11241133
"project_id": str(project.id),
11251134
"uploaded_via_trusted_publisher": bool(request.oidc_publisher),
11261135
},

0 commit comments

Comments
 (0)