Move is_active user property to FAB auth manager (#42042)

airflow/auth/managers/models/base_user.py

@@ -23,10 +23,6 @@
 class BaseUser:
     """User model interface."""
 
-    @property
-    def is_active(self) -> bool:
-        return True
-
     @abstractmethod
     def get_id(self) -> str: ...
 

airflow/providers/fab/auth_manager/fab_auth_manager.py

@@ -179,7 +179,8 @@ def init(self) -> None:
 
     def is_logged_in(self) -> bool:
         """Return whether the user is logged in."""
-        return not self.get_user().is_anonymous
+        user = self.get_user()
+        return not user.is_anonymous and user.is_active
 
     def is_authorized_configuration(
         self,

airflow/www/app.py

@@ -46,7 +46,6 @@
 from airflow.www.extensions.init_security import (
     init_api_auth,
     init_cache_control,
-    init_check_user_active,
     init_xframe_protection,
 )
 from airflow.www.extensions.init_session import init_airflow_session_interface
@@ -176,7 +175,6 @@ def create_app(config=None, testing=False):
         init_xframe_protection(flask_app)
         init_cache_control(flask_app)
         init_airflow_session_interface(flask_app)
-        init_check_user_active(flask_app)
     return flask_app
 
 

airflow/www/extensions/init_security.py

@@ -19,11 +19,8 @@
 import logging
 from importlib import import_module
 
-from flask import redirect, request
-
 from airflow.configuration import conf
 from airflow.exceptions import AirflowConfigException, AirflowException
-from airflow.www.extensions.init_auth_manager import get_auth_manager
 
 log = logging.getLogger(__name__)
 
@@ -73,13 +70,3 @@ def apply_cache_control(response):
         return response
 
     app.after_request(apply_cache_control)
-
-
-def init_check_user_active(app):
-    @app.before_request
-    def check_user_active():
-        url_logout = get_auth_manager().get_url_logout()
-        if request.path == url_logout:
-            return
-        if get_auth_manager().is_logged_in() and not get_auth_manager().get_user().is_active:
-            return redirect(url_logout)

newsfragments/42042.significant.rst

@@ -0,0 +1 @@
+Removed ``is_active`` property from ``BaseUser``. This property is longer used.

tests/providers/fab/auth_manager/test_fab_auth_manager.py

@@ -128,6 +128,15 @@ def test_is_logged_in(self, mock_get_user, auth_manager):
 
         assert auth_manager.is_logged_in() is False
 
+    @mock.patch.object(FabAuthManager, "get_user")
+    def test_is_logged_in_with_inactive_user(self, mock_get_user, auth_manager):
+        user = Mock()
+        user.is_anonymous.return_value = False
+        user.is_active.return_value = True
+        mock_get_user.return_value = user
+
+        assert auth_manager.is_logged_in() is False
+
     @pytest.mark.parametrize(
         "api_name, method, user_permissions, expected_result",
         chain(

tests/test_utils/decorators.py

@@ -45,7 +45,6 @@ def no_op(*args, **kwargs):
             "init_xframe_protection",
             "init_airflow_session_interface",
             "init_appbuilder",
-            "init_check_user_active",
         ]
 
         @functools.wraps(f)

tests/www/views/conftest.py

@@ -59,7 +59,6 @@ def app(examples_dag_bag):
             "init_jinja_globals",
             "init_plugins",
             "init_airflow_session_interface",
-            "init_check_user_active",
         ]
     )
     def factory():

tests/www/views/test_views_rate_limit.py

@@ -39,7 +39,6 @@ def app_with_rate_limit_one(examples_dag_bag):
             "init_jinja_globals",
             "init_plugins",
             "init_airflow_session_interface",
-            "init_check_user_active",
         ]
     )
     def factory():