Skip to content

Normalize both sides of case-insensitive fields for GitLab publisher lookup query #18905

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 3 commits into from
Oct 20, 2025
Merged

Normalize both sides of case-insensitive fields for GitLab publisher lookup query #18905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f528bc6
Add a failing test
di Oct 20, 2025
7a48906
Normalize both sides of the query
di Oct 20, 2025
b4817f7
Merge branch 'main' into fix/18883
di Oct 20, 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
27 changes: 22 additions & 5 deletions tests/unit/oidc/models/test_gitlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,36 @@ def test_lookup_fails_invalid_ci_config_ref_uri(self, environment):
):
gitlab.GitLabPublisher.lookup_by_claims(pretend.stub(), signed_claims)

def test_lookup_succeeds_with_mixed_case_project_path(self, db_request):
@pytest.mark.parametrize(
("configured_namespace", "configured_project", "project_path"),
[
(
"Foo",
"Bar",
"foo/bar",
),
(
"foo",
"bar",
"Foo/Bar",
),
],
)
def test_lookup_succeeds_with_mixed_case_project_path(
self, db_request, configured_namespace, configured_project, project_path
):
# Test that we find a matching publisher when the project_path claims match
# even if the case is different.
stored_publisher = GitLabPublisherFactory(
namespace="Foo",
project="Bar",
namespace=configured_namespace,
project=configured_project,
workflow_filepath=".gitlab-ci.yml",
environment="",
)

signed_claims = {
"project_path": "foo/bar", # different case than stored publisher
"ci_config_ref_uri": ("gitlab.com/foo/bar//.gitlab-ci.yml@refs/heads/main"),
"project_path": project_path,
"ci_config_ref_uri": "gitlab.com/foo/bar//.gitlab-ci.yml@refs/heads/main",
"environment": "some_environment",
}

Expand Down
4 changes: 2 additions & 2 deletions warehouse/oidc/models/gitlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ def lookup_by_claims(cls, session: Session, signed_claims: SignedClaims) -> Self

query: Query = Query(cls).filter(
# claims `project_path` is case-insensitive
func.lower(cls.namespace) == namespace,
func.lower(cls.project) == project,
func.lower(cls.namespace) == func.lower(namespace),
func.lower(cls.project) == func.lower(project),
cls.workflow_filepath == workflow_filepath,
)
publishers = query.with_session(session).all()
Expand Down