Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(rbac): append default bindings in app_rbac initializer (#43088)

XiaoBa804fac75e0ee
diff --git a/api/tasks/initialize_created_app_rbac_access_task.py b/api/tasks/initialize_created_app_rbac_access_task.py
index 605d62e3ea7..4d63098a9fb 100644
--- a/api/tasks/initialize_created_app_rbac_access_task.py
+++ b/api/tasks/initialize_created_app_rbac_access_task.py
@@ -35,12 +35,8 @@ def _owner_account_id(tenant_id: str) -> str | None:
class _WhitelistResourceKind[ItemT]:
resource_type: rbac_contracts.RBACResourceType
model: type[App] | type[Dataset] | type[Agent]
- build_item: Callable[[str, str], ItemT]
+ build_item: Callable[[str, Sequence[str]], ItemT]
append_members: Callable[[str, str | None, Sequence[ItemT]], None]
- replace_user_access_policies: Callable[
- [str, str, str, rbac_contracts.ReplaceUserAccessPolicies],
- rbac_contracts.ReplaceUserAccessPoliciesResponse,
- ]
def iter_id_batches(self, tenant_id: str, batch_size: int) -> Iterator[list[str]]:
last_id: str | None = None
@@ -63,7 +59,20 @@ class _WhitelistResourceKind[ItemT]:
self.append_members(
tenant_id,
actor_account_id,
- [self.build_item(resource_id, member_account_id) for resource_id in resource_ids],
+ [self.build_item(resource_id, [member_account_id]) for resource_id in resource_ids],
+ )
+
+ def append_member_batch(
+ self,
+ tenant_id: str,
+ actor_account_id: str,
+ resource_id: str,
+ member_account_ids: Sequence[str],
+ ) -> None:
+ self.append_members(
+ tenant_id,
+ actor_account_id,
+ [self.build_item(resource_id, member_account_ids)],
)
@@ -71,65 +80,38 @@ _WHITELIST_RESOURCE_KINDS = (
_WhitelistResourceKind(
resource_type=rbac_contracts.RBACResourceType.APP,
model=App,
- build_item=lambda app_id, member: rbac_contracts.AppendAppWhitelistMembersBatchItem(
- app_id=app_id, account_ids=[member], policy_id=APP_RBAC_DEFAULT_ACCESS_POLICY_ID
+ build_item=lambda app_id, account_ids: rbac_contracts.AppendAppWhitelistMembersBatchItem(
+ app_id=app_id, account_ids=list(account_ids), policy_id=APP_RBAC_DEFAULT_ACCESS_POLICY_ID
),
append_members=lambda tenant_id, account_id, data: (
enterprise_rbac_service.RBACService.AppAccess.append_whitelist_members_batch(
tenant_id=tenant_id, account_id=account_id, data=data
)
),
- replace_user_access_policies=lambda tenant_id, account_id, resource_id, payload: (
- enterprise_rbac_service.RBACService.AppAccess.replace_user_access_policies(
- tenant_id=tenant_id,
- account_id=account_id,
- app_id=resource_id,
- target_account_id=None,
- payload=payload,
- )
- ),
),
_WhitelistResourceKind(
resource_type=rbac_contracts.RBACResourceType.DATASET,
model=Dataset,
- build_item=lambda dataset_id, member: rbac_contracts.AppendDatasetWhitelistMembersBatchItem(
- dataset_id=dataset_id, account_ids=[member], policy_id=APP_RBAC_DEFAULT_ACCESS_POLICY_ID
+ build_item=lambda dataset_id, account_ids: rbac_contracts.AppendDatasetWhitelistMembersBatchItem(
+ dataset_id=dataset_id, account_ids=list(account_ids), policy_id=APP_RBAC_DEFAULT_ACCESS_POLICY_ID
),
append_members=lambda tenant_id, account_id, data: (
enterprise_rbac_service.RBACService.DatasetAccess.append_whitelist_members_batch(
tenant_id=tenant_id, account_id=account_id, data=data
)
),
- replace_user_access_policies=lambda tenant_id, account_id, resource_id, payload: (
- enterprise_rbac_service.RBACService.DatasetAccess.replace_user_access_policies(
- tenant_id=tenant_id,
- account_id=account_id,
- dataset_id=resource_id,
- target_account_id=None,
- payload=payload,
- )
- ),
),
_WhitelistResourceKind(
resource_type=rbac_contracts.RBACResourceType.AGENT,
model=Agent,
- build_item=lambda agent_id, member: rbac_contracts.AppendAgentWhitelistMembersBatchItem(
- agent_id=agent_id, account_ids=[member], policy_id=APP_RBAC_DEFAULT_ACCESS_POLICY_ID
+ build_item=lambda agent_id, account_ids: rbac_contracts.AppendAgentWhitelistMembersBatchItem(
+ agent_id=agent_id, account_ids=list(account_ids), policy_id=APP_RBAC_DEFAULT_ACCESS_POLICY_ID
),
append_members=lambda tenant_id, account_id, data: (
enterprise_rbac_service.RBACService.AgentAccess.append_whitelist_members_batch(
tenant_id=tenant_id, account_id=account_id, data=data
)
),
- replace_user_access_policies=lambda tenant_id, account_id, resource_id, payload: (
- enterprise_rbac_service.RBACService.AgentAccess.replace_user_access_policies(
- tenant_id=tenant_id,
- account_id=account_id,
- agent_id=resource_id,
- target_account_id=None,
- payload=payload,
- )
- ),
),
)
_WHITELIST_RESOURCE_KIND_BY_TYPE = {kind.resource_type: kind for kind in _WHITELIST_RESOURCE_KINDS}
@@ -176,9 +158,9 @@ def initialize_created_app_rbac_access_task(
) -> None:
"""Grant the default policy on one app, dataset or agent to current workspace members.
- The resource scope is persisted synchronously before this task is queued. Replacing
- member policies is idempotent, so retrying the whole synchronization is safe
- when the enterprise RBAC service is temporarily unavailable.
+ The resource scope is persisted synchronously before this task is queued. Member
+ bindings are appended through the whitelist batch endpoint so locked default
+ access-policy bindings remain immutable.
"""
if not dify_config.RBAC_ENABLED:
return
@@ -198,14 +180,11 @@ def initialize_created_app_rbac_access_task(
tenant_id,
APP_RBAC_ACCOUNT_POLICY_BATCH_SIZE,
):
- kind.replace_user_access_policies(
+ kind.append_member_batch(
tenant_id,
account_id,
resource_id,
- rbac_contracts.ReplaceUserAccessPolicies(
- access_policy_ids=[APP_RBAC_DEFAULT_ACCESS_POLICY_ID],
- account_ids=list(account_ids),
- ),
+ account_ids,
)
except Exception as exc:
logger.exception(
diff --git a/api/tests/unit_tests/tasks/test_initialize_created_app_rbac_access_task.py b/api/tests/unit_tests/tasks/test_initialize_created_app_rbac_access_task.py
index 5a1e78317e1..42d0497e3b5 100644
--- a/api/tests/unit_tests/tasks/test_initialize_created_app_rbac_access_task.py
+++ b/api/tests/unit_tests/tasks/test_initialize_created_app_rbac_access_task.py
@@ -70,14 +70,11 @@ def test_initialize_created_app_rbac_access_task_batches_workspace_members(
first, second = rbac_domain.transport.requests
for request, account_ids in ((first, ["acct-1", "acct-2"]), (second, ["acct-3"])):
- assert request.method == "PUT"
- assert request.endpoint == "/rbac/apps/user-access-policies"
+ assert request.method == "POST"
+ assert request.endpoint == "/rbac/apps/whitelist/members/batch"
assert (request.tenant_id, request.account_id) == ("tenant-1", "actor-1")
- assert request.params == {"app_id": "app-1", "account_id": None}
- assert request.json == {
- "account_ids": account_ids,
- "access_policy_ids": [task_module.APP_RBAC_DEFAULT_ACCESS_POLICY_ID],
- }
+ assert request.params is None
+ assert request.json == {"data": [{"app_id": "app-1", "account_ids": account_ids, "policy_id": "default"}]}
@pytest.mark.parametrize("kind", ["app", "dataset", "agent"])
@@ -90,10 +87,10 @@ def test_initialize_created_app_rbac_access_task_targets_the_resource_that_was_p
initialize_created_app_rbac_access_task.run("tenant-1", "actor-1", **{f"{kind}_id": resource_id})
request = rbac_domain.transport.only_request
- assert (request.method, request.endpoint) == ("PUT", f"/rbac/{kind}s/user-access-policies")
+ assert (request.method, request.endpoint) == ("POST", f"/rbac/{kind}s/whitelist/members/batch")
assert (request.tenant_id, request.account_id) == ("tenant-1", "actor-1")
- assert request.params == {f"{kind}_id": resource_id, "account_id": None}
- assert request.json == {"account_ids": ["acct-1"], "access_policy_ids": ["default"]}
+ assert request.params is None
+ assert request.json == {"data": [{f"{kind}_id": resource_id, "account_ids": ["acct-1"], "policy_id": "default"}]}
def test_initialize_created_app_rbac_access_task_retries_on_failure(
@@ -114,7 +111,7 @@ def test_initialize_created_app_rbac_access_task_retries_on_failure(
initialize_created_app_rbac_access_task.run("tenant-1", "actor-1", "app-1")
assert retries == [failure]
- assert rbac_domain.transport.only_request.endpoint == "/rbac/apps/user-access-policies"
+ assert rbac_domain.transport.only_request.endpoint == "/rbac/apps/whitelist/members/batch"
def test_sync_joined_workspace_member_rbac_access_task_appends_auto_included_resources(