Fix sub filter for Google OIDC Publisher lookup (#15202)

pypi · Jan 12, 2024 · 1c962a4 · 1c962a4
1 parent e62049b
commit 1c962a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/unit/oidc/test_utils.py b/tests/unit/oidc/test_utils.py
@@ -89,7 +89,7 @@ def test_find_publisher_by_issuer_google(db_request, sub, expected_id):
     GooglePublisherFactory(
         id="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
         email="[email protected]",
-        sub=None,  # No subject
+        sub="",  # No subject
     )
     GooglePublisherFactory(
         id="bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",

diff --git a/warehouse/oidc/models/google.py b/warehouse/oidc/models/google.py
@@ -70,7 +70,7 @@ def __lookup_all__(klass, signed_claims: SignedClaims) -> Query | None:
 
     @staticmethod
     def __lookup_no_sub__(klass, signed_claims: SignedClaims) -> Query | None:
-        return Query(klass).filter_by(email=signed_claims["email"], sub=None)
+        return Query(klass).filter_by(email=signed_claims["email"], sub="")
 
     __lookup_strategies__ = [
         __lookup_all__,