Files
dify/api/controllers/console/workspace/network_access_group.py
T
CodingOnStar 954ba55eb3 Merge remote-tracking branch 'origin/main' into song/snp-682-ip-allowlist
# Conflicts:
#	api/controllers/mcp/mcp.py
#	api/controllers/openapi/__init__.py
#	api/controllers/web/login.py
#	api/controllers/web/wraps.py
#	api/extensions/ext_application_services.py
#	api/openapi/markdown/console-openapi.md
#	api/services/webapp_access_query_service.py
#	api/tests/unit_tests/controllers/web/test_web_login.py
#	api/tests/unit_tests/controllers/web/test_wraps.py
#	api/tests/unit_tests/extensions/test_ext_application_services.py
#	packages/contracts/generated/api/console/apps/orpc.gen.ts
#	packages/contracts/generated/api/console/apps/types.gen.ts
#	web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
#	web/app/components/app/access-point/index.tsx
#	web/app/components/base/chat/chat/hooks.ts
#	web/app/components/base/file-uploader/hooks.ts
#	web/app/components/base/image-uploader/__tests__/hooks.spec.ts
#	web/app/components/base/image-uploader/hooks.ts
#	web/app/components/explore/try-app/index.tsx
#	web/features/agent-v2/agent-detail/__tests__/layout.spec.tsx
#	web/i18n/ar-TN/common.json
#	web/i18n/de-DE/common.json
#	web/i18n/en-US/common.json
#	web/i18n/es-ES/common.json
#	web/i18n/fa-IR/common.json
#	web/i18n/fr-FR/common.json
#	web/i18n/hi-IN/common.json
#	web/i18n/id-ID/common.json
#	web/i18n/it-IT/common.json
#	web/i18n/ja-JP/common.json
#	web/i18n/ko-KR/common.json
#	web/i18n/lo-LA/common.json
#	web/i18n/nl-NL/common.json
#	web/i18n/pl-PL/common.json
#	web/i18n/pt-BR/common.json
#	web/i18n/ro-RO/common.json
#	web/i18n/ru-RU/common.json
#	web/i18n/sl-SI/common.json
#	web/i18n/th-TH/common.json
#	web/i18n/tr-TR/common.json
#	web/i18n/uk-UA/common.json
#	web/i18n/vi-VN/common.json
#	web/i18n/zh-Hans/common.json
#	web/i18n/zh-Hant/common.json
#	web/service/console/query-policies.ts
2026-09-29 16:53:53 +08:00

492 lines
20 KiB
Python

from datetime import datetime
from typing import Any, Self
from uuid import UUID
from flask import Response, after_this_request, request
from flask_restx import Resource
from pydantic import AliasChoices, BaseModel, Field, ValidationError, model_validator
from werkzeug.exceptions import BadGateway, BadRequest, Conflict, Forbidden, NotFound, ServiceUnavailable
from configs import dify_config
from controllers.common.schema import query_params_from_model, register_response_schema_models, register_schema_models
from controllers.console import console_ns
from controllers.console.app.error import AppNotFoundError
from controllers.console.flask_admission import console_account_admission
from controllers.console.wraps import cloud_edition_billing_paid_plan_required, model_validate
from core.network_access.client_ip import NetworkAccessClientIPUnavailableError, resolve_network_access_client_ip
from enums import DeploymentEdition
from extensions.ext_application_services import application_services
from fields.base import ResponseModel
from libs.helper import dump_response
from machinery.context import RequestContext
from services.network_access_group_service import (
NetworkAccessGroupAccessDeniedError,
NetworkAccessGroupAppNotFoundError,
NetworkAccessGroupEntitlementUnavailableError,
NetworkAccessGroupError,
NetworkAccessGroupInvalidPolicyError,
NetworkAccessGroupInvalidResponseError,
NetworkAccessGroupUnsupportedAccessPointsError,
NetworkAccessGroupUnsupportedAppModeError,
NetworkAccessGroupUpstreamError,
NetworkAccessPoint,
)
class NetworkAccessGroupCreatePayload(BaseModel):
name: str = Field(min_length=1, max_length=100)
description: str = Field(default="", max_length=500)
allowed_cidrs: list[str] = Field(min_length=1, max_length=100)
class NetworkAccessGroupUpdatePayload(NetworkAccessGroupCreatePayload):
expected_version: int = Field(ge=1)
class NetworkAccessGroupDeleteQuery(BaseModel):
expected_version: int = Field(ge=1, description="Current group version used for optimistic concurrency")
class AppNetworkAccessGroupUpdatePayload(BaseModel):
enabled: bool
group_id: UUID | None = Field(
validation_alias=AliasChoices("group_id", "groupId", "policy_id", "policyId"),
)
access_points: list[NetworkAccessPoint] = Field(
max_length=4,
validation_alias=AliasChoices("access_points", "accessPoints"),
)
expected_version: int = Field(ge=0)
@model_validator(mode="after")
def validate_enabled_configuration(self) -> Self:
if len(set(self.access_points)) != len(self.access_points):
raise ValueError("access_points must not contain duplicates")
if self.enabled and self.group_id is None:
raise ValueError("group_id is required when network access control is enabled")
if self.enabled and not self.access_points:
raise ValueError("access_points must not be empty when network access control is enabled")
return self
class NetworkAccessGroupAppResponse(ResponseModel):
id: str
name: str
icon: str | None = None
icon_type: str | None = None
icon_background: str | None = None
mode: str
bound_agent_id: str | None = None
class NetworkAccessGroupResponse(ResponseModel):
id: str
tenant_id: str
name: str
description: str = ""
allowed_cidrs: list[str] = Field(
min_length=1,
max_length=100,
)
version: int = Field(ge=1)
used_by_count: int = Field(ge=0)
enforcing_count: int = Field(ge=0)
app_ids: list[str]
apps: list[NetworkAccessGroupAppResponse]
updated_by_account_id: str | None = None
created_at: datetime
updated_at: datetime
@model_validator(mode="after")
def validate_enforcing_count(self) -> Self:
if self.enforcing_count > self.used_by_count:
raise ValueError("enforcing_count must not exceed used_by_count")
return self
class NetworkAccessGroupListResponse(ResponseModel):
tenant_id: str
entitled: bool
groups: list[NetworkAccessGroupResponse]
class NetworkAccessGroupMutationResponse(ResponseModel):
group: NetworkAccessGroupResponse
class NetworkAccessGroupDeleteResponse(ResponseModel):
deleted: bool
class NetworkAccessGroupCurrentIPResponse(ResponseModel):
client_ip: str
class NetworkAccessGroupCurrentIPCheckResponse(ResponseModel):
client_ip: str
allowed: bool
policy_version: int = Field(ge=1)
class AppNetworkAccessGroupBindingResponse(ResponseModel):
id: str
tenant_id: str
app_id: str
enabled: bool
group_id: str | None = None
access_points: list[NetworkAccessPoint] = Field(
max_length=4,
)
version: int = Field(ge=1)
updated_by_account_id: str | None = None
created_at: datetime
updated_at: datetime
@model_validator(mode="after")
def validate_enabled_configuration(self) -> Self:
if len(set(self.access_points)) != len(self.access_points):
raise ValueError("access_points must not contain duplicates")
if self.enabled and self.group_id is None:
raise ValueError("group_id is required when network access control is enabled")
# A saved enabled binding can have no scopes supported by the App's
# current mode. Preserve its switch/reference; effective_enabled is false.
return self
class AppNetworkAccessGroupResponse(ResponseModel):
tenant_id: str
app_id: str
entitled: bool
effective_enabled: bool
available_access_points: list[NetworkAccessPoint]
binding: AppNetworkAccessGroupBindingResponse | None
class AppNetworkAccessGroupStatusResponse(ResponseModel):
entitled: bool
configured: bool
enabled: bool
covered_count: int = Field(ge=0)
available_count: int = Field(ge=0)
class AppNetworkAccessGroupMutationResponse(ResponseModel):
binding: AppNetworkAccessGroupBindingResponse
effective_enabled: bool
available_access_points: list[NetworkAccessPoint]
register_schema_models(
console_ns,
NetworkAccessGroupCreatePayload,
NetworkAccessGroupUpdatePayload,
AppNetworkAccessGroupUpdatePayload,
)
register_response_schema_models(
console_ns,
NetworkAccessGroupAppResponse,
NetworkAccessGroupResponse,
NetworkAccessGroupListResponse,
NetworkAccessGroupMutationResponse,
NetworkAccessGroupDeleteResponse,
NetworkAccessGroupCurrentIPResponse,
NetworkAccessGroupCurrentIPCheckResponse,
AppNetworkAccessGroupBindingResponse,
AppNetworkAccessGroupResponse,
AppNetworkAccessGroupStatusResponse,
AppNetworkAccessGroupMutationResponse,
)
def _translate_upstream_error(exc: NetworkAccessGroupUpstreamError) -> Exception:
if exc.reason == "INVALID_SECRET_KEY":
return ServiceUnavailable("Network access group service authentication failed.")
if exc.status_code in (400, 422):
return BadRequest("Invalid network access group request.")
if exc.status_code == 401:
return ServiceUnavailable("Network access group service authentication failed.")
if exc.status_code == 403:
return Forbidden("Network access groups are not available for this workspace.")
if exc.status_code == 404:
return NotFound("Network access group was not found.")
if exc.status_code == 409:
message_by_reason = {
"NETWORK_ACCESS_VERSION_CONFLICT": "The network access resource changed. Refresh it and try again.",
"NETWORK_ACCESS_GROUP_NAME_CONFLICT": "A network access group with this name already exists.",
"NETWORK_ACCESS_GROUP_LIMIT": "This workspace has reached the network access group limit.",
}
return Conflict(message_by_reason.get(exc.reason or "", "The network access resource is in conflict."))
if exc.status_code >= 500:
return ServiceUnavailable("Network access group service is unavailable.")
return BadGateway("Unexpected response from the network access group service.")
def _translate_service_error(exc: NetworkAccessGroupError) -> Exception:
if isinstance(exc, NetworkAccessGroupInvalidResponseError):
return BadGateway("Invalid response from the network access group service.")
if isinstance(exc, NetworkAccessGroupUpstreamError):
return _translate_upstream_error(exc)
if isinstance(exc, NetworkAccessGroupAccessDeniedError):
return Forbidden("Your workspace role does not allow this network access operation.")
if isinstance(exc, NetworkAccessGroupEntitlementUnavailableError):
return ServiceUnavailable("Billing entitlement is temporarily unavailable.")
if isinstance(exc, NetworkAccessGroupAppNotFoundError):
return AppNotFoundError()
if isinstance(exc, NetworkAccessGroupUnsupportedAppModeError):
return BadRequest(f"Network access control is not supported for app mode '{exc.app_mode}'.")
if isinstance(exc, NetworkAccessGroupUnsupportedAccessPointsError):
return BadRequest(f"Unsupported access points for this app: {', '.join(exc.access_points)}.")
if isinstance(exc, NetworkAccessGroupInvalidPolicyError):
return ServiceUnavailable("Network access policy cannot be evaluated.")
raise TypeError(f"Unsupported network access group error: {type(exc).__name__}")
def _serialize_response(response_model: type[ResponseModel], payload: object) -> dict[str, Any]:
try:
return dump_response(response_model, payload)
except ValidationError as exc:
raise BadGateway("Invalid response from the network access group service.") from exc
def _resolve_current_network_access_client_ip() -> str:
trusted_proxy_cidrs = dify_config.NETWORK_ACCESS_TRUSTED_PROXY_CIDRS
if not trusted_proxy_cidrs.strip():
# This Cloud-only UI must never label an internal Docker/ALB socket peer
# as the user's address when deployment trust configuration is missing.
raise NetworkAccessClientIPUnavailableError("network access trusted proxies are not configured")
return resolve_network_access_client_ip(request.environ, trusted_proxy_cidrs)
@console_ns.route("/workspaces/current/network-access-groups")
class CurrentWorkspaceNetworkAccessGroupsApi(Resource):
@console_ns.response(
200,
"Workspace network access groups retrieved successfully",
console_ns.models[NetworkAccessGroupListResponse.__name__],
)
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
def get(self, request_context: RequestContext) -> dict[str, Any]:
try:
payload = application_services().network_access_groups.list_groups(request_context)
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(NetworkAccessGroupListResponse, payload)
@console_ns.expect(console_ns.models[NetworkAccessGroupCreatePayload.__name__])
@console_ns.response(
201,
"Workspace network access group created successfully",
console_ns.models[NetworkAccessGroupMutationResponse.__name__],
)
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
@cloud_edition_billing_paid_plan_required
@model_validate(NetworkAccessGroupCreatePayload)
def post(
self,
req_data: NetworkAccessGroupCreatePayload,
request_context: RequestContext,
) -> tuple[dict[str, Any], int]:
try:
payload = application_services().network_access_groups.create_group(
request_context,
name=req_data.name,
description=req_data.description,
allowed_cidrs=req_data.allowed_cidrs,
)
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(NetworkAccessGroupMutationResponse, {"group": payload}), 201
@console_ns.route("/workspaces/current/network-access-groups/<uuid:group_id>")
class CurrentWorkspaceNetworkAccessGroupApi(Resource):
@console_ns.response(
200,
"Workspace network access group retrieved successfully",
console_ns.models[NetworkAccessGroupMutationResponse.__name__],
)
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
def get(self, request_context: RequestContext, group_id: UUID) -> dict[str, Any]:
try:
payload = application_services().network_access_groups.get_group(
request_context,
group_id=str(group_id),
)
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(NetworkAccessGroupMutationResponse, {"group": payload})
@console_ns.expect(console_ns.models[NetworkAccessGroupUpdatePayload.__name__])
@console_ns.response(
200,
"Workspace network access group updated successfully",
console_ns.models[NetworkAccessGroupMutationResponse.__name__],
)
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
@cloud_edition_billing_paid_plan_required
@model_validate(NetworkAccessGroupUpdatePayload)
def put(
self,
req_data: NetworkAccessGroupUpdatePayload,
request_context: RequestContext,
group_id: UUID,
) -> dict[str, Any]:
try:
payload = application_services().network_access_groups.update_group(
request_context,
group_id=str(group_id),
name=req_data.name,
description=req_data.description,
allowed_cidrs=req_data.allowed_cidrs,
expected_version=req_data.expected_version,
)
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(NetworkAccessGroupMutationResponse, {"group": payload})
@console_ns.doc(params=query_params_from_model(NetworkAccessGroupDeleteQuery))
@console_ns.response(
200,
"Workspace network access group deleted successfully",
console_ns.models[NetworkAccessGroupDeleteResponse.__name__],
)
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
@cloud_edition_billing_paid_plan_required
@model_validate(NetworkAccessGroupDeleteQuery)
def delete(
self,
req_data: NetworkAccessGroupDeleteQuery,
request_context: RequestContext,
group_id: UUID,
) -> dict[str, Any]:
try:
payload = application_services().network_access_groups.delete_group(
request_context,
group_id=str(group_id),
expected_version=req_data.expected_version,
)
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(NetworkAccessGroupDeleteResponse, {"deleted": payload})
@console_ns.route("/workspaces/current/network-access-groups/current-ip")
class CurrentWorkspaceNetworkAccessGroupCurrentIPApi(Resource):
@console_ns.response(
200,
"Trusted current client IP retrieved without requiring an existing network access group",
console_ns.models[NetworkAccessGroupCurrentIPResponse.__name__],
)
@console_ns.response(403, "The workspace role does not allow network access policy reads")
@console_ns.response(503, "A trusted current client IP is unavailable")
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
def get(self, request_context: RequestContext) -> dict[str, Any]:
@after_this_request
def disable_client_ip_response_cache(response: Response) -> Response:
response.headers["Cache-Control"] = "no-store"
return response
try:
payload = application_services().network_access_groups.get_current_ip(
request_context,
client_ip_supplier=_resolve_current_network_access_client_ip,
)
except NetworkAccessClientIPUnavailableError as exc:
raise ServiceUnavailable("Current client IP is unavailable.") from exc
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(NetworkAccessGroupCurrentIPResponse, {"client_ip": payload})
@console_ns.route("/workspaces/current/network-access-groups/<uuid:group_id>/check-current-ip")
class CurrentWorkspaceNetworkAccessGroupCurrentIPCheckApi(Resource):
@console_ns.response(
200,
"Current client IP checked against the workspace network access group",
console_ns.models[NetworkAccessGroupCurrentIPCheckResponse.__name__],
)
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
def get(self, request_context: RequestContext, group_id: UUID) -> dict[str, Any]:
@after_this_request
def disable_client_ip_response_cache(response: Response) -> Response:
response.headers["Cache-Control"] = "no-store"
return response
try:
payload = application_services().network_access_groups.check_current_ip(
request_context,
group_id=str(group_id),
client_ip_supplier=_resolve_current_network_access_client_ip,
)
except NetworkAccessClientIPUnavailableError as exc:
raise ServiceUnavailable("Current client IP is unavailable.") from exc
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(NetworkAccessGroupCurrentIPCheckResponse, payload)
@console_ns.route("/apps/<uuid:app_id>/network-access-group")
class AppNetworkAccessGroupApi(Resource):
@console_ns.response(
200,
"App network access group binding retrieved successfully",
console_ns.models[AppNetworkAccessGroupResponse.__name__],
)
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
def get(self, request_context: RequestContext, app_id: UUID) -> dict[str, Any]:
try:
payload = application_services().network_access_groups.get_app_binding(
request_context,
app_id=str(app_id),
)
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(AppNetworkAccessGroupResponse, payload)
@console_ns.expect(console_ns.models[AppNetworkAccessGroupUpdatePayload.__name__])
@console_ns.response(
200,
"App network access group binding updated successfully",
console_ns.models[AppNetworkAccessGroupMutationResponse.__name__],
)
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
@cloud_edition_billing_paid_plan_required
@model_validate(AppNetworkAccessGroupUpdatePayload)
def put(
self,
req_data: AppNetworkAccessGroupUpdatePayload,
request_context: RequestContext,
app_id: UUID,
) -> dict[str, Any]:
try:
payload = application_services().network_access_groups.update_app_binding(
request_context,
app_id=str(app_id),
enabled=req_data.enabled,
group_id=str(req_data.group_id) if req_data.group_id is not None else None,
access_points=list(req_data.access_points),
expected_version=req_data.expected_version,
)
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(AppNetworkAccessGroupMutationResponse, payload)
@console_ns.route("/apps/<uuid:app_id>/network-access-group/status")
class AppNetworkAccessGroupStatusApi(Resource):
@console_ns.response(
200,
"App network access control entry status retrieved successfully",
console_ns.models[AppNetworkAccessGroupStatusResponse.__name__],
)
@console_account_admission(editions=frozenset({DeploymentEdition.CLOUD}))
def get(self, request_context: RequestContext, app_id: UUID) -> dict[str, Any]:
try:
payload = application_services().network_access_groups.get_app_status(
request_context,
app_id=str(app_id),
)
except NetworkAccessGroupError as exc:
raise _translate_service_error(exc) from exc
return _serialize_response(AppNetworkAccessGroupStatusResponse, payload)