apache-airflow-providers-fab 2.0.2rc1__tar.gz → 2.0.2rc2__tar.gz

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-fab
-Version: 2.0.2rc1
+Version: 2.0.2rc2
 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>
@@ -22,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
 License-File: 3rd-party-licenses/LICENSES-ui.txt
 License-File: NOTICE
-Requires-Dist: apache-airflow>=3.0.0rc0
-Requires-Dist: apache-airflow-providers-common-compat>=1.2.1rc0
+Requires-Dist: apache-airflow>=3.0.0rc1
+Requires-Dist: apache-airflow-providers-common-compat>=1.2.1rc1
 Requires-Dist: blinker>=1.6.2
 Requires-Dist: flask>=2.2.1,<2.3
 Requires-Dist: flask-appbuilder==4.5.3

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/docs/changelog.rst

@@ -27,6 +27,7 @@ Bug Fixes
 ~~~~~~~~~
 
 * ``Add read config permission to viewer role in 'FabAuthManager' (#49581)``
+* ``Fix infinite redirect in FAB AuthManager caused by mistakenly setting token cookie as secure (#49724)``
 
 Misc
 ~~~~
@@ -34,6 +35,7 @@ Misc
 * ``Remove some lingering subdag references (#49663)``
 * ``Bump stylelint (#49638)``
 * ``Bump the fab-ui-package-updates group across 1 directory with 2 updates (#49511)``
+* ``Remove old dynamic attr accessing re dag resource in FAB provider (#49669)``
 
 Doc-only
 ~~~~~~~~
@@ -44,6 +46,8 @@ Doc-only
 .. Below changes are excluded from the changelog. Move them to
    appropriate section above if needed. Do not delete the lines(!):
    * ``capitalize the term airflow (#49450)``
+   * ``Bump the fab-ui-package-updates group across 1 directory with 2 updates (#49792)``
+   * ``Prepare docs for Apr ad hoc release of fab and common.compat providers (#49690)``
 
 2.0.1
 .....

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/docs/commits.rst

@@ -37,11 +37,15 @@ For high-level changelog, see :doc:`package information including changelog <ind
 2.0.2
 .....
 
-Latest change: 2025-04-23
+Latest change: 2025-04-25
 
-==================================================================================================  ===========  ====================================================================================
+==================================================================================================  ===========  =========================================================================================================
 Commit                                                                                              Committed    Subject
-==================================================================================================  ===========  ====================================================================================
+==================================================================================================  ===========  =========================================================================================================
+`36c8975522 <https://github.com/apache/airflow/commit/36c8975522a9241605ff34d0d78daa26f02a360b>`__  2025-04-25   ``Bump the fab-ui-package-updates group across 1 directory with 2 updates (#49792)``
+`e3c221d135 <https://github.com/apache/airflow/commit/e3c221d13577b1fbd3d6c54267d50ee11a4ab62e>`__  2025-04-24   ``Remove old dynamic attr accessing re dag resource in FAB provider (#49669)``
+`8ad08fa075 <https://github.com/apache/airflow/commit/8ad08fa075ee23f891339fa237a093ea5e52f49c>`__  2025-04-24   ``Fix infinite redirect in FAB AuthManager caused by mistakenly setting token cookie as secure (#49724)``
+`c14b3c7407 <https://github.com/apache/airflow/commit/c14b3c74078e523a1623ab461213ec07a3bfac62>`__  2025-04-24   ``Prepare docs for Apr ad hoc release of fab and common.compat providers (#49690)``
 `b01e534195 <https://github.com/apache/airflow/commit/b01e534195fff5dea03d000051e6469b83852f6c>`__  2025-04-23   ``Remove some lingering subdag references (#49663)``
 `d2755fc52e <https://github.com/apache/airflow/commit/d2755fc52e13db4816fa69409c16ac777b5f7c9f>`__  2025-04-23   ``Bump stylelint (#49638)``
 `998f70036b <https://github.com/apache/airflow/commit/998f70036b919a434edd086c0233991c5ff1c736>`__  2025-04-23   ``Add read config permission to viewer role in 'FabAuthManager' (#49581)``
@@ -49,7 +53,7 @@ Commit
 `5595ded129 <https://github.com/apache/airflow/commit/5595ded129e00553df0af735e2513f996b1b524d>`__  2025-04-22   ``Bump the fab-ui-package-updates group across 1 directory with 2 updates (#49511)``
 `223a741869 <https://github.com/apache/airflow/commit/223a741869505ad31c38310f307bf2f0f0f193fb>`__  2025-04-19   ``capitalize the term airflow (#49450)``
 `f65eeb05f4 <https://github.com/apache/airflow/commit/f65eeb05f48d9ad67cdbbeb81a5db085c519aaba>`__  2025-04-18   ``Add note in FAB migration doc (#49423)``
-==================================================================================================  ===========  ====================================================================================
+==================================================================================================  ===========  =========================================================================================================
 
 2.0.1
 .....

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-fab"
-version = "2.0.2.rc1"
+version = "2.0.2rc2"
 description = "Provider package apache-airflow-providers-fab for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -57,8 +57,8 @@ license-files = ["NOTICE", "*/LICENSE*"]
 # Make sure to run ``breeze static-checks --type update-providers-dependencies --all-files``
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
-    "apache-airflow>=3.0.0rc0",
-    "apache-airflow-providers-common-compat>=1.2.1rc0",
+    "apache-airflow>=3.0.0rc1",
+    "apache-airflow-providers-common-compat>=1.2.1rc1",
     # Blinker use for signals in Flask, this is an optional dependency in Flask 2.2 and lower.
     # In Flask 2.3 it becomes a mandatory dependency, and flask signals are always available.
     "blinker>=1.6.2",

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/src/airflow/providers/fab/auth_manager/fab_auth_manager.py

@@ -566,7 +566,7 @@ class FabAuthManager(BaseAuthManager[User]):
 
         if details and details.id:
             # Check whether the user has permissions to access a specific DAG
-            resource_dag_name = self._resource_name(details.id, RESOURCE_DAG)
+            resource_dag_name = permissions.resource_name(details.id, RESOURCE_DAG)
             return self._is_authorized(method=method, resource_type=resource_dag_name, user=user)
 
         return False
@@ -592,7 +592,7 @@ class FabAuthManager(BaseAuthManager[User]):
 
         if details and details.id:
             # Check whether the user has permissions to access a specific DAG Run permission on a DAG Level
-            resource_dag_name = self._resource_name(details.id, RESOURCE_DAG_RUN)
+            resource_dag_name = permissions.resource_name(details.id, RESOURCE_DAG_RUN)
             return self._is_authorized(method=method, resource_type=resource_dag_name, user=user)
 
         return False
@@ -624,19 +624,6 @@ class FabAuthManager(BaseAuthManager[User]):
             raise AirflowException(f"Unknown DAG access entity: {dag_access_entity}")
         return _MAP_DAG_ACCESS_ENTITY_TO_FAB_RESOURCE_TYPE[dag_access_entity]
 
-    def _resource_name(self, dag_id: str, resource_type: str) -> str:
-        """
-        Return the FAB resource name for a DAG id.
-
-        :param dag_id: the DAG id
-
-        :meta private:
-        """
-        root_dag_id = self._get_root_dag_id(dag_id)
-        if hasattr(permissions, "resource_name"):
-            return getattr(permissions, "resource_name")(root_dag_id, resource_type)
-        return getattr(permissions, "resource_name_for_dag")(root_dag_id)
-
     @staticmethod
     def _get_user_permissions(user: User):
         """
@@ -651,23 +638,6 @@ class FabAuthManager(BaseAuthManager[User]):
             return []
         return getattr(user, "perms") or []
 
-    def _get_root_dag_id(self, dag_id: str) -> str:
-        """
-        Return the root DAG id in case of sub DAG, return the DAG id otherwise.
-
-        :param dag_id: the DAG id
-
-        :meta private:
-        """
-        if not self.appbuilder:
-            raise AirflowException("AppBuilder is not initialized.")
-
-        if "." in dag_id and hasattr(DagModel, "root_dag_id"):
-            return self.appbuilder.get_session.scalar(
-                select(DagModel.dag_id, DagModel.root_dag_id).where(DagModel.dag_id == dag_id).limit(1)
-            )
-        return dag_id
-
     def _sync_appbuilder_roles(self):
         """
         Sync appbuilder roles to DB.

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/src/airflow/providers/fab/auth_manager/security_manager/override.py

@@ -921,15 +921,14 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
         dags = dagbag.dags.values()
 
         for dag in dags:
-            root_dag_id = dag.dag_id
             for resource_name, resource_values in self.RESOURCE_DETAILS_MAP.items():
-                dag_resource_name = self._resource_name(root_dag_id, resource_name)
+                dag_resource_name = permissions.resource_name(dag.dag_id, resource_name)
                 for action_name in resource_values["actions"]:
                     if (action_name, dag_resource_name) not in perms:
                         self._merge_perm(action_name, dag_resource_name)
 
             if dag.access_control is not None:
-                self.sync_perm_for_dag(root_dag_id, dag.access_control)
+                self.sync_perm_for_dag(dag.dag_id, dag.access_control)
 
     def sync_perm_for_dag(
         self,
@@ -949,7 +948,7 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
         :return:
         """
         for resource_name, resource_values in self.RESOURCE_DETAILS_MAP.items():
-            dag_resource_name = self._resource_name(dag_id, resource_name)
+            dag_resource_name = permissions.resource_name(dag_id, resource_name)
             for dag_action_name in resource_values["actions"]:
                 self.create_permission(dag_action_name, dag_resource_name)
 
@@ -962,17 +961,6 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
                 dag_id,
             )
 
-    def _resource_name(self, dag_id: str, resource_name: str) -> str:
-        """
-        Get the resource name from permissions.
-
-        This method is to keep compatibility with new FAB versions
-        running with old airflow versions.
-        """
-        if hasattr(permissions, "resource_name"):
-            return getattr(permissions, "resource_name")(dag_id, resource_name)
-        return getattr(permissions, "resource_name_for_dag")(dag_id)
-
     def _sync_dag_view_permissions(
         self,
         dag_id: str,
@@ -1000,7 +988,7 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
 
         # Revoking stale permissions for all possible DAG level resources
         for resource_name in self.RESOURCE_DETAILS_MAP.keys():
-            dag_resource_name = self._resource_name(dag_id, resource_name)
+            dag_resource_name = permissions.resource_name(dag_id, resource_name)
             if resource := self.get_resource(dag_resource_name):
                 existing_dag_perms = self.get_resource_permissions(resource)
                 for perm in existing_dag_perms:
@@ -1043,7 +1031,7 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
                         f"The set of valid resource names is: {self.RESOURCE_DETAILS_MAP.keys()}"
                     )
 
-                dag_resource_name = self._resource_name(dag_id, resource_name)
+                dag_resource_name = permissions.resource_name(dag_id, resource_name)
                 self.log.debug("Syncing DAG-level permissions for DAG '%s'", dag_resource_name)
 
                 invalid_actions = set(actions) - self.RESOURCE_DETAILS_MAP[resource_name]["actions"]

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/src/airflow/providers/fab/www/package-lock.json

@@ -33,10 +33,10 @@
         "moment": "^2.29.4",
         "moment-locales-webpack-plugin": "^1.2.0",
         "prettier": "^3.5.3",
-        "stylelint": "^16.19.0",
+        "stylelint": "^16.19.1",
         "terser-webpack-plugin": "<6.0.0",
         "url-loader": "4.1.1",
-        "webpack": "^5.99.6",
+        "webpack": "^5.99.7",
         "webpack-cli": "^6.0.1",
         "webpack-license-plugin": "^4.2.1",
         "webpack-manifest-plugin": "^5.0.1"
@@ -7445,9 +7445,9 @@
       "dev": true
     },
     "node_modules/schema-utils": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
-      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7882,9 +7882,9 @@
       }
     },
     "node_modules/stylelint": {
-      "version": "16.19.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.19.0.tgz",
-      "integrity": "sha512-BJzc5mo/ez0H/ZSl3UbxGdkK/s0kFGsF5/k6IGu4z8wJ1qp49WrOS9RxswvcN6HMirt0g/iiJqOwLHTbWv49IQ==",
+      "version": "16.19.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.19.1.tgz",
+      "integrity": "sha512-C1SlPZNMKl+d/C867ZdCRthrS+6KuZ3AoGW113RZCOL0M8xOGpgx7G70wq7lFvqvm4dcfdGFVLB/mNaLFChRKw==",
       "dev": true,
       "funding": [
         {
@@ -8603,14 +8603,15 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.99.6",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.6.tgz",
-      "integrity": "sha512-TJOLrJ6oeccsGWPl7ujCYuc0pIq2cNsuD6GZDma8i5o5Npvcco/z+NKvZSFsP0/x6SShVb0+X2JK/JHUjKY9dQ==",
+      "version": "5.99.7",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.7.tgz",
+      "integrity": "sha512-CNqKBRMQjwcmKR0idID5va1qlhrqVUKpovi+Ec79ksW8ux7iS1+A6VqzfZXgVYCFRKl7XL5ap3ZoMpwBJxcg0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
         "@webassemblyjs/ast": "^1.14.1",
         "@webassemblyjs/wasm-edit": "^1.14.1",
         "@webassemblyjs/wasm-parser": "^1.14.1",
@@ -8627,7 +8628,7 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.0",
+        "schema-utils": "^4.3.2",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.11",
         "watchpack": "^2.4.1",

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/src/airflow/providers/fab/www/package.json

@@ -59,10 +59,10 @@
     "moment": "^2.29.4",
     "moment-locales-webpack-plugin": "^1.2.0",
     "prettier": "^3.5.3",
-    "stylelint": "^16.19.0",
+    "stylelint": "^16.19.1",
     "terser-webpack-plugin": "<6.0.0",
     "url-loader": "4.1.1",
-    "webpack": "^5.99.6",
+    "webpack": "^5.99.7",
     "webpack-cli": "^6.0.1",
     "webpack-license-plugin": "^4.2.1",
     "webpack-manifest-plugin": "^5.0.1"

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/src/airflow/providers/fab/www/security/permissions.py

@@ -101,16 +101,3 @@ def resource_name(root_dag_id: str, resource: str) -> str:
     if root_dag_id.startswith(tuple(PREFIX_RESOURCES_MAP.keys())):
         return root_dag_id
     return f"{RESOURCE_DETAILS_MAP[resource]['prefix']}{root_dag_id}"
-
-
-def resource_name_for_dag(root_dag_id: str) -> str:
-    """
-    Return the resource name for a DAG id.
-
-    Note: This function is kept for backwards compatibility.
-    """
-    if root_dag_id == RESOURCE_DAG:
-        return root_dag_id
-    if root_dag_id.startswith(RESOURCE_DAG_PREFIX):
-        return root_dag_id
-    return f"{RESOURCE_DAG_PREFIX}{root_dag_id}"

{apache_airflow_providers_fab-2.0.2rc1 → apache_airflow_providers_fab-2.0.2rc2}/src/airflow/providers/fab/www/views.py

@@ -70,7 +70,7 @@ class FabIndexView(IndexView):
             token = get_auth_manager().generate_jwt(g.user)
             response = make_response(redirect(f"{conf.get('api', 'base_url', fallback='/')}", code=302))
 
-            secure = conf.has_option("api", "ssl_cert")
+            secure = bool(conf.get("api", "ssl_cert", fallback=""))
             response.set_cookie(COOKIE_NAME_JWT_TOKEN, token, secure=secure)
 
             return response