From 14711707ff00e5b2035c8de72210a46a7bd46aa6 Mon Sep 17 00:00:00 2001 From: Mike Fiedler Date: Thu, 16 Oct 2025 10:02:03 -0400 Subject: [PATCH 1/2] fix: set the default issuer_url column value Fixes #18879 Signed-off-by: Mike Fiedler --- warehouse/manage/views/oidc_publishers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/warehouse/manage/views/oidc_publishers.py b/warehouse/manage/views/oidc_publishers.py index 5c91fc8fd540..8f514278118a 100644 --- a/warehouse/manage/views/oidc_publishers.py +++ b/warehouse/manage/views/oidc_publishers.py @@ -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, @@ -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) From 76fc2a8e15fd1e3298f8ac6aef66d7b3ad8ab602 Mon Sep 17 00:00:00 2001 From: Mike Fiedler Date: Thu, 16 Oct 2025 10:04:48 -0400 Subject: [PATCH 2/2] make translations Signed-off-by: Mike Fiedler --- warehouse/locale/messages.pot | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot index 2c7c2a337449..39c2c98fc7db 100644 --- a/warehouse/locale/messages.pot +++ b/warehouse/locale/messages.pot @@ -306,7 +306,7 @@ msgid "Please review our updated Terms of Service." 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." @@ -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 "" @@ -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."