Fix auth_jwt under Cython 3 (#7986)

geldata · Nov 14, 2024 · c6e249c · c6e249c
1 parent 30490ad
commit c6e249c
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 34 deletions.
diff --git a/.github/workflows.src/tests.inc.yml b/.github/workflows.src/tests.inc.yml
@@ -89,7 +89,7 @@
       id: ext-cache
       with:
         path: build/extensions
-        key: edb-ext-v5-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
+        key: edb-ext-v6-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
 
     - name: Handle cached PostgreSQL build
       uses: actions/cache@v4
@@ -195,7 +195,7 @@
       if: steps.ext-cache.outputs.cache-hit != 'true'
       with:
         path: ${{ env.BUILD_TEMP }}/edb
-        key: edb-ext-build-v3-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
+        key: edb-ext-build-v4-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
 
     - name: Build Cython extensions
       env:
@@ -377,7 +377,7 @@
       id: ext-cache
       with:
         path: build/extensions
-        key: edb-ext-v5-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
+        key: edb-ext-v6-${{ hashFiles('shared-artifacts/ext_cache_key.txt') }}
 
     - name: Restore compiled parsers cache
       uses: actions/cache@v4

diff --git a/.github/workflows/tests-ha.yml b/.github/workflows/tests-ha.yml
diff --git a/.github/workflows/tests-inplace.yml b/.github/workflows/tests-inplace.yml
diff --git a/.github/workflows/tests-managed-pg.yml b/.github/workflows/tests-managed-pg.yml
diff --git a/.github/workflows/tests-patches.yml b/.github/workflows/tests-patches.yml
diff --git a/.github/workflows/tests-pg-versions.yml b/.github/workflows/tests-pg-versions.yml
diff --git a/.github/workflows/tests-pool.yml b/.github/workflows/tests-pool.yml
diff --git a/.github/workflows/tests-reflection.yml b/.github/workflows/tests-reflection.yml
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
diff --git a/edb/server/protocol/auth_helpers.pxd b/edb/server/protocol/auth_helpers.pxd
@@ -18,7 +18,7 @@
 
 
 cdef extract_token_from_auth_data(bytes auth_data)
-cdef auth_jwt(tenant, str prefixed_token, str user, str dbname)
+cdef auth_jwt(tenant, prefixed_token, str user, str dbname)
 cdef _check_jwt_authz(tenant, claims, token_version, str user, str dbname)
 cdef _get_jwt_edb_scope(claims, claim)
 cdef scram_get_verifier(tenant, str user)

diff --git a/edb/server/protocol/auth_helpers.pyx b/edb/server/protocol/auth_helpers.pyx
@@ -39,7 +39,7 @@ cdef extract_token_from_auth_data(auth_data: bytes):
     return scheme.lower(), payload.strip()
 
 
-cdef auth_jwt(tenant, prefixed_token: str, user: str, dbname: str):
+cdef auth_jwt(tenant, prefixed_token: str | None, user: str, dbname: str):
     if not prefixed_token:
         raise errors.AuthenticationError(
             'authentication failed: no authorization data provided')

diff --git a/tests/test_server_auth.py b/tests/test_server_auth.py
@@ -406,6 +406,12 @@ async def test_server_auth_jwt_1(self):
             ''')
             await conn.aclose()
 
+            with self.assertRaisesRegex(
+                edgedb.AuthenticationError,
+                'authentication failed: no authorization data provided',
+            ):
+                await sd.connect()
+
             # bad secret keys
             with self.assertRaisesRegex(
                 edgedb.AuthenticationError,