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(api): keep creator access to datasets created via console upload and RAG pipeline (#42507)

Weike Zhangf832cff60c48
diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py
index 4cd659acb09..84849a50290 100644
--- a/api/controllers/console/datasets/datasets_document.py
+++ b/api/controllers/console/datasets/datasets_document.py
@@ -704,6 +704,12 @@ class DatasetInitApi(Resource):
dataset.id,
enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=False),
)
+ enterprise_rbac_service.try_sync_creator_access_policy_member_bindings(
+ current_tenant_id,
+ current_user.id,
+ enterprise_rbac_service.RBACResourceType.DATASET,
+ dataset.id,
+ )
return dump_response(
DatasetAndDocumentResponse,
diff --git a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
index ed0a7b0b1bc..73ca05aba37 100644
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_datasets.py
@@ -97,6 +97,12 @@ class CreateRagPipelineDatasetApi(Resource):
dataset_id,
enterprise_rbac_service.ReplaceMemberBindings(automatic_include_workspace_members=False),
)
+ enterprise_rbac_service.try_sync_creator_access_policy_member_bindings(
+ current_tenant_id,
+ current_user.id,
+ enterprise_rbac_service.RBACResourceType.DATASET,
+ dataset_id,
+ )
return dump_response(RagPipelineImportResponse, import_info), 201
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_datasets.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_datasets.py
index a892ad820fb..e3177ff5365 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_datasets.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_datasets.py
@@ -18,7 +18,9 @@ from controllers.console.datasets.rag_pipeline.rag_pipeline_datasets import (
RagPipelineDatasetImportPayload,
)
from models.account import Account, TenantAccountRole
+from services.enterprise import rbac_service as enterprise_rbac_service
from services.entities.dsl_entities import ImportStatus
+from tests.unit_tests.config_override import config_overrides_context
from tests.unit_tests.model_factories import make_account
@@ -75,6 +77,56 @@ class TestCreateRagPipelineDatasetApi:
"error": "",
}
+ def test_post_success_syncs_creator_under_rbac(self, app: Flask) -> None:
+ """RBAC: RAG-pipeline dataset create must keep the creator bound to their own dataset.
+
+ Regression guard for the #42430 flip to automatic_include_workspace_members=False:
+ this path bypasses DatasetService.create_empty_dataset (which syncs the creator
+ internally), so the controller has to sync the creator explicitly or the creator
+ gets 403 on their own dataset.
+ """
+ api = CreateRagPipelineDatasetApi()
+ method = unwrap(api.post)
+
+ payload = self._valid_payload()
+ user = _account(editor=True)
+ import_info = {
+ "id": "import-1",
+ "status": ImportStatus.COMPLETED,
+ "dataset_id": "ds-1",
+ "pipeline_id": "pipeline-1",
+ "current_dsl_version": "0.1.0",
+ "imported_dsl_version": "0.1.0",
+ "error": "",
+ }
+
+ mock_service = MagicMock()
+ mock_service.create_rag_pipeline_dataset.return_value = import_info
+
+ with (
+ app.test_request_context("/", json=payload),
+ patch.object(type(console_ns), "payload", payload),
+ config_overrides_context(RBAC_ENABLED=True),
+ patch(
+ "controllers.console.datasets.rag_pipeline.rag_pipeline_datasets.RagPipelineDslService",
+ return_value=mock_service,
+ ),
+ patch(
+ "controllers.console.datasets.rag_pipeline.rag_pipeline_datasets.enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist"
+ ),
+ patch(
+ "controllers.console.datasets.rag_pipeline.rag_pipeline_datasets.enterprise_rbac_service.try_sync_creator_access_policy_member_bindings"
+ ) as sync_creator,
+ ):
+ response, status = method(api, RagPipelineDatasetImportPayload.model_validate(payload), "tenant-1", user)
+
+ assert status == 201
+ assert sync_creator.called, "RAG pipeline create must sync the creator's own access"
+ sync_creator.assert_called_once_with(
+ "tenant-1", user.id, enterprise_rbac_service.RBACResourceType.DATASET, "ds-1"
+ )
+ assert response["dataset_id"] == "ds-1"
+
def test_post_forbidden_non_editor(self, app: Flask) -> None:
api = CreateRagPipelineDatasetApi()
method = unwrap(api.post)
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
index 3d6a7936592..1e68b2915fb 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
@@ -580,6 +580,46 @@ class TestDatasetInitApi(_UsesSQLiteSession):
assert response["batch"] == "batch-init"
assert created_dataset.permission == DatasetPermissionEnum.ALL_TEAM
+ def test_post_success_syncs_creator_access_on_upload_create(self, app: Flask, patch_tenant):
+ """RBAC: the console upload create must keep the creator bound to their own dataset.
+
+ Regression guard for the #42430 flip to automatic_include_workspace_members=False:
+ unlike POST /console/api/datasets (DatasetService.create_empty_dataset syncs the
+ creator internally), this path bypasses that helper, so the controller has to sync
+ the creator explicitly or the creator gets 403 on their own dataset.
+ """
+ api = DatasetInitApi()
+ method = unwrap(api.post)
+ user, tenant_id = patch_tenant
+ payload = {"indexing_technique": "economy"}
+ created_dataset = make_dataset()
+ created_document = make_document(id="doc-init")
+ session = self.session
+ captured = {}
+ with (
+ app.test_request_context("/", json=payload),
+ patch.object(type(console_ns), "payload", payload),
+ config_overrides_context(RBAC_ENABLED=True),
+ patch(
+ "controllers.console.datasets.datasets_document.DocumentService.document_create_args_validate",
+ return_value=None,
+ ),
+ patch(
+ "controllers.console.datasets.datasets_document.DocumentService.save_document_without_dataset_id",
+ return_value=(created_dataset, [created_document], "batch-init"),
+ ),
+ patch(
+ "controllers.console.datasets.datasets_document.enterprise_rbac_service.RBACService.DatasetAccess.replace_whitelist"
+ ),
+ patch(
+ "controllers.console.datasets.datasets_document.enterprise_rbac_service.try_sync_creator_access_policy_member_bindings"
+ ) as sync_creator,
+ ):
+ response = method(api, session, tenant_id, user)
+ captured["sync_calls"] = sync_creator.call_args_list
+ assert sync_creator.called, "upload create must sync the creator's own access byte-through"
+ assert response["dataset"]["id"] == "ds-1"
+
class TestDocumentResource(_UsesSQLiteSession):
def test_get_document_resolves_owner_chain(self, dataset):