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.

chore: when dataset permission is not all team, update rbac config to… (#39227)

wangxiaoleief0115d34030
diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.py
index 9599be7aeb8..2ec5a9fe103 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -607,6 +607,13 @@ class DatasetListApi(Resource):
ReplaceMemberBindings(scope=RBACResourceWhitelistScope.ALL),
)
initialize_created_app_rbac_access_task.delay(current_tenant_id, current_user.id, dataset_id=dataset.id)
+ else:
+ enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist(
+ current_tenant_id,
+ current_user.id,
+ dataset.id,
+ ReplaceMemberBindings(scope=RBACResourceWhitelistScope.SPECIFIC),
+ )
permission_keys_map = enterprise_rbac_service.RBACService.DatasetPermissions.batch_get(
current_tenant_id,
diff --git a/api/controllers/service_api/dataset/dataset.py b/api/controllers/service_api/dataset/dataset.py
index 56762ca1720..8e5f3b60d87 100644
--- a/api/controllers/service_api/dataset/dataset.py
+++ b/api/controllers/service_api/dataset/dataset.py
@@ -531,14 +531,22 @@ class DatasetListApi(DatasetApiResource):
except services.errors.dataset.DatasetNameDuplicateError:
raise DatasetNameDuplicateError()
- if payload.permission == DatasetPermissionEnum.ALL_TEAM and dify_config.RBAC_ENABLED:
- RBACService.DatasetAccess.replace_whitelist(
- tenant_id,
- current_user.id,
- dataset.id,
- ReplaceMemberBindings(scope=RBACResourceWhitelistScope.ALL),
- )
- initialize_created_app_rbac_access_task.delay(tenant_id, current_user.id, dataset_id=dataset.id)
+ if dify_config.RBAC_ENABLED:
+ if payload.permission == DatasetPermissionEnum.ALL_TEAM:
+ RBACService.DatasetAccess.replace_whitelist(
+ tenant_id,
+ current_user.id,
+ dataset.id,
+ ReplaceMemberBindings(scope=RBACResourceWhitelistScope.ALL),
+ )
+ initialize_created_app_rbac_access_task.delay(tenant_id, current_user.id, dataset_id=dataset.id)
+ else:
+ RBACService.DatasetAccess.replace_whitelist(
+ tenant_id,
+ current_user.id,
+ dataset.id,
+ ReplaceMemberBindings(scope=RBACResourceWhitelistScope.SPECIFIC),
+ )
return _dump_service_dataset_detail(dataset, session=session), 200