OIDC: Allow SHA in job_workflow_ref claim.
#14335
Merged
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
woodruffw
reviewed
Aug 10, 2023
| if signed_claim not in expected: | ||
| raise InvalidPublisherError( | ||
| f"The claim does not match, expecting {expected!r}, got {signed_claim!r}" | ||
| f"The claim does not match, expecting one of {sorted(expected)!r}, got " |
There was a problem hiding this comment.
Small nitpick, noticed that "the claim" isn't super clear in the error messages we return:
Suggested change
| f"The claim does not match, expecting one of {sorted(expected)!r}, got " | |
| f"job_workflow_ref does not match, expecting one of {sorted(expected)!r}, got " |
|
Huh, was not expecting to be able to accidentally push to |
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.
Resolves pypa/gh-action-pypi-publish#173.
Sometimes we receive an OIDC token where the
refclaim is an empty string and thejob_workflow_refclaim takes the form{owner}/{repo}/.github/workflows/{filename}@{sha}rather than{owner}/{repo}/.github/workflows/{filename}@{ref}. It's currently unclear why/when this happens.Since the
job_workflow_refclaim can still be considered valid if it contains the SHA, we can expand our validation of it to check for the form containing the SHA.This PR also makes the
shaclaim a required unverifiable claim, and removes the Sentry message introduced in #14333.