Skip to content

fix: set the default issuer_url column value #18881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2025
Merged

fix: set the default issuer_url column value #18881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1471170
fix: set the default issuer_url column value
miketheman Oct 16, 2025
76fc2a8
make translations
miketheman Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions warehouse/locale/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ msgid "Please review our updated <a href=\"${tos_url}\">Terms of Service</a>."
msgstr ""

#: warehouse/accounts/views.py:1673 warehouse/accounts/views.py:1927
#: warehouse/manage/views/oidc_publishers.py:120
#: warehouse/manage/views/oidc_publishers.py:121
msgid ""
"Trusted publishing is temporarily disabled. See https://pypi.org/help"
"#admin-intervention for details."
Expand All @@ -327,20 +327,20 @@ msgid "You can't register more than 3 pending trusted publishers at once."
msgstr ""

#: warehouse/accounts/views.py:1738
#: warehouse/manage/views/oidc_publishers.py:302
#: warehouse/manage/views/oidc_publishers.py:417
#: warehouse/manage/views/oidc_publishers.py:531
#: warehouse/manage/views/oidc_publishers.py:643
#: warehouse/manage/views/oidc_publishers.py:303
#: warehouse/manage/views/oidc_publishers.py:418
#: warehouse/manage/views/oidc_publishers.py:534
#: warehouse/manage/views/oidc_publishers.py:646
msgid ""
"There have been too many attempted trusted publisher registrations. Try "
"again later."
msgstr ""

#: warehouse/accounts/views.py:1748
#: warehouse/manage/views/oidc_publishers.py:315
#: warehouse/manage/views/oidc_publishers.py:430
#: warehouse/manage/views/oidc_publishers.py:544
#: warehouse/manage/views/oidc_publishers.py:656
#: warehouse/manage/views/oidc_publishers.py:316
#: warehouse/manage/views/oidc_publishers.py:431
#: warehouse/manage/views/oidc_publishers.py:547
#: warehouse/manage/views/oidc_publishers.py:659
msgid "The trusted publisher could not be registered"
msgstr ""

Expand Down Expand Up @@ -624,29 +624,29 @@ msgstr ""
msgid "Invitation revoked from '${username}'."
msgstr ""

#: warehouse/manage/views/oidc_publishers.py:169
#: warehouse/manage/views/oidc_publishers.py:170
msgid "The trusted publisher could not be constrained"
msgstr ""

#: warehouse/manage/views/oidc_publishers.py:283
#: warehouse/manage/views/oidc_publishers.py:284
msgid ""
"GitHub-based trusted publishing is temporarily disabled. See "
"https://pypi.org/help#admin-intervention for details."
msgstr ""

#: warehouse/manage/views/oidc_publishers.py:398
#: warehouse/manage/views/oidc_publishers.py:399
msgid ""
"GitLab-based trusted publishing is temporarily disabled. See "
"https://pypi.org/help#admin-intervention for details."
msgstr ""

#: warehouse/manage/views/oidc_publishers.py:512
#: warehouse/manage/views/oidc_publishers.py:515
msgid ""
"Google-based trusted publishing is temporarily disabled. See "
"https://pypi.org/help#admin-intervention for details."
msgstr ""

#: warehouse/manage/views/oidc_publishers.py:623
#: warehouse/manage/views/oidc_publishers.py:626
msgid ""
"ActiveState-based trusted publishing is temporarily disabled. See "
"https://pypi.org/help#admin-intervention for details."
Expand Down
3 changes: 3 additions & 0 deletions warehouse/manage/views/oidc_publishers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from warehouse.oidc.forms._core import ConstrainEnvironmentForm
from warehouse.oidc.interfaces import TooManyOIDCRegistrations
from warehouse.oidc.models import (
GITLAB_OIDC_ISSUER_URL,
ActiveStatePublisher,
GitHubPublisher,
GitLabPublisher,
Expand Down Expand Up @@ -451,6 +452,8 @@ def add_gitlab_oidc_publisher(self):
project=form.project.data,
workflow_filepath=form.workflow_filepath.data,
environment=form.normalized_environment,
# TODO: Support custom issuers here
issuer_url=GITLAB_OIDC_ISSUER_URL,
)

self.request.db.add(publisher)
Expand Down