Skip to content

Handle invalid token in JWTRefreshMiddleware #56904

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
vincbeck merged 1 commit into from
Oct 20, 2025
Merged

Handle invalid token in JWTRefreshMiddleware #56904

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
7 changes: 5 additions & 2 deletions airflow-core/src/airflow/api_fastapi/auth/middlewares/refresh_token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
from __future__ import annotations

from fastapi import Request
from fastapi import HTTPException, Request
from starlette.middleware.base import BaseHTTPMiddleware

from airflow.api_fastapi.app import get_auth_manager
Expand Down Expand Up @@ -64,5 +64,8 @@ async def dispatch(self, request: Request, call_next):

@staticmethod
async def _refresh_user(current_token: str) -> BaseUser | None:
user = await resolve_user_from_token(current_token)
try:
user = await resolve_user_from_token(current_token)
except HTTPException:
return None
return get_auth_manager().refresh_user(user=user)
14 changes: 13 additions & 1 deletion airflow-core/tests/unit/api_fastapi/auth/middlewares/test_refresh_token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from unittest.mock import AsyncMock, MagicMock, patch

import pytest
from fastapi import Request, Response
from fastapi import HTTPException, Request, Response

from airflow.api_fastapi.auth.managers.base_auth_manager import COOKIE_NAME_JWT_TOKEN
from airflow.api_fastapi.auth.managers.models.base_user import BaseUser
Expand Down Expand Up @@ -72,6 +72,18 @@ async def test_dispatch_no_refreshed_token(
mock_resolve_user_from_token.assert_called_once_with("valid_token")
mock_auth_manager.generate_jwt.assert_not_called()

@patch("airflow.api_fastapi.auth.middlewares.refresh_token.resolve_user_from_token")
@pytest.mark.asyncio
async def test_dispatch_expired_token(self, mock_resolve_user_from_token, middleware, mock_request):
mock_request.cookies = {COOKIE_NAME_JWT_TOKEN: "invalid_token"}
mock_resolve_user_from_token.side_effect = HTTPException(status_code=403)

call_next = AsyncMock(return_value=Response())
await middleware.dispatch(mock_request, call_next)

call_next.assert_called_once_with(mock_request)
mock_resolve_user_from_token.assert_called_once_with("invalid_token")

@pytest.mark.asyncio
@patch("airflow.api_fastapi.auth.middlewares.refresh_token.get_auth_manager")
@patch("airflow.api_fastapi.auth.middlewares.refresh_token.resolve_user_from_token")
Expand Down
Loading