trustpub/tokens/exchange: Implement GitLab CI support #12026
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Turbo87
added
C-enhancement ✨
Turbo87
force-pushed
the
gitlab-oidc-exchange
branch
from
b2d6282 to
d2eea95
Compare
Turbo87
force-pushed
the
gitlab-oidc-exchange
branch
from
d2eea95 to
4449eed
Compare
Turbo87
force-pushed
the
gitlab-oidc-exchange
branch
from
4449eed to
bfd48ec
Compare
15 tasks
LawnGnome
approved these changes
Oct 6, 2025
| insert_jti(conn, &signed_claims.jti, signed_claims.exp).await?; | ||
|
|
||
| let project_path = &signed_claims.project_path; | ||
| let Some((namespace, project)) = project_path.rsplit_once('/') else { |
There was a problem hiding this comment.
I know why this is rsplit_once (the GitLab optional project thing), but it might be worth a comment explaining why this differs from GitHub, since rsplit_once versus split_once is pretty subtle.
There was a problem hiding this comment.
oh, I thought I had left a comment on that, but apparently not. I'll add one. 👍
|
|
||
| if repo_configs.is_empty() { | ||
| let message = format!( | ||
| "The Trusted Publishing config for repository `{project_path}` does not match the namespace ID ({}) in the JWT. Expected namespace IDs: {}. Please recreate the Trusted Publishing config to update the namespace ID.", |
There was a problem hiding this comment.
This is a really good explanation. 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adjusts our
POST /api/v1/trusted_publishing/tokensendpoint to also accept GitLab OIDC tokens.As discussed in #11988, we are using a trust-on-first-use principle for the namespace IDs for GitLab due to some API constraints. In other words: the token exchange endpoint will fill in the
namespace_idcolumn from the OIDC JWT claims if it was empty before and on each subsequent token exchange it will only accept it if the IDs are matching.Other than that, this is essentially the same implementation as for GitHub Actions.
Worth noting also is that, just like PyPI, we only support gitlab.com for now, but not any self-hosted GitLab instances.
Related