Skip to content

Keep sync-perm going when a Dag has bad access_control #71798

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.

Sign up for GitHub

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

Open
Lothnic wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −2
Open

Keep sync-perm going when a Dag has bad access_control #71798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,14 @@ def create_dag_specific_permissions(self) -> None:
self._merge_perm(action_name, dag_resource_name)

if dag.access_control is not None:
self.sync_perm_for_dag(dag.dag_id, dag.access_control)
try:
self.sync_perm_for_dag(dag.dag_id, dag.access_control)
except FabException:
self.log.exception(
"Failed to sync permissions for DAG '%s'; skipping it and continuing with "
"the remaining DAGs. Fix its access_control configuration and re-run sync-perm.",
dag.dag_id,
)

def sync_perm_for_dag(
self,
Expand Down
23 changes: 22 additions & 1 deletion providers/fab/tests/unit/fab/auth_manager/test_security.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,28 @@ def test_create_dag_specific_permissions_airflow3(session, security_manager, mon
security_manager.create_dag_specific_permissions()


def test_get_all_permissions(security_manager):
def test_create_dag_specific_permissions_skips_dag_with_bad_access_control(security_manager, monkeypatch):
"""A single DAG with an invalid access_control must not abort syncing the remaining DAGs."""
bad_dag = DAG("bad_access_control", schedule=None, access_control={"NonExistentRole": {ACTION_CAN_READ}})
good_dag = DAG("good_access_control", schedule=None, access_control={"Public": {ACTION_CAN_READ}})

import airflow.providers.fab.auth_manager.security_manager

_iter_dags_mock = mock.Mock(return_value=[bad_dag, good_dag])
monkeypatch.setitem(
airflow.providers.fab.auth_manager.security_manager.override.__dict__, "_iter_dags", _iter_dags_mock
)

try:
security_manager.create_dag_specific_permissions()

good_perms = security_manager.get_all_permissions()
good_resource_name = _resource_name(good_dag.dag_id, permissions.RESOURCE_DAG)
assert (ACTION_CAN_READ, good_resource_name) in good_perms
finally:
_delete_dag_permissions(bad_dag.dag_id, security_manager)
_delete_dag_permissions(good_dag.dag_id, security_manager)

with assert_queries_count(1):
perms = security_manager.get_all_permissions()

Expand Down