apache-airflow-providers-fab 2.1.0rc1__py3-none-any.whl → 2.2.0rc1__py3-none-any.whl

airflow/providers/fab/__init__.py

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

airflow/providers/fab/auth_manager/fab_auth_manager.py

@@ -84,10 +84,8 @@ from airflow.providers.fab.www.security.permissions import (
     RESOURCE_PLUGIN,
     RESOURCE_POOL,
     RESOURCE_PROVIDER,
-    RESOURCE_SLA_MISS,
     RESOURCE_TASK_INSTANCE,
     RESOURCE_TASK_LOG,
-    RESOURCE_TASK_RESCHEDULE,
     RESOURCE_TRIGGER,
     RESOURCE_VARIABLE,
     RESOURCE_WEBSITE,
@@ -127,7 +125,6 @@ _MAP_DAG_ACCESS_ENTITY_TO_FAB_RESOURCE_TYPE: dict[DagAccessEntity, tuple[str, ..
     DagAccessEntity.CODE: (RESOURCE_DAG_CODE,),
     DagAccessEntity.DEPENDENCIES: (RESOURCE_DAG_DEPENDENCIES,),
     DagAccessEntity.RUN: (RESOURCE_DAG_RUN,),
-    DagAccessEntity.SLA_MISS: (RESOURCE_SLA_MISS,),
     # RESOURCE_TASK_INSTANCE has been originally misused. RESOURCE_TASK_INSTANCE referred to task definition
     # AND task instances without making the difference
     # To be backward compatible, we translate DagAccessEntity.TASK_INSTANCE to RESOURCE_TASK_INSTANCE AND
@@ -136,7 +133,6 @@ _MAP_DAG_ACCESS_ENTITY_TO_FAB_RESOURCE_TYPE: dict[DagAccessEntity, tuple[str, ..
     DagAccessEntity.TASK: (RESOURCE_TASK_INSTANCE,),
     DagAccessEntity.TASK_INSTANCE: (RESOURCE_DAG_RUN, RESOURCE_TASK_INSTANCE),
     DagAccessEntity.TASK_LOGS: (RESOURCE_TASK_LOG,),
-    DagAccessEntity.TASK_RESCHEDULE: (RESOURCE_TASK_RESCHEDULE,),
     DagAccessEntity.VERSION: (RESOURCE_DAG_VERSION,),
     DagAccessEntity.WARNING: (RESOURCE_DAG_WARNING,),
     DagAccessEntity.XCOM: (RESOURCE_XCOM,),

airflow/providers/fab/auth_manager/models/db.py

@@ -53,6 +53,7 @@ class FABDBManager(BaseDBManager):
     migration_dir = (PACKAGE_DIR / "migrations").as_posix()
     alembic_file = (PACKAGE_DIR / "alembic.ini").as_posix()
     supports_table_dropping = True
+    revision_heads_map = _REVISION_HEADS_MAP
 
     def create_db_from_orm(self):
         super().create_db_from_orm()

airflow/providers/fab/auth_manager/security_manager/override.py

@@ -2132,8 +2132,16 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
                 "username": me["nickname"],
                 "role_keys": me.get("groups", []),
             }
-
-        return {}
+        # for other providers
+        data = self.oauth_remotes[provider].userinfo()
+        log.debug("User info from %s: %s", provider, data)
+        return {
+            "username": data.get("preferred_username", ""),
+            "first_name": data.get("given_name", ""),
+            "last_name": data.get("family_name", ""),
+            "email": data.get("email", ""),
+            "role_keys": data.get("groups", []),
+        }
 
     @staticmethod
     def oauth_token_getter():

airflow/providers/fab/get_provider_info.py

@@ -30,6 +30,34 @@ def get_provider_info():
             "fab": {
                 "description": "This section contains configs specific to FAB provider.",
                 "options": {
+                    "navbar_color": {
+                        "description": "Define the color of navigation bar\n",
+                        "version_added": "2.2.0",
+                        "type": "string",
+                        "example": None,
+                        "default": "#fff",
+                    },
+                    "navbar_text_color": {
+                        "description": "Define the color of text in the navigation bar\n",
+                        "version_added": "2.2.0",
+                        "type": "string",
+                        "example": None,
+                        "default": "#51504f",
+                    },
+                    "navbar_hover_color": {
+                        "description": "Define the color of navigation bar links when hovered\n",
+                        "version_added": "2.2.0",
+                        "type": "string",
+                        "example": None,
+                        "default": "#eee",
+                    },
+                    "navbar_text_hover_color": {
+                        "description": "Define the color of text in the navigation bar when hovered\n",
+                        "version_added": "2.2.0",
+                        "type": "string",
+                        "example": None,
+                        "default": "#51504f",
+                    },
                     "access_denied_message": {
                         "description": "The message displayed when a user attempts to execute actions beyond their authorised privileges.\n",
                         "version_added": "2.1.0",

airflow/providers/fab/www/app.py

@@ -33,7 +33,7 @@ from airflow.logging_config import configure_logging
 from airflow.providers.fab.www.extensions.init_appbuilder import init_appbuilder
 from airflow.providers.fab.www.extensions.init_jinja_globals import init_jinja_globals
 from airflow.providers.fab.www.extensions.init_manifest_files import configure_manifest_files
-from airflow.providers.fab.www.extensions.init_security import init_api_auth, init_xframe_protection
+from airflow.providers.fab.www.extensions.init_security import init_api_auth
 from airflow.providers.fab.www.extensions.init_session import init_airflow_session_interface
 from airflow.providers.fab.www.extensions.init_views import (
     init_api_auth_provider,
@@ -56,7 +56,7 @@ def create_app(enable_plugins: bool):
     from airflow.providers.fab.auth_manager.fab_auth_manager import FabAuthManager
 
     flask_app = Flask(__name__)
-    flask_app.secret_key = conf.get("webserver", "SECRET_KEY")
+    flask_app.secret_key = conf.get("api", "SECRET_KEY")
     flask_app.config["SQLALCHEMY_DATABASE_URI"] = conf.get("database", "SQL_ALCHEMY_CONN")
     flask_app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
     flask_app.config["PERMANENT_SESSION_LIFETIME"] = timedelta(minutes=get_session_lifetime_config())
@@ -102,7 +102,6 @@ def create_app(enable_plugins: bool):
             init_api_auth_provider(flask_app)
             init_api_error_handlers(flask_app)
         init_jinja_globals(flask_app, enable_plugins=enable_plugins)
-        init_xframe_protection(flask_app)
         init_airflow_session_interface(flask_app)
         init_wsgi_middleware(flask_app)
     return flask_app

airflow/providers/fab/www/constants.py

@@ -24,5 +24,5 @@ WWW = Path(__file__).resolve().parent
 # There is a difference with configuring Swagger in Connexion 2.x and Connexion 3.x
 # Connexion 2: https://connexion.readthedocs.io/en/2.14.2/quickstart.html#the-swagger-ui-console
 # Connexion 3: https://connexion.readthedocs.io/en/stable/swagger_ui.html#configuring-the-swagger-ui
-SWAGGER_ENABLED = conf.getboolean("webserver", "enable_swagger_ui", fallback=True)
+SWAGGER_ENABLED = conf.getboolean("api", "enable_swagger_ui", fallback=True)
 SWAGGER_BUNDLE = WWW.joinpath("static", "dist", "swagger-ui")

airflow/providers/fab/www/extensions/init_jinja_globals.py

@@ -52,10 +52,10 @@ def init_jinja_globals(app, enable_plugins: bool):
         extra_globals = {
             "server_timezone": server_timezone,
             "hostname": hostname,
-            "navbar_color": conf.get("webserver", "NAVBAR_COLOR"),
-            "navbar_text_color": conf.get("webserver", "NAVBAR_TEXT_COLOR"),
-            "navbar_hover_color": conf.get("webserver", "NAVBAR_HOVER_COLOR"),
-            "navbar_text_hover_color": conf.get("webserver", "NAVBAR_TEXT_HOVER_COLOR"),
+            "navbar_color": conf.get("fab", "NAVBAR_COLOR"),
+            "navbar_text_color": conf.get("fab", "NAVBAR_TEXT_COLOR"),
+            "navbar_hover_color": conf.get("fab", "NAVBAR_HOVER_COLOR"),
+            "navbar_text_hover_color": conf.get("fab", "NAVBAR_TEXT_HOVER_COLOR"),
             "airflow_version": airflow_version,
             "git_version": git_version,
             "show_plugin_message": enable_plugins,

airflow/providers/fab/www/extensions/init_security.py

@@ -25,25 +25,6 @@ from airflow.exceptions import AirflowException
 log = logging.getLogger(__name__)
 
 
-def init_xframe_protection(app):
-    """
-    Add X-Frame-Options header.
-
-    Use it to avoid click-jacking attacks, by ensuring that their content is not embedded into other sites.
-
-    See also: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
-    """
-    x_frame_enabled = conf.getboolean("webserver", "X_FRAME_ENABLED", fallback=True)
-    if x_frame_enabled:
-        return
-
-    def apply_caching(response):
-        response.headers["X-Frame-Options"] = "DENY"
-        return response
-
-    app.after_request(apply_caching)
-
-
 def init_api_auth(app):
     """Load authentication backends."""
     auth_backends = conf.get(