Skip to content

Commit 06d11ec

Browse files
committed
fix legacy publisher url usage
Signed-off-by: Javan lacerda <[email protected]>
1 parent 4fe5275 commit 06d11ec

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

warehouse/forklift/legacy.py

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -676,16 +676,16 @@ 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() == publisher_base_url.lower()
688+
if publisher_base_url
689689
else False
690690
)
691691

@@ -815,7 +815,11 @@ def file_upload(request):
815815
request.user.username if request.user else "OpenID created token"
816816
),
817817
"canonical_version": release.canonical_version,
818-
"publisher_url": publisher_url,
818+
"publisher_url": (
819+
request.oidc_publisher.publisher_url(request.oidc_claims)
820+
if request.oidc_publisher
821+
else None
822+
),
819823
"uploaded_via_trusted_publisher": bool(request.oidc_publisher),
820824
},
821825
)
@@ -1131,7 +1135,11 @@ def file_upload(request):
11311135
request.user.username if request.user else "OpenID created token"
11321136
),
11331137
"canonical_version": release.canonical_version,
1134-
"publisher_url": publisher_url,
1138+
"publisher_url": (
1139+
request.oidc_publisher.publisher_url(request.oidc_claims)
1140+
if request.oidc_publisher
1141+
else None
1142+
),
11351143
"project_id": str(project.id),
11361144
"uploaded_via_trusted_publisher": bool(request.oidc_publisher),
11371145
},

0 commit comments

Comments
 (0)