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
4 changes: 3 additions & 1 deletion airflow-core/docs/core-concepts/auth-manager/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ delete the cookie.
from airflow.api_fastapi.auth.managers.base_auth_manager import COOKIE_NAME_JWT_TOKEN

response = RedirectResponse(url="/")
response.set_cookie(COOKIE_NAME_JWT_TOKEN, token, secure=True)

secure = conf.getboolean("api", "ssl_cert")
response.set_cookie(COOKIE_NAME_JWT_TOKEN, token, secure=secure)
return response

.. note::
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,12 @@ def create_token_all_admins() -> RedirectResponse:
)

response = RedirectResponse(url=conf.get("api", "base_url"))

secure = conf.getboolean("api", "ssl_cert")
response.set_cookie(
COOKIE_NAME_JWT_TOKEN,
get_auth_manager().generate_jwt(user),
secure=True,
secure=secure,
)
return response

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const Login = () => {
// Redirect to appropriate page with the token
const next = searchParams.get("next")

setCookie('_token', data.jwt_token, {path: "/", secure: true});
setCookie('_token', data.jwt_token, {path: "/", secure: globalThis.location.protocol !== "http:"});

globalThis.location.replace(`${next ?? ""}`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def test_create_token_invalid_user_password(self, test_client):
assert response.json()["detail"] == "Invalid credentials"

def test_create_token_all_admins(self, test_client):
with conf_vars({("core", "simple_auth_manager_all_admins"): "true"}):
with conf_vars({("core", "simple_auth_manager_all_admins"): "true", ("api", "ssl_cert"): "false"}):
response = test_client.get("/auth/token", follow_redirects=False)
assert response.status_code == 307
assert "location" in response.headers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ def login_callback(request: Request):
url = conf.get("api", "base_url")
token = get_auth_manager().generate_jwt(user)
response = RedirectResponse(url=url, status_code=303)
response.set_cookie(COOKIE_NAME_JWT_TOKEN, token, secure=True)

secure = conf.getboolean("api", "ssl_cert")
response.set_cookie(COOKIE_NAME_JWT_TOKEN, token, secure=secure)
return response


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def test_login_callback_successful(self):
"auth_manager",
): "airflow.providers.amazon.aws.auth_manager.aws_auth_manager.AwsAuthManager",
("aws_auth_manager", "saml_metadata_url"): SAML_METADATA_URL,
("api", "ssl_cert"): "false",
}
):
with (
Expand Down
2 changes: 1 addition & 1 deletion providers/fab/src/airflow/providers/fab/www/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def index(self):
token = get_auth_manager().generate_jwt(g.user)
response = make_response(redirect(f"{conf.get('api', 'base_url')}", code=302))

secure = bool(conf.get("api", "ssl_cert"))
secure = conf.getboolean("api", "ssl_cert")
response.set_cookie(COOKIE_NAME_JWT_TOKEN, token, secure=secure)

return response
Expand Down