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): enforce admin and RBAC permissions on default model and provider models GET endpoints (#41099) (#41100)

Pranav Agarwal24f5e2ac692e
diff --git a/api/controllers/console/workspace/models.py b/api/controllers/console/workspace/models.py
index 02b5a68f9c8..388cef52761 100644
--- a/api/controllers/console/workspace/models.py
+++ b/api/controllers/console/workspace/models.py
@@ -210,6 +210,8 @@ class DefaultModelApi(Resource):
)
@setup_required
@login_required
+ @is_admin_or_owner_required
+ @rbac_permission_required(RBACResourceScope.WORKSPACE, RBACPermission.PLUGIN_PREFERENCES, resource_required=False)
@account_initialization_required
@with_current_tenant_id
@model_validate(ParserGetDefault)
@@ -263,6 +265,8 @@ class ModelProviderModelApi(Resource):
)
@setup_required
@login_required
+ @is_admin_or_owner_required
+ @rbac_permission_required(RBACResourceScope.WORKSPACE, RBACPermission.PLUGIN_PREFERENCES, resource_required=False)
@account_initialization_required
@with_current_tenant_id
def get(self, tenant_id: str, provider: str):
diff --git a/api/tests/unit_tests/controllers/console/test_workspace_credential_mutation_permissions.py b/api/tests/unit_tests/controllers/console/test_workspace_credential_mutation_permissions.py
index f103e8a18ec..8065f9cc8de 100644
--- a/api/tests/unit_tests/controllers/console/test_workspace_credential_mutation_permissions.py
+++ b/api/tests/unit_tests/controllers/console/test_workspace_credential_mutation_permissions.py
@@ -7,7 +7,7 @@ from controllers.common.wraps import RBACPermission, RBACResourceScope
from controllers.console.datasets.data_source import DataSourceApi
from controllers.console.datasets.rag_pipeline.datasource_auth import DatasourceAuth
from controllers.console.workspace.model_providers import ModelProviderCredentialApi
-from controllers.console.workspace.models import ModelProviderModelCredentialApi
+from controllers.console.workspace.models import DefaultModelApi, ModelProviderModelApi, ModelProviderModelCredentialApi
from controllers.console.workspace.tool_providers import ToolBuiltinProviderAddApi, ToolOAuthCustomClient
@@ -82,3 +82,25 @@ def test_datasource_auth_get_requires_edit_and_rbac() -> None:
assert rbac_config["resource_type"] == RBACResourceScope.DATASET
assert rbac_config["scene"] == RBACPermission.CREDENTIAL_MANAGE
assert rbac_config["resource_required"] is False
+
+
+ "method",
+ [
+ DefaultModelApi.get,
+ ModelProviderModelApi.get,
+ ],
+)
+def test_workspace_model_preferences_get_require_admin_and_rbac(
+ method: FunctionType,
+) -> None:
+ """GET endpoints that return workspace model preferences must enforce
+ the same admin + RBAC gates as their sibling POST/DELETE methods."""
+ legacy_wrapper = unwrap(method, stop=lambda wrapper: "is_admin_or_owner_required" in wrapper.__code__.co_qualname)
+ assert "is_admin_or_owner_required" 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"] == RBACResourceScope.WORKSPACE
+ assert rbac_config["scene"] == RBACPermission.PLUGIN_PREFERENCES
+ assert rbac_config["resource_required"] is False