@@ -676,16 +676,17 @@ def file_upload(request):
676
676
),
677
677
) from None
678
678
679
- publisher_url = (
679
+ publisher_base_url = (
680
680
request .oidc_publisher .publisher_base_url if request .oidc_publisher else None
681
681
)
682
682
project_urls = {}
683
683
if meta .project_urls :
684
684
for name , url in meta .project_urls .items ():
685
685
striped_url = url .rstrip ("/" ) + "/"
686
686
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
689
690
else False
690
691
)
691
692
@@ -804,7 +805,11 @@ def file_upload(request):
804
805
request .user .username if request .user else "OpenID created token"
805
806
),
806
807
"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
+ ),
808
813
"uploaded_via_trusted_publisher" : bool (request .oidc_publisher ),
809
814
},
810
815
)
@@ -1120,7 +1125,11 @@ def file_upload(request):
1120
1125
request .user .username if request .user else "OpenID created token"
1121
1126
),
1122
1127
"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
+ ),
1124
1133
"project_id" : str (project .id ),
1125
1134
"uploaded_via_trusted_publisher" : bool (request .oidc_publisher ),
1126
1135
},
0 commit comments