Skip to content
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.

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

Invalidate user session on password reset #45139

Merged
merged 8 commits into from
Dec 22, 2024
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@

import airflow
from airflow.configuration import conf
from airflow.exceptions import AirflowConfigException
from airflow.www.app import isabs, make_url
from airflow.www.extensions.init_appbuilder import init_appbuilder
from airflow.www.extensions.init_session import init_airflow_session_interface
from airflow.www.extensions.init_views import init_plugins

if TYPE_CHECKING:
Expand All @@ -39,6 +42,7 @@ def _return_appbuilder(app: Flask) -> AirflowAppBuilder:
"""Return an appbuilder instance for the given app."""
init_appbuilder(app)
init_plugins(app)
init_airflow_session_interface(app)
return app.appbuilder # type: ignore[attr-defined]


Expand All @@ -50,4 +54,12 @@ def get_application_builder() -> Generator[AirflowAppBuilder, None, None]:
with flask_app.app_context():
# Enable customizations in webserver_config.py to be applied via Flask.current_app.
flask_app.config.from_pyfile(webserver_config, silent=True)
flask_app.config["SQLALCHEMY_DATABASE_URI"] = conf.get("database", "SQL_ALCHEMY_CONN")
url = make_url(flask_app.config["SQLALCHEMY_DATABASE_URI"])
if url.drivername == "sqlite" and url.database and not isabs(url.database):
raise AirflowConfigException(
f'Cannot use relative path: `{conf.get("database", "SQL_ALCHEMY_CONN")}` to connect to sqlite. '
shubhamraj-git marked this conversation as resolved.
Show resolved Hide resolved
potiuk marked this conversation as resolved.
Show resolved Hide resolved
"Please use absolute path such as `sqlite:////tmp/airflow.db`."
)
flask_app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
yield _return_appbuilder(flask_app)
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@ def reset_user_sessions(self, user: User) -> None:
session_details = interface.serializer.loads(want_bytes(s.data))
if session_details.get("_user_id") == user.id:
session.delete(s)
session.commit()
else:
self._cli_safe_flash(
"Since you are using `securecookie` session backend mechanism, we cannot prevent "
Expand Down
54 changes: 52 additions & 2 deletions providers/tests/fab/auth_manager/cli_commands/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,69 @@
# under the License.
from __future__ import annotations

import os

import pytest

import airflow
from airflow.configuration import conf
from airflow.exceptions import AirflowConfigException
from airflow.www.extensions.init_appbuilder import AirflowAppBuilder
from airflow.www.session import AirflowDatabaseSessionInterface

from tests_common.test_utils.compat import ignore_provider_compatibility_error
from tests_common.test_utils.config import conf_vars

with ignore_provider_compatibility_error("2.9.0+", __file__):
from airflow.providers.fab.auth_manager.cli_commands.utils import get_application_builder

from airflow.www.extensions.init_appbuilder import AirflowAppBuilder

pytestmark = pytest.mark.db_test


@pytest.fixture
def flask_app():
"""Fixture to set up the Flask app with the necessary configuration."""
# Get the webserver config file path
webserver_config = conf.get_mandatory_value("webserver", "config_file")

with get_application_builder() as appbuilder:
flask_app = appbuilder.app

# Load webserver configuration
flask_app.config.from_pyfile(webserver_config, silent=True)

yield flask_app


class TestCliUtils:
def test_get_application_builder(self):
"""Test that get_application_builder returns an AirflowAppBuilder instance."""
with get_application_builder() as appbuilder:
assert isinstance(appbuilder, AirflowAppBuilder)

def test_sqlalchemy_uri_configured(self, flask_app):
"""Test that the SQLALCHEMY_DATABASE_URI is correctly set in the Flask app."""
sqlalchemy_uri = conf.get("database", "SQL_ALCHEMY_CONN")

# Assert that the SQLAlchemy URI is correctly set
assert sqlalchemy_uri == flask_app.config["SQLALCHEMY_DATABASE_URI"]

def test_relative_path_sqlite_raises_exception(self):
"""Test that a relative SQLite path raises an AirflowConfigException."""
# Directly simulate the configuration for relative SQLite path
with conf_vars({("database", "SQL_ALCHEMY_CONN"): "sqlite://relative/path"}):
with pytest.raises(AirflowConfigException, match="Cannot use relative path"):
with get_application_builder():
pass

def test_static_folder_exists(self, flask_app):
"""Test that the static folder is correctly configured in the Flask app."""
static_folder = os.path.join(os.path.dirname(airflow.__file__), "www", "static")
assert flask_app.static_folder == static_folder

def test_database_auth_backend_in_session(self, flask_app):
"""Test that the database is used for session management when AUTH_BACKEND is set to 'database'."""
with get_application_builder() as appbuilder:
flask_app = appbuilder.app
# Ensure that the correct session interface is set (for 'database' auth backend)
assert isinstance(flask_app.session_interface, AirflowDatabaseSessionInterface)