Skip to content

Commit e5cb168

Browse files
authored
Fix duplicated SQLAlchemy sessions caused transactions fail to close (#57815)
1 parent 8d0131c commit e5cb168

3 files changed

Lines changed: 26 additions & 25 deletions

File tree

‎providers/fab/src/airflow/providers/fab/auth_manager/api_fastapi/routes/login.py‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
from airflow.configuration import conf
2828
from airflow.providers.fab.auth_manager.api_fastapi.datamodels.login import LoginBody, LoginResponse
2929
from airflow.providers.fab.auth_manager.api_fastapi.services.login import FABAuthManagerLogin
30-
from airflow.providers.fab.auth_manager.cli_commands.utils import get_application_builder
3130

3231
login_router = AirflowRouter(tags=["FabAuthManager"])
3332

@@ -40,8 +39,7 @@
4039
)
4140
def create_token(body: LoginBody) -> LoginResponse:
4241
"""Generate a new API token."""
43-
with get_application_builder():
44-
return FABAuthManagerLogin.create_token(body=body)
42+
return FABAuthManagerLogin.create_token(body=body)
4543

4644

4745
@login_router.post(
@@ -52,10 +50,9 @@ def create_token(body: LoginBody) -> LoginResponse:
5250
)
5351
def create_token_cli(body: LoginBody) -> LoginResponse:
5452
"""Generate a new CLI API token."""
55-
with get_application_builder():
56-
return FABAuthManagerLogin.create_token(
57-
body=body, expiration_time_in_seconds=conf.getint("api_auth", "jwt_cli_expiration_time")
58-
)
53+
return FABAuthManagerLogin.create_token(
54+
body=body, expiration_time_in_seconds=conf.getint("api_auth", "jwt_cli_expiration_time")
55+
)
5956

6057

6158
@login_router.get(
@@ -64,18 +61,17 @@ def create_token_cli(body: LoginBody) -> LoginResponse:
6461
)
6562
def logout(request: Request) -> RedirectResponse:
6663
"""Generate a new API token."""
67-
with get_application_builder():
68-
login_url = get_auth_manager().get_url_login()
69-
secure = request.base_url.scheme == "https" or bool(conf.get("api", "ssl_cert", fallback=""))
70-
response = RedirectResponse(login_url)
71-
response.delete_cookie(
72-
key="session",
73-
secure=secure,
74-
httponly=True,
75-
)
76-
response.delete_cookie(
77-
key=COOKIE_NAME_JWT_TOKEN,
78-
secure=secure,
79-
httponly=True,
80-
)
81-
return response
64+
login_url = get_auth_manager().get_url_login()
65+
secure = request.base_url.scheme == "https" or bool(conf.get("api", "ssl_cert", fallback=""))
66+
response = RedirectResponse(login_url)
67+
response.delete_cookie(
68+
key="session",
69+
secure=secure,
70+
httponly=True,
71+
)
72+
response.delete_cookie(
73+
key=COOKIE_NAME_JWT_TOKEN,
74+
secure=secure,
75+
httponly=True,
76+
)
77+
return response

‎providers/fab/src/airflow/providers/fab/www/app.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from airflow.configuration import conf
3131
from airflow.exceptions import AirflowConfigException
3232
from airflow.logging_config import configure_logging
33-
from airflow.providers.fab.www.extensions.init_appbuilder import init_appbuilder
33+
from airflow.providers.fab.www.extensions.init_appbuilder import AirflowAppBuilder
3434
from airflow.providers.fab.www.extensions.init_jinja_globals import init_jinja_globals
3535
from airflow.providers.fab.www.extensions.init_manifest_files import configure_manifest_files
3636
from airflow.providers.fab.www.extensions.init_security import init_api_auth
@@ -94,7 +94,12 @@ def create_app(enable_plugins: bool):
9494
init_api_auth(flask_app)
9595

9696
with flask_app.app_context():
97-
init_appbuilder(flask_app, enable_plugins=enable_plugins)
97+
AirflowAppBuilder(
98+
app=flask_app,
99+
session=db.session,
100+
base_template="airflow/main.html",
101+
enable_plugins=enable_plugins,
102+
)
98103
init_error_handlers(flask_app)
99104
# In two scenarios a Flask application can be created:
100105
# - To support Airflow 2 plugins relying on Flask (``enable_plugins`` is True)

‎providers/fab/www-hash.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c45890ac6b17386adfb076a4baec17589a26aab189d6257a92138aaa720fbc7f
1+
cc109e95a25c1bb018a85a6a40859234398d5a9ac5bf317197eed3e3ece64b0d

0 commit comments

Comments
 (0)