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.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
feat: network access group add rbac check (#44464)
wangxiaoleib3d5d468aff5
diff --git a/api/controllers/console/workspace/network_access_group.py b/api/controllers/console/workspace/network_access_group.pyindex f6bcd2cf041..5e0279661f2 100644--- a/api/controllers/console/workspace/network_access_group.py+++ b/api/controllers/console/workspace/network_access_group.py@@ -8,11 +8,12 @@ from pydantic import AliasChoices, BaseModel, Field, ValidationError, model_valifrom werkzeug.exceptions import BadGateway, BadRequest, Conflict, Forbidden, NotFound, ServiceUnavailablefrom configs import dify_config+from controllers.common.rbac import RBACCheck, Workspacefrom controllers.common.schema import query_params_from_model, register_response_schema_models, register_schema_modelsfrom controllers.console import console_nsfrom controllers.console.app.error import AppNotFoundErrorfrom controllers.console.flask_admission import console_account_admission-from controllers.console.wraps import cloud_edition_billing_paid_plan_required, model_validate+from controllers.console.wraps import RBACPermission, cloud_edition_billing_paid_plan_required, model_validatefrom core.network_access.client_ip import NetworkAccessClientIPUnavailableError, resolve_network_access_client_ipfrom enums import DeploymentEditionfrom extensions.ext_application_services import application_services@@ -265,7 +266,10 @@ class CurrentWorkspaceNetworkAccessGroupsApi(Resource):"Workspace network access groups retrieved successfully",console_ns.models[NetworkAccessGroupListResponse.__name__],)- @console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))+ @console_account_admission(+ editions=frozenset({DeploymentEdition.CLOUD}),+ rbac_checks=[RBACCheck(RBACPermission.IP_POLICY_VIEW, Workspace())],+ )def get(self, request_context: RequestContext) -> dict[str, Any]:try:payload = application_services().network_access_groups.list_groups(request_context)@@ -279,7 +283,10 @@ class CurrentWorkspaceNetworkAccessGroupsApi(Resource):"Workspace network access group created successfully",console_ns.models[NetworkAccessGroupMutationResponse.__name__],)- @console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))+ @console_account_admission(+ editions=frozenset({DeploymentEdition.CLOUD}),+ rbac_checks=[RBACCheck(RBACPermission.IP_POLICY_MANAGE, Workspace())],+ )@cloud_edition_billing_paid_plan_required@model_validate(NetworkAccessGroupCreatePayload)def post(@@ -323,7 +330,10 @@ class CurrentWorkspaceNetworkAccessGroupApi(Resource):"Workspace network access group updated successfully",console_ns.models[NetworkAccessGroupMutationResponse.__name__],)- @console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))+ @console_account_admission(+ editions=frozenset({DeploymentEdition.CLOUD}),+ rbac_checks=[RBACCheck(RBACPermission.IP_POLICY_MANAGE, Workspace())],+ )@cloud_edition_billing_paid_plan_required@model_validate(NetworkAccessGroupUpdatePayload)def put(@@ -351,7 +361,10 @@ class CurrentWorkspaceNetworkAccessGroupApi(Resource):"Workspace network access group deleted successfully",console_ns.models[NetworkAccessGroupDeleteResponse.__name__],)- @console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))+ @console_account_admission(+ editions=frozenset({DeploymentEdition.CLOUD}),+ rbac_checks=[RBACCheck(RBACPermission.IP_POLICY_MANAGE, Workspace())],+ )@cloud_edition_billing_paid_plan_required@model_validate(NetworkAccessGroupDeleteQuery)def delete(diff --git a/api/core/rbac/entities.py b/api/core/rbac/entities.pyindex e35e12e01e5..aca52f6b214 100644--- a/api/core/rbac/entities.py+++ b/api/core/rbac/entities.py@@ -97,6 +97,9 @@ class RBACPermission(StrEnum):TOOL_MANAGE = "tool_manage"MCP_MANAGE = "mcp_manage"+ IP_POLICY_VIEW = "ip_policy_view"+ IP_POLICY_MANAGE = "ip_policy_manage"+@propertydef scope(self) -> RBACResourceScope:if self in _FUNCTION_SCOPED_RESOURCE_SCENES: