mirror of
https://github.com/langgenius/dify.git
synced 2026-08-29 03:45:08 +08:00
chore: remove permission check (#41349)
This commit is contained in:
@@ -210,8 +210,6 @@ 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)
|
||||
@@ -228,8 +226,6 @@ class DefaultModelApi(Resource):
|
||||
@console_ns.response(200, "Success", console_ns.models[SimpleResultResponse.__name__])
|
||||
@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(ParserPostDefault)
|
||||
@@ -265,8 +261,6 @@ 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):
|
||||
@@ -279,8 +273,6 @@ class ModelProviderModelApi(Resource):
|
||||
@console_ns.response(200, "Model updated successfully", console_ns.models[SimpleResultResponse.__name__])
|
||||
@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(ParserPostModels)
|
||||
@@ -328,8 +320,6 @@ class ModelProviderModelApi(Resource):
|
||||
@console_ns.response(204, "Model deleted successfully")
|
||||
@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(ParserDeleteModels)
|
||||
@@ -353,8 +343,6 @@ class ModelProviderModelCredentialApi(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_user
|
||||
@with_current_tenant_id
|
||||
|
||||
-24
@@ -9,7 +9,6 @@ from controllers.console.agent.roster import AgentAppApi
|
||||
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 DefaultModelApi, ModelProviderModelApi, ModelProviderModelCredentialApi
|
||||
from controllers.console.workspace.tool_providers import ToolBuiltinProviderAddApi, ToolOAuthCustomClient
|
||||
|
||||
|
||||
@@ -38,7 +37,6 @@ def test_workspace_credential_mutations_require_management_permission(
|
||||
"method",
|
||||
[
|
||||
ModelProviderCredentialApi.get,
|
||||
ModelProviderModelCredentialApi.get,
|
||||
],
|
||||
)
|
||||
def test_model_provider_credential_get_requires_admin_and_rbac(
|
||||
@@ -86,28 +84,6 @@ def test_datasource_auth_get_requires_edit_and_rbac() -> None:
|
||||
assert rbac_config["resource_required"] is False
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"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
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"method",
|
||||
[
|
||||
|
||||
Reference in New Issue
Block a user