Skip to content

Allow GitHub OIDC subject claim to be case insensitive #14623

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 1 commit into from
Sep 23, 2023
Merged

Allow GitHub OIDC subject claim to be case insensitive #14623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions tests/unit/oidc/models/test_github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,8 @@ def test_github_publisher_job_workflow_ref(self, claim, ref, sha, valid, expecte
[
("repo:foo/bar", "repo:foo/bar:someotherstuff", True),
("repo:foo/bar", "repo:foo/bar:", True),
("repo:fOo/BaR", "repo:foo/bar", True),
("repo:foo/bar", "repo:fOo/BaR:", True),
("repo:foo/bar:someotherstuff", "repo:foo/bar", False),
("repo:foo/bar-baz", "repo:foo/bar", False),
("repo:foo/bar", "repo:foo/bar-baz", False),
Expand Down
7 changes: 6 additions & 1 deletion warehouse/oidc/models/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ def _check_sub(ground_truth, signed_claim, _all_signed_claims):
if len(components) < 2:
return False

return f"{components[0]}:{components[1]}" == ground_truth
org, repo, *_ = components
if not org or not repo:
return False

# The sub claim is case-insensitive
return f"{org}:{repo}".lower() == ground_truth.lower()


class GitHubPublisherMixin:
Expand Down