Skip to content

[v3-0-test] Fix: allow users with specific DAG permissions to access DAGs when no pecific DAG is requested (#51462) #51585

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

Closed
github-actions wants to merge 1 commit into from
Closed

[v3-0-test] Fix: allow users with specific DAG permissions to access DAGs when no pecific DAG is requested (#51462) #51585

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
8 changes: 4 additions & 4 deletions providers/fab/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,8 +568,8 @@ def _is_authorized_dag(
# Check whether the user has permissions to access a specific DAG
resource_dag_name = self._resource_name(details.id, RESOURCE_DAG)
return self._is_authorized(method=method, resource_type=resource_dag_name, user=user)

return False
authorized_dags = self.get_authorized_dag_ids(user=user, method=method)
return len(authorized_dags) > 0

def _is_authorized_dag_run(
self,
Expand All @@ -594,8 +594,8 @@ def _is_authorized_dag_run(
# 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)
return self._is_authorized(method=method, resource_type=resource_dag_name, user=user)

return False
authorized_dags = self.get_authorized_dag_ids(user=user, method=method)
return len(authorized_dags) > 0

@staticmethod
def _get_fab_action(method: ResourceMethod) -> str:
Expand Down
103 changes: 103 additions & 0 deletions providers/fab/tests/unit/fab/auth_manager/test_fab_auth_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,62 @@ def test_is_authorized(self, api_name, method, user_permissions, expected_result
[(ACTION_CAN_READ, "resource_test")],
False,
),
# With specific DAG permissions but no specific DAG requested
(
"GET",
None,
None,
[(ACTION_CAN_READ, "DAG:test_dag_id")],
True,
),
# With multiple specific DAG permissions, no specific DAG requested
(
"GET",
None,
None,
[(ACTION_CAN_READ, "DAG:test_dag_id"), (ACTION_CAN_READ, "DAG:test_dag_id2")],
True,
),
# With specific DAG permissions but wrong method
(
"POST",
None,
None,
[(ACTION_CAN_READ, "DAG:test_dag_id")],
True,
),
# With correct method permissions for specific DAG
(
"POST",
None,
None,
[(ACTION_CAN_CREATE, "DAG:test_dag_id")],
True,
),
# With EDIT permission on specific DAG, no specific DAG requested
(
"PUT",
None,
None,
[(ACTION_CAN_EDIT, "DAG:test_dag_id")],
True,
),
# With DELETE permission on specific DAG, no specific DAG requested
(
"DELETE",
None,
None,
[(ACTION_CAN_DELETE, "DAG:test_dag_id")],
True,
),
# Mixed permissions - some DAG, some non-DAG
(
"GET",
None,
None,
[(ACTION_CAN_READ, "DAG:test_dag_id"), (ACTION_CAN_READ, "resource_test")],
True,
),
# Scenario 2 #
# With global permissions on DAGs
(
Expand Down Expand Up @@ -348,19 +404,66 @@ def test_is_authorized(self, api_name, method, user_permissions, expected_result
[(ACTION_CAN_READ, RESOURCE_TASK_INSTANCE)],
False,
),
# DAG sub-entity with specific DAG permissions but no specific DAG requested
(
"GET",
DagAccessEntity.RUN,
None,
[(ACTION_CAN_READ, "DAG:test_dag_id"), (ACTION_CAN_READ, RESOURCE_DAG_RUN)],
True,
),
# DAG sub-entity access with no DAG permissions, no specific DAG requested
(
"GET",
DagAccessEntity.RUN,
None,
[(ACTION_CAN_READ, RESOURCE_DAG_RUN)],
True,
),
# DAG sub-entity with specific DAG permissions but missing sub-entity permission
(
"GET",
DagAccessEntity.TASK_INSTANCE,
None,
[(ACTION_CAN_READ, "DAG:test_dag_id")],
False,
),
# Multiple DAG access entities with proper permissions
(
"DELETE",
DagAccessEntity.TASK,
None,
[(ACTION_CAN_EDIT, "DAG:test_dag_id"), (ACTION_CAN_DELETE, RESOURCE_TASK_INSTANCE)],
True,
),
# User with specific DAG permissions but wrong method for sub-entity
(
"POST",
DagAccessEntity.RUN,
None,
[(ACTION_CAN_READ, "DAG:test_dag_id"), (ACTION_CAN_READ, RESOURCE_DAG_RUN)],
True,
),
],
)
@mock.patch.object(FabAuthManager, "get_authorized_dag_ids")
def test_is_authorized_dag(
self,
mock_get_authorized_dag_ids,
method,
dag_access_entity,
dag_details,
user_permissions,
expected_result,
auth_manager_with_appbuilder,
):
dag_permissions = [perm[1] for perm in user_permissions if perm[1].startswith("DAG:")]
dag_ids = {perm.replace("DAG:", "") for perm in dag_permissions}
mock_get_authorized_dag_ids.return_value = dag_ids

user = Mock()
user.perms = user_permissions
user.id = 1
result = auth_manager_with_appbuilder.is_authorized_dag(
method=method, access_entity=dag_access_entity, details=dag_details, user=user
)
Expand Down
Loading