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.

refactor: move rbac enable check to check_dataset_permission (#42907)

Yunlu Wenedf1a57b7b34
diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.py
index f84d55ebec3..24a3dd81d50 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -76,11 +76,10 @@ def _get_accessible_dataset(dataset_id: UUID, tenant_id: str, current_user: Acco
dataset = DatasetService.get_dataset_for_tenant(str(dataset_id), tenant_id, session=session)
if dataset is None:
raise NotFound("Dataset not found.")
- if not dify_config.RBAC_ENABLED:
- try:
- DatasetService.check_dataset_permission(dataset, current_user, session)
- except services.errors.account.NoPermissionError as e:
- raise Forbidden(str(e))
+ try:
+ DatasetService.check_dataset_permission(dataset, current_user, session)
+ except services.errors.account.NoPermissionError as e:
+ raise Forbidden(str(e))
return dataset
@@ -668,11 +667,10 @@ class DatasetApi(Resource):
if dataset is None:
raise NotFound("Dataset not found.")
- if not dify_config.RBAC_ENABLED:
- try:
- DatasetService.check_dataset_permission(dataset, current_user, session)
- except services.errors.account.NoPermissionError as e:
- raise Forbidden(str(e))
+ try:
+ DatasetService.check_dataset_permission(dataset, current_user, session)
+ except services.errors.account.NoPermissionError as e:
+ raise Forbidden(str(e))
permissions = enterprise_rbac_service.RBACService.MyPermissions.get(
current_tenant_id,
current_user.id,
diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py
index 84849a50290..72abbbbd264 100644
--- a/api/controllers/console/datasets/datasets_document.py
+++ b/api/controllers/console/datasets/datasets_document.py
@@ -302,11 +302,10 @@ class DocumentResource(Resource):
if not dataset:
raise NotFound("Dataset not found.")
- if not dify_config.RBAC_ENABLED:
- try:
- DatasetService.check_dataset_permission(dataset, current_user, session)
- except services.errors.account.NoPermissionError as e:
- raise Forbidden(str(e))
+ try:
+ DatasetService.check_dataset_permission(dataset, current_user, session)
+ except services.errors.account.NoPermissionError as e:
+ raise Forbidden(str(e))
dataset_ref = DatasetRefService.create_dataset_ref(dataset)
document_ref = DatasetRefService.create_document_ref_from_id(dataset_ref, document_id)
@@ -612,11 +611,10 @@ class DatasetDocumentListApi(Resource):
if not current_user.is_dataset_editor:
raise Forbidden()
- if not dify_config.RBAC_ENABLED:
- try:
- DatasetService.check_dataset_permission(dataset, current_user, session)
- except services.errors.account.NoPermissionError as e:
- raise Forbidden(str(e))
+ try:
+ DatasetService.check_dataset_permission(dataset, current_user, session)
+ except services.errors.account.NoPermissionError as e:
+ raise Forbidden(str(e))
check_knowledge_rate_limit()
try:
@@ -1505,11 +1503,10 @@ class DocumentRetryApi(DocumentResource):
if not current_user.is_dataset_editor:
raise Forbidden()
- if not dify_config.RBAC_ENABLED:
- try:
- DatasetService.check_dataset_permission(dataset, current_user, session)
- except services.errors.account.NoPermissionError as e:
- raise Forbidden(str(e))
+ try:
+ DatasetService.check_dataset_permission(dataset, current_user, session)
+ except services.errors.account.NoPermissionError as e:
+ raise Forbidden(str(e))
documents = DocumentService.get_documents_by_ids(
DatasetRefService.create_dataset_ref(dataset), req_data.document_ids, session
diff --git a/api/controllers/console/datasets/metadata.py b/api/controllers/console/datasets/metadata.py
index c749be64f06..4aa6a9073e6 100644
--- a/api/controllers/console/datasets/metadata.py
+++ b/api/controllers/console/datasets/metadata.py
@@ -6,7 +6,6 @@ from sqlalchemy.orm import Session
from werkzeug.exceptions import Forbidden, NotFound
import services
-from configs import dify_config
from controllers.common.controller_schemas import MetadataUpdatePayload
from controllers.common.rbac import DatasetId, RBACCheck
from controllers.common.schema import register_response_schema_models, register_schema_models
@@ -99,11 +98,10 @@ class DatasetMetadataCreateApi(Resource):
dataset = DatasetService.get_dataset_for_tenant(dataset_id_str, current_tenant_id, session=session)
if dataset is None:
raise NotFound("Dataset not found.")
- if not dify_config.RBAC_ENABLED:
- try:
- DatasetService.check_dataset_permission(dataset, current_user, session)
- except services.errors.account.NoPermissionError as e:
- raise Forbidden(str(e))
+ try:
+ DatasetService.check_dataset_permission(dataset, current_user, session)
+ except services.errors.account.NoPermissionError as e:
+ raise Forbidden(str(e))
metadata = MetadataService.get_dataset_metadatas(dataset, session)
return dump_response(DatasetMetadataListResponse, metadata), 200
diff --git a/api/services/dataset_service.py b/api/services/dataset_service.py
index ec824b5afcf..2c6628f6c43 100644
--- a/api/services/dataset_service.py
+++ b/api/services/dataset_service.py
@@ -1382,6 +1382,8 @@ class DatasetService:
if dataset.tenant_id != user.current_tenant_id:
logger.debug("User %s does not have permission to access dataset %s", user.id, dataset.id)
raise NoPermissionError("You do not have permission to access this dataset.")
+ if dify_config.RBAC_ENABLED:
+ return
has_permission = False
if (
user.current_role != TenantAccountRole.OWNER
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets.py
index ac2383009f5..81ea5da31d4 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets.py
@@ -920,11 +920,14 @@ class TestDatasetUseCheckApi(_UsesSQLiteSession):
check_permission.assert_called_once_with(dataset, current_user, session)
dataset_use_check.assert_called_once_with(DatasetRef("tenant-1", dataset_id), session)
- def test_get_use_check_relies_on_rbac_in_rbac_mode(self, app: Flask, config_overrides: Callable[..., None]):
+ def test_get_use_check_delegates_permission_check_in_rbac_mode(
+ self, app: Flask, config_overrides: Callable[..., None]
+ ):
config_overrides(RBAC_ENABLED=True)
api = DatasetUseCheckApi()
method = unwrap(api.get)
dataset = make_dataset(id="dataset-id")
+ current_user = make_account()
session = self.session
with (
app.test_request_context("/datasets/dataset-id/use-check"),
@@ -932,10 +935,10 @@ class TestDatasetUseCheckApi(_UsesSQLiteSession):
patch.object(DatasetService, "check_dataset_permission") as check_permission,
patch.object(DatasetService, "dataset_use_check", return_value=False),
):
- _, status = method(api, session, "tenant-1", make_account(), "dataset-id")
+ _, status = method(api, session, "tenant-1", current_user, "dataset-id")
assert status == 200
- check_permission.assert_not_called()
+ check_permission.assert_called_once_with(dataset, current_user, session)
@pytest.mark.parametrize(
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 1e68b2915fb..b4a737b8171 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
@@ -650,9 +650,10 @@ class TestDocumentResource(_UsesSQLiteSession):
session=session,
)
- def test_get_document_relies_on_rbac_in_rbac_mode(self, dataset):
+ def test_get_document_delegates_permission_check_in_rbac_mode(self, dataset):
api = DocumentResource()
session = self.session
+ user = make_account()
with (
config_overrides_context(RBAC_ENABLED=True),
patch(
@@ -667,9 +668,9 @@ class TestDocumentResource(_UsesSQLiteSession):
return_value=make_document(),
),
):
- api.get_document(session, "ds-1", "doc-1", make_account(), "tenant-1")
+ api.get_document(session, "ds-1", "doc-1", user, "tenant-1")
- check_permission.assert_not_called()
+ check_permission.assert_called_once_with(dataset, user, session)
class TestDocumentApi(_UsesSQLiteSession):
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_metadata.py b/api/tests/unit_tests/controllers/console/datasets/test_metadata.py
index 55c708d0253..dc528761f74 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_metadata.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_metadata.py
@@ -168,7 +168,7 @@ class TestDatasetMetadataGetApi:
check_permission.assert_not_called()
get_metadata.assert_not_called()
- def test_get_metadata_relies_on_rbac_in_rbac_mode(
+ def test_get_metadata_delegates_permission_check_in_rbac_mode(
self, app: Flask, current_user, dataset, dataset_id, sqlite_session: Session
):
api = DatasetMetadataCreateApi()
@@ -187,7 +187,7 @@ class TestDatasetMetadataGetApi:
_, status = method(api, sqlite_session, "tenant-1", current_user, dataset_id)
assert status == 200
- check_permission.assert_not_called()
+ check_permission.assert_called_once_with(dataset, current_user, sqlite_session)
def test_get_metadata_rejects_inaccessible_dataset(
self, app: Flask, current_user, dataset, dataset_id, sqlite_session: Session
diff --git a/api/tests/unit_tests/services/test_dataset_service_dataset.py b/api/tests/unit_tests/services/test_dataset_service_dataset.py
index da1c3de26ef..4f2dd4fc258 100644
--- a/api/tests/unit_tests/services/test_dataset_service_dataset.py
+++ b/api/tests/unit_tests/services/test_dataset_service_dataset.py
@@ -1047,6 +1047,21 @@ class TestDatasetPermissions:
with pytest.raises(NoPermissionError):
DatasetService.check_dataset_permission(dataset, foreign_user, sqlite_session)
+ def test_check_dataset_permission_skips_legacy_acl_in_rbac_mode(
+ self, config_overrides: Callable[..., None], sqlite_session: Session
+ ) -> None:
+ dataset = _dataset(permission=DatasetPermissionEnum.ONLY_ME, maintainer="owner")
+ non_member = _account(account_id="non-member", role=TenantAccountRole.NORMAL)
+ foreign_user = _account(account_id="foreign", tenant_id="tenant-2", role=TenantAccountRole.NORMAL)
+ sqlite_session.add(dataset)
+ sqlite_session.commit()
+
+ config_overrides(RBAC_ENABLED=True)
+
+ DatasetService.check_dataset_permission(dataset, non_member, sqlite_session)
+ with pytest.raises(NoPermissionError):
+ DatasetService.check_dataset_permission(dataset, foreign_user, sqlite_session)
+
def test_dataset_operator_cannot_change_permission_or_member_list(self, sqlite_session: Session) -> None:
dataset = _dataset(permission=DatasetPermissionEnum.PARTIAL_TEAM)
operator = _account(role=TenantAccountRole.DATASET_OPERATOR)