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): keep workflow log archives owner-admin only (#39338)

yyh861831f17608
diff --git a/api/controllers/console/workflow_run_archive.py b/api/controllers/console/workflow_run_archive.py
index c8a43594af9..e15b897d5b5 100644
--- a/api/controllers/console/workflow_run_archive.py
+++ b/api/controllers/console/workflow_run_archive.py
@@ -4,20 +4,16 @@ from http import HTTPStatus
from flask import redirect
from flask_restx import Resource
from pydantic import BaseModel, Field
-from werkzeug.exceptions import Conflict, NotFound
+from werkzeug.exceptions import Conflict, Forbidden, NotFound
from controllers.common.fields import RedirectResponse
from controllers.common.schema import register_response_schema_models, register_schema_models
from controllers.console import console_ns
from controllers.console.wraps import (
- RBACPermission,
- RBACResourceScope,
account_initialization_required,
cloud_edition_billing_enabled,
cloud_edition_billing_paid_plan_required,
- is_admin_or_owner_required,
only_edition_cloud,
- rbac_permission_required,
setup_required,
)
from extensions.ext_database import db
@@ -25,6 +21,7 @@ from fields.base import ResponseModel
from libs.archive_storage import get_export_storage
from libs.helper import dump_response
from libs.login import current_account_with_tenant, login_required
+from models import TenantAccountRole
from services.retention.workflow_run.archive_download_preparation import ARCHIVE_DOWNLOAD_MIME_TYPE
from services.retention.workflow_run.archive_download_task_cache import (
WorkflowRunArchiveDownloadStatus,
@@ -98,11 +95,13 @@ register_response_schema_models(
)
-def _current_ids() -> tuple[str, str]:
- """Return current `(tenant_id, account_id)` or raise when no workspace is selected."""
+def _current_owner_or_admin_ids() -> tuple[str, str]:
+ """Return current Cloud workspace IDs for an owner or admin, independently of enterprise RBAC."""
current_user, current_tenant_id = current_account_with_tenant()
if not current_tenant_id:
raise NotFound("Current workspace not found")
+ if not TenantAccountRole.is_privileged_role(current_user.current_role):
+ raise Forbidden()
return current_tenant_id, current_user.id
@@ -124,12 +123,8 @@ class WorkflowRunArchivesApi(Resource):
@only_edition_cloud
@cloud_edition_billing_enabled
@cloud_edition_billing_paid_plan_required
- @is_admin_or_owner_required
- @rbac_permission_required(
- RBACResourceScope.WORKSPACE, RBACPermission.WORKSPACE_ROLE_MANAGE, resource_required=False
- )
def get(self):
- tenant_id, _ = _current_ids()
+ tenant_id, _ = _current_owner_or_admin_ids()
return dump_response(WorkflowRunArchiveListResponse, list_workflow_run_archives(db.session(), tenant_id))
@@ -149,12 +144,8 @@ class WorkflowRunArchiveDownloadsApi(Resource):
@only_edition_cloud
@cloud_edition_billing_enabled
@cloud_edition_billing_paid_plan_required
- @is_admin_or_owner_required
- @rbac_permission_required(
- RBACResourceScope.WORKSPACE, RBACPermission.WORKSPACE_ROLE_MANAGE, resource_required=False
- )
def post(self):
- tenant_id, account_id = _current_ids()
+ tenant_id, account_id = _current_owner_or_admin_ids()
payload = WorkflowRunArchiveDownloadPayload.model_validate(console_ns.payload or {})
try:
task = create_workflow_run_archive_download_task(
@@ -180,12 +171,8 @@ class WorkflowRunArchiveDownloadApi(Resource):
@only_edition_cloud
@cloud_edition_billing_enabled
@cloud_edition_billing_paid_plan_required
- @is_admin_or_owner_required
- @rbac_permission_required(
- RBACResourceScope.WORKSPACE, RBACPermission.WORKSPACE_ROLE_MANAGE, resource_required=False
- )
def get(self, download_id: str):
- tenant_id, _ = _current_ids()
+ tenant_id, _ = _current_owner_or_admin_ids()
try:
task = get_workflow_run_archive_download_task(tenant_id=tenant_id, download_id=download_id)
except WorkflowRunArchiveDownloadTaskNotFoundError as exc:
@@ -209,12 +196,8 @@ class WorkflowRunArchiveDownloadFileApi(Resource):
@only_edition_cloud
@cloud_edition_billing_enabled
@cloud_edition_billing_paid_plan_required
- @is_admin_or_owner_required
- @rbac_permission_required(
- RBACResourceScope.WORKSPACE, RBACPermission.WORKSPACE_ROLE_MANAGE, resource_required=False
- )
def get(self, download_id: str):
- tenant_id, _ = _current_ids()
+ tenant_id, _ = _current_owner_or_admin_ids()
try:
task = get_ready_workflow_run_archive_download_task(tenant_id=tenant_id, download_id=download_id)
except WorkflowRunArchiveDownloadTaskNotFoundError as exc:
diff --git a/api/tests/unit_tests/controllers/console/test_workflow_run_archive.py b/api/tests/unit_tests/controllers/console/test_workflow_run_archive.py
index 6c01e378ca5..bff41cb97b1 100644
--- a/api/tests/unit_tests/controllers/console/test_workflow_run_archive.py
+++ b/api/tests/unit_tests/controllers/console/test_workflow_run_archive.py
@@ -1,11 +1,77 @@
+from types import SimpleNamespace
+
import pytest
+from werkzeug.exceptions import Forbidden
+from configs import dify_config
+from controllers.console import workflow_run_archive
from controllers.console.workflow_run_archive import (
WorkflowRunArchiveDownloadApi,
WorkflowRunArchiveDownloadFileApi,
WorkflowRunArchiveDownloadsApi,
WorkflowRunArchivesApi,
)
+from models import TenantAccountRole
+
+
+ "role",
+ [TenantAccountRole.EDITOR, TenantAccountRole.NORMAL, TenantAccountRole.DATASET_OPERATOR],
+)
[email protected]("rbac_enabled", [False, True])
+def test_current_owner_or_admin_ids_rejects_non_manager(
+ monkeypatch: pytest.MonkeyPatch, role: TenantAccountRole, rbac_enabled: bool
+) -> None:
+ current_user = SimpleNamespace(id="account-1", current_role=role)
+ monkeypatch.setattr(dify_config, "RBAC_ENABLED", rbac_enabled)
+ monkeypatch.setattr(
+ workflow_run_archive,
+ "current_account_with_tenant",
+ lambda: (current_user, "tenant-1"),
+ )
+
+ with pytest.raises(Forbidden):
+ workflow_run_archive._current_owner_or_admin_ids()
+
+
[email protected]("role", [TenantAccountRole.OWNER, TenantAccountRole.ADMIN])
[email protected]("rbac_enabled", [False, True])
+def test_current_owner_or_admin_ids_returns_current_ids_for_manager(
+ monkeypatch: pytest.MonkeyPatch, role: TenantAccountRole, rbac_enabled: bool
+) -> None:
+ current_user = SimpleNamespace(id="account-1", current_role=role)
+ monkeypatch.setattr(dify_config, "RBAC_ENABLED", rbac_enabled)
+ monkeypatch.setattr(
+ workflow_run_archive,
+ "current_account_with_tenant",
+ lambda: (current_user, "tenant-1"),
+ )
+
+ assert workflow_run_archive._current_owner_or_admin_ids() == ("tenant-1", "account-1")
+
+
+ ("method", "args"),
+ [
+ (WorkflowRunArchivesApi.get, ()),
+ (WorkflowRunArchiveDownloadsApi.post, ()),
+ (WorkflowRunArchiveDownloadApi.get, ("download-1",)),
+ (WorkflowRunArchiveDownloadFileApi.get, ("download-1",)),
+ ],
+)
+def test_workflow_run_archive_endpoints_enforce_fixed_workspace_roles(
+ monkeypatch: pytest.MonkeyPatch, method, args: tuple[str, ...]
+) -> None:
+ while hasattr(method, "__wrapped__"):
+ method = method.__wrapped__
+
+ def reject_non_manager() -> tuple[str, str]:
+ raise Forbidden()
+
+ monkeypatch.setattr(workflow_run_archive, "_current_owner_or_admin_ids", reject_non_manager)
+
+ with pytest.raises(Forbidden):
+ method(None, *args)
@pytest.mark.parametrize(
@@ -28,3 +94,4 @@ def test_workflow_run_archive_endpoints_require_cloud_paid_plan(method) -> None:
"cloud_edition_billing_enabled",
"cloud_edition_billing_paid_plan_required",
} <= decorator_names
+ assert "rbac_permission_required" not in decorator_names