Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
import json
import logging
from typing import cast
from urllib.parse import quote
from urllib.parse import quote, urljoin

from fastapi import Request # noqa: TC002
from fastapi.responses import HTMLResponse, RedirectResponse

from airflow.api_fastapi.app import get_auth_manager
from airflow.api_fastapi.app import AUTH_MANAGER_FASTAPI_APP_PREFIX, get_auth_manager
from airflow.api_fastapi.auth.managers.base_auth_manager import COOKIE_NAME_JWT_TOKEN
from airflow.providers.keycloak.version_compat import AIRFLOW_V_3_1_1_PLUS

Expand Down Expand Up @@ -110,7 +110,8 @@
end_session_endpoint = keycloak_config["end_session_endpoint"]

id_token = request.cookies.get(COOKIE_NAME_ID_TOKEN)
post_logout_redirect_uri = request.url_for("logout_callback")
base_url = conf.get("api", "base_url", fallback="/")
post_logout_redirect_uri = urljoin(base_url, f"{AUTH_MANAGER_FASTAPI_APP_PREFIX}/logout_callback")

if id_token:
encoded_id_token = quote(id_token, safe="")
Expand All @@ -128,7 +129,7 @@
def logout_callback(request: Request):
"""
Complete the log-out.

Check warning

Code scanning / CodeQL

URL redirection from remote source Medium

Untrusted URL redirection depends on a
user-provided value
.
This callback is redirected by Keycloak after the user has been logged out from Keycloak.
"""
login_url = get_auth_manager().get_url_login()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ def test_login_callback_without_code(self, client):
@pytest.mark.parametrize(
("id_token", "logout_callback_url"),
[
(None, "http://testserver/auth/logout_callback"),
(None, "/auth/logout_callback"),
(
"id_token",
"logout_url?post_logout_redirect_uri=http://testserver/auth/logout_callback&id_token_hint=id_token",
"logout_url?post_logout_redirect_uri=/auth/logout_callback&id_token_hint=id_token",
),
],
)
Expand Down