apache-airflow-providers-fab 1.4.1rc1__tar.gz → 1.5.0rc1__tar.gz

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apache-airflow-providers-fab
-Version: 1.4.1rc1
+Version: 1.5.0rc1
 Summary: Provider package apache-airflow-providers-fab for Apache Airflow
 Keywords: airflow-provider,fab,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -20,9 +20,9 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow-providers-common-compat>=1.2.0rc0
+Requires-Dist: apache-airflow-providers-common-compat>=1.2.1rc0
 Requires-Dist: apache-airflow>=2.9.0rc0
-Requires-Dist: flask-appbuilder==4.5.0
+Requires-Dist: flask-appbuilder==4.5.2
 Requires-Dist: flask-login>=0.6.2
 Requires-Dist: flask>=2.2,<2.3
 Requires-Dist: google-re2>=1.0
@@ -30,8 +30,8 @@ Requires-Dist: jmespath>=0.7.0
 Requires-Dist: apache-airflow-providers-common-compat ; extra == "common.compat"
 Requires-Dist: kerberos>=1.3.0 ; extra == "kerberos"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-fab/1.4.1/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-fab/1.4.1
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-fab/1.5.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-fab/1.5.0
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Twitter, https://twitter.com/ApacheAirflow
@@ -83,7 +83,7 @@ Provides-Extra: kerberos
 
 Package ``apache-airflow-providers-fab``
 
-Release: ``1.4.1.rc1``
+Release: ``1.5.0.rc1``
 
 
 `Flask App Builder <https://flask-appbuilder.readthedocs.io/>`__
@@ -96,7 +96,7 @@ This is a provider package for ``fab`` provider. All classes for this provider p
 are in ``airflow.providers.fab`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-fab/1.4.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-fab/1.5.0/>`_.
 
 Installation
 ------------
@@ -114,9 +114,9 @@ Requirements
 PIP package                                 Version required
 ==========================================  ==================
 ``apache-airflow``                          ``>=2.9.0``
-``apache-airflow-providers-common-compat``  ``>=1.2.0``
+``apache-airflow-providers-common-compat``  ``>=1.2.1``
 ``flask``                                   ``>=2.2,<2.3``
-``flask-appbuilder``                        ``==4.5.0``
+``flask-appbuilder``                        ``==4.5.2``
 ``flask-login``                             ``>=0.6.2``
 ``google-re2``                              ``>=1.0``
 ``jmespath``                                ``>=0.7.0``
@@ -142,4 +142,4 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-fab/1.4.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-fab/1.5.0/changelog.html>`_.

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/README.rst

@@ -42,7 +42,7 @@
 
 Package ``apache-airflow-providers-fab``
 
-Release: ``1.4.1.rc1``
+Release: ``1.5.0.rc1``
 
 
 `Flask App Builder <https://flask-appbuilder.readthedocs.io/>`__
@@ -55,7 +55,7 @@ This is a provider package for ``fab`` provider. All classes for this provider p
 are in ``airflow.providers.fab`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-fab/1.4.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-fab/1.5.0/>`_.
 
 Installation
 ------------
@@ -73,9 +73,9 @@ Requirements
 PIP package                                 Version required
 ==========================================  ==================
 ``apache-airflow``                          ``>=2.9.0``
-``apache-airflow-providers-common-compat``  ``>=1.2.0``
+``apache-airflow-providers-common-compat``  ``>=1.2.1``
 ``flask``                                   ``>=2.2,<2.3``
-``flask-appbuilder``                        ``==4.5.0``
+``flask-appbuilder``                        ``==4.5.2``
 ``flask-login``                             ``>=0.6.2``
 ``google-re2``                              ``>=1.0``
 ``jmespath``                                ``>=0.7.0``
@@ -101,4 +101,4 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-fab/1.4.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-fab/1.5.0/changelog.html>`_.

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/airflow/providers/fab/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "1.4.1"
+__version__ = "1.5.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.9.0"

apache_airflow_providers_fab-1.5.0rc1/airflow/providers/fab/auth_manager/api/auth/backend/session.py

@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""Session authentication backend."""
+
+from __future__ import annotations
+
+from functools import wraps
+from typing import Any, Callable, TypeVar, cast
+
+from flask import Response
+
+from airflow.www.extensions.init_auth_manager import get_auth_manager
+
+CLIENT_AUTH: tuple[str, str] | Any | None = None
+
+
+def init_app(_):
+    """Initialize authentication backend."""
+
+
+T = TypeVar("T", bound=Callable)
+
+
+def requires_authentication(function: T):
+    """Decorate functions that require authentication."""
+
+    @wraps(function)
+    def decorated(*args, **kwargs):
+        if not get_auth_manager().is_logged_in():
+            return Response("Unauthorized", 401, {})
+        return function(*args, **kwargs)
+
+    return cast(T, decorated)

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/airflow/providers/fab/auth_manager/api_endpoints/role_and_permission_endpoint.py

@@ -26,15 +26,15 @@ from sqlalchemy import asc, desc, func, select
 
 from airflow.api_connexion.exceptions import AlreadyExists, BadRequest, NotFound
 from airflow.api_connexion.parameters import check_limit, format_parameters
-from airflow.api_connexion.schemas.role_and_permission_schema import (
+from airflow.api_connexion.security import requires_access_custom_view
+from airflow.providers.fab.auth_manager.models import Action, Role
+from airflow.providers.fab.auth_manager.schemas.role_and_permission_schema import (
     ActionCollection,
     RoleCollection,
     action_collection_schema,
     role_collection_schema,
     role_schema,
 )
-from airflow.api_connexion.security import requires_access_custom_view
-from airflow.providers.fab.auth_manager.models import Action, Role
 from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride
 from airflow.security import permissions
 from airflow.www.extensions.init_auth_manager import get_auth_manager

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/airflow/providers/fab/auth_manager/api_endpoints/user_endpoint.py

@@ -27,14 +27,14 @@ from werkzeug.security import generate_password_hash
 
 from airflow.api_connexion.exceptions import AlreadyExists, BadRequest, NotFound, Unknown
 from airflow.api_connexion.parameters import check_limit, format_parameters
-from airflow.api_connexion.schemas.user_schema import (
+from airflow.api_connexion.security import requires_access_custom_view
+from airflow.providers.fab.auth_manager.models import User
+from airflow.providers.fab.auth_manager.schemas.user_schema import (
     UserCollection,
     user_collection_item_schema,
     user_collection_schema,
     user_schema,
 )
-from airflow.api_connexion.security import requires_access_custom_view
-from airflow.providers.fab.auth_manager.models import User
 from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride
 from airflow.security import permissions
 from airflow.www.extensions.init_auth_manager import get_auth_manager

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/airflow/providers/fab/auth_manager/fab_auth_manager.py

@@ -96,10 +96,7 @@ if TYPE_CHECKING:
     from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride
     from airflow.security.permissions import RESOURCE_ASSET
 else:
-    try:
-        from airflow.security.permissions import RESOURCE_ASSET
-    except ImportError:
-        from airflow.security.permissions import RESOURCE_DATASET as RESOURCE_ASSET
+    from airflow.providers.common.compat.security.permissions import RESOURCE_ASSET
 
 
 _MAP_DAG_ACCESS_ENTITY_TO_FAB_RESOURCE_TYPE: dict[DagAccessEntity, tuple[str, ...]] = {

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/airflow/providers/fab/auth_manager/models/db.py

@@ -16,16 +16,15 @@
 # under the License.
 from __future__ import annotations
 
-import os
+from pathlib import Path
 
-import airflow
 from airflow import settings
 from airflow.exceptions import AirflowException
 from airflow.providers.fab.auth_manager.models import metadata
 from airflow.utils.db import _offline_migration, print_happy_cat
 from airflow.utils.db_manager import BaseDBManager
 
-PACKAGE_DIR = os.path.dirname(airflow.__file__)
+PACKAGE_DIR = Path(__file__).parents[2]
 
 _REVISION_HEADS_MAP: dict[str, str] = {
     "1.4.0": "6709f7a774b9",
@@ -37,8 +36,8 @@ class FABDBManager(BaseDBManager):
 
     metadata = metadata
     version_table_name = "alembic_version_fab"
-    migration_dir = os.path.join(PACKAGE_DIR, "providers/fab/migrations")
-    alembic_file = os.path.join(PACKAGE_DIR, "providers/fab/alembic.ini")
+    migration_dir = (PACKAGE_DIR / "migrations").as_posix()
+    alembic_file = (PACKAGE_DIR / "alembic.ini").as_posix()
     supports_table_dropping = True
 
     def upgradedb(self, to_revision=None, from_revision=None, show_sql_only=False):

apache_airflow_providers_fab-1.5.0rc1/airflow/providers/fab/auth_manager/schemas/role_and_permission_schema.py

@@ -0,0 +1,103 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from typing import NamedTuple
+
+from marshmallow import Schema, fields
+from marshmallow_sqlalchemy import SQLAlchemySchema, auto_field
+
+from airflow.providers.fab.auth_manager.models import Action, Permission, Resource, Role
+
+
+class ActionSchema(SQLAlchemySchema):
+    """Action Schema."""
+
+    class Meta:
+        """Meta."""
+
+        model = Action
+
+    name = auto_field()
+
+
+class ResourceSchema(SQLAlchemySchema):
+    """View menu Schema."""
+
+    class Meta:
+        """Meta."""
+
+        model = Resource
+
+    name = auto_field()
+
+
+class ActionCollection(NamedTuple):
+    """Action Collection."""
+
+    actions: list[Action]
+    total_entries: int
+
+
+class ActionCollectionSchema(Schema):
+    """Permissions list schema."""
+
+    actions = fields.List(fields.Nested(ActionSchema))
+    total_entries = fields.Int()
+
+
+class ActionResourceSchema(SQLAlchemySchema):
+    """Action View Schema."""
+
+    class Meta:
+        """Meta."""
+
+        model = Permission
+
+    action = fields.Nested(ActionSchema, data_key="action")
+    resource = fields.Nested(ResourceSchema, data_key="resource")
+
+
+class RoleSchema(SQLAlchemySchema):
+    """Role item schema."""
+
+    class Meta:
+        """Meta."""
+
+        model = Role
+
+    name = auto_field()
+    permissions = fields.List(fields.Nested(ActionResourceSchema), data_key="actions")
+
+
+class RoleCollection(NamedTuple):
+    """List of roles."""
+
+    roles: list[Role]
+    total_entries: int
+
+
+class RoleCollectionSchema(Schema):
+    """List of roles."""
+
+    roles = fields.List(fields.Nested(RoleSchema))
+    total_entries = fields.Int()
+
+
+role_schema = RoleSchema()
+role_collection_schema = RoleCollectionSchema()
+action_collection_schema = ActionCollectionSchema()

apache_airflow_providers_fab-1.5.0rc1/airflow/providers/fab/auth_manager/schemas/user_schema.py

@@ -0,0 +1,73 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from typing import NamedTuple
+
+from marshmallow import Schema, fields
+from marshmallow_sqlalchemy import SQLAlchemySchema, auto_field
+
+from airflow.api_connexion.parameters import validate_istimezone
+from airflow.providers.fab.auth_manager.models import User
+from airflow.providers.fab.auth_manager.schemas.role_and_permission_schema import RoleSchema
+
+
+class UserCollectionItemSchema(SQLAlchemySchema):
+    """user collection item schema."""
+
+    class Meta:
+        """Meta."""
+
+        model = User
+        dateformat = "iso"
+
+    first_name = auto_field()
+    last_name = auto_field()
+    username = auto_field()
+    active = auto_field(dump_only=True)
+    email = auto_field()
+    last_login = auto_field(dump_only=True)
+    login_count = auto_field(dump_only=True)
+    fail_login_count = auto_field(dump_only=True)
+    roles = fields.List(fields.Nested(RoleSchema, only=("name",)))
+    created_on = auto_field(validate=validate_istimezone, dump_only=True)
+    changed_on = auto_field(validate=validate_istimezone, dump_only=True)
+
+
+class UserSchema(UserCollectionItemSchema):
+    """User schema."""
+
+    password = auto_field(load_only=True)
+
+
+class UserCollection(NamedTuple):
+    """User collection."""
+
+    users: list[User]
+    total_entries: int
+
+
+class UserCollectionSchema(Schema):
+    """User collection schema."""
+
+    users = fields.List(fields.Nested(UserCollectionItemSchema))
+    total_entries = fields.Int()
+
+
+user_collection_item_schema = UserCollectionItemSchema()
+user_schema = UserSchema()
+user_collection_schema = UserCollectionSchema()

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/airflow/providers/fab/auth_manager/security_manager/override.py

@@ -117,10 +117,7 @@ if TYPE_CHECKING:
     from airflow.auth.managers.base_auth_manager import ResourceMethod
     from airflow.security.permissions import RESOURCE_ASSET
 else:
-    try:
-        from airflow.security.permissions import RESOURCE_ASSET
-    except ImportError:
-        from airflow.security.permissions import RESOURCE_DATASET as RESOURCE_ASSET
+    from airflow.providers.common.compat.security.permissions import RESOURCE_ASSET
 
 log = logging.getLogger(__name__)
 
@@ -1110,7 +1107,7 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
     def sync_perm_for_dag(
         self,
         dag_id: str,
-        access_control: dict[str, dict[str, Collection[str]]] | None = None,
+        access_control: dict[str, dict[str, Collection[str]] | Collection[str]] | None = None,
     ) -> None:
         """
         Sync permissions for given dag id.
@@ -1152,7 +1149,7 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
     def _sync_dag_view_permissions(
         self,
         dag_id: str,
-        access_control: dict[str, dict[str, Collection[str]]],
+        access_control: dict[str, dict[str, Collection[str]] | Collection[str]],
     ) -> None:
         """
         Set the access policy on the given DAG's ViewModel.
@@ -1178,7 +1175,13 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
                 for perm in existing_dag_perms:
                     non_admin_roles = [role for role in perm.role if role.name != "Admin"]
                     for role in non_admin_roles:
-                        target_perms_for_role = access_control.get(role.name, {}).get(resource_name, set())
+                        access_control_role = access_control.get(role.name)
+                        target_perms_for_role = set()
+                        if access_control_role:
+                            if isinstance(access_control_role, set):
+                                target_perms_for_role = access_control_role
+                            elif isinstance(access_control_role, dict):
+                                target_perms_for_role = access_control_role.get(resource_name, set())
                         if perm.action.name not in target_perms_for_role:
                             self.log.info(
                                 "Revoking '%s' on DAG '%s' for role '%s'",
@@ -1197,7 +1200,7 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
                     f"'{rolename}', but that role does not exist"
                 )
 
-            if isinstance(resource_actions, (set, list)):
+            if not isinstance(resource_actions, dict):
                 # Support for old-style access_control where only the actions are specified
                 resource_actions = {permissions.RESOURCE_DAG: set(resource_actions)}
 

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/airflow/providers/fab/get_provider_info.py

@@ -28,8 +28,9 @@ def get_provider_info():
         "name": "Fab",
         "description": "`Flask App Builder <https://flask-appbuilder.readthedocs.io/>`__\n",
         "state": "ready",
-        "source-date-epoch": 1728485088,
+        "source-date-epoch": 1730012648,
         "versions": [
+            "1.5.0",
             "1.4.1",
             "1.4.0",
             "1.3.0",
@@ -46,9 +47,9 @@ def get_provider_info():
         ],
         "dependencies": [
             "apache-airflow>=2.9.0",
-            "apache-airflow-providers-common-compat>=1.2.0",
+            "apache-airflow-providers-common-compat>=1.2.1",
             "flask>=2.2,<2.3",
-            "flask-appbuilder==4.5.0",
+            "flask-appbuilder==4.5.2",
             "flask-login>=0.6.2",
             "google-re2>=1.0",
             "jmespath>=0.7.0",

apache_airflow_providers_fab-1.5.0rc1/airflow/providers/fab/migrations/versions/__init__.py

@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.

{apache_airflow_providers_fab-1.4.1rc1 → apache_airflow_providers_fab-1.5.0rc1}/pyproject.toml

@@ -28,7 +28,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-fab"
-version = "1.4.1.rc1"
+version = "1.5.0.rc1"
 description = "Provider package apache-airflow-providers-fab for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -55,9 +55,9 @@ classifiers = [
 ]
 requires-python = "~=3.9"
 dependencies = [
-    "apache-airflow-providers-common-compat>=1.2.0rc0",
+    "apache-airflow-providers-common-compat>=1.2.1rc0",
     "apache-airflow>=2.9.0rc0",
-    "flask-appbuilder==4.5.0",
+    "flask-appbuilder==4.5.2",
     "flask-login>=0.6.2",
     "flask>=2.2,<2.3",
     "google-re2>=1.0",
@@ -65,8 +65,8 @@ dependencies = [
 ]
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-fab/1.4.1"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-fab/1.4.1/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-fab/1.5.0"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-fab/1.5.0/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"