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): protect custom OAuth client deletion (#40786)

WH-2099b6694d462f1d
diff --git a/api/controllers/console/datasets/rag_pipeline/datasource_auth.py b/api/controllers/console/datasets/rag_pipeline/datasource_auth.py
index c8bfc5bae86..df87c4dd2ee 100644
--- a/api/controllers/console/datasets/rag_pipeline/datasource_auth.py
+++ b/api/controllers/console/datasets/rag_pipeline/datasource_auth.py
@@ -436,6 +436,8 @@ class DatasourceAuthOauthCustomClient(Resource):
@setup_required
@login_required
@account_initialization_required
+ @edit_permission_required
+ @rbac_permission_required(RBACResourceScope.DATASET, RBACPermission.CREDENTIAL_MANAGE, resource_required=False)
@console_ns.response(200, "Success", console_ns.models[SimpleResultResponse.__name__])
@with_current_tenant_id
def delete(self, current_tenant_id: str, provider_id: str):
diff --git a/api/controllers/console/workspace/tool_providers.py b/api/controllers/console/workspace/tool_providers.py
index 68daf17d535..222ffd99a31 100644
--- a/api/controllers/console/workspace/tool_providers.py
+++ b/api/controllers/console/workspace/tool_providers.py
@@ -1268,6 +1268,8 @@ class ToolOAuthCustomClient(Resource):
)
@setup_required
@login_required
+ @is_admin_or_owner_required
+ @rbac_permission_required(RBACResourceScope.WORKSPACE, RBACPermission.CREDENTIAL_MANAGE, resource_required=False)
@account_initialization_required
@with_current_tenant_id
def delete(self, current_tenant_id: str, provider: str):
diff --git a/api/tests/unit_tests/controllers/console/test_oauth_custom_client_permissions.py b/api/tests/unit_tests/controllers/console/test_oauth_custom_client_permissions.py
new file mode 100644
index 00000000000..92b5ac14406
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/test_oauth_custom_client_permissions.py
@@ -0,0 +1,28 @@
+from inspect import getclosurevars, unwrap
+from types import FunctionType
+
+import pytest
+
+from controllers.common.wraps import RBACPermission, RBACResourceScope
+from controllers.console.datasets.rag_pipeline.datasource_auth import DatasourceAuthOauthCustomClient
+from controllers.console.workspace.tool_providers import ToolOAuthCustomClient
+
+
+ ("method", "legacy_gate", "resource_type"),
+ [
+ (ToolOAuthCustomClient.delete, "is_admin_or_owner_required", RBACResourceScope.WORKSPACE),
+ (DatasourceAuthOauthCustomClient.delete, "edit_permission_required", RBACResourceScope.DATASET),
+ ],
+)
+def test_custom_oauth_client_delete_requires_management_permission(
+ method: FunctionType, legacy_gate: str, resource_type: RBACResourceScope
+) -> None:
+ legacy_wrapper = unwrap(method, stop=lambda wrapper: legacy_gate in wrapper.__code__.co_qualname)
+ assert legacy_gate in legacy_wrapper.__code__.co_qualname
+
+ rbac_wrapper = unwrap(method, stop=lambda wrapper: "rbac_permission_required" in wrapper.__code__.co_qualname)
+ rbac_config = getclosurevars(rbac_wrapper).nonlocals
+ assert rbac_config["resource_type"] == resource_type
+ assert rbac_config["scene"] == RBACPermission.CREDENTIAL_MANAGE
+ assert rbac_config["resource_required"] is False