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
fix: allow workspace membership changes after KnowledgeFS initialization (#45564)
非法操作d71c36086bce
diff --git a/api/services/knowledge_fs/cutover.py b/api/services/knowledge_fs/cutover.pyindex 00ac509ea0b..c70bbc4d996 100644--- a/api/services/knowledge_fs/cutover.py+++ b/api/services/knowledge_fs/cutover.py@@ -54,6 +54,7 @@ from repositories.knowledge_fs_cutover_repository import (KnowledgeFSShadowDiffCASUpdate,)from repositories.sqlalchemy_knowledge_fs_cutover_repository import SQLAlchemyKnowledgeFSCutoverRepository+from services.knowledge_fs.greenfield_anchor import greenfield_activation_identityfrom services.knowledge_fs.lifecycle_port import (KnowledgeFSDifyIntegrationActivationAck,KnowledgeFSDifyIntegrationActivationRequest,@@ -670,8 +671,7 @@ class KnowledgeFSWorkspaceCutoverService:"Workspace with legacy dependencies is not eligible for automatic greenfield initialization")if control_spaces:- anchor_id = _greenfield_activation_anchor_id(tenant_id)- provisioning_key = _greenfield_activation_provisioning_key(tenant_id)+ anchor_id, provisioning_key = greenfield_activation_identity(tenant_id)if len(control_spaces) != 1:raise KnowledgeFSCutoverGateBlockedError("Workspace with existing KnowledgeFS control state is not greenfield"@@ -2401,8 +2401,7 @@ class KnowledgeFSWorkspaceCutoverService:if control_space is not None:return _ActivationAnchor(control_space.id, False)- greenfield_anchor = _greenfield_activation_anchor_id(tenant_id)- greenfield_provisioning_key = _greenfield_activation_provisioning_key(tenant_id)+ greenfield_anchor, greenfield_provisioning_key = greenfield_activation_identity(tenant_id)local_control_space_count = session.scalar(sa.select(sa.func.count()).select_from(KnowledgeFSControlSpace)@@ -2557,14 +2556,6 @@ def _shadow_traffic_zero_digest(payload: ShadowCompletionInput) -> str:return f"sha256:{hashlib.sha256(canonical).hexdigest()}"-def _greenfield_activation_anchor_id(tenant_id: str) -> str:- return str(uuid5(NAMESPACE_URL, f"dify-kfs-greenfield-activation:{tenant_id}"))---def _greenfield_activation_provisioning_key(tenant_id: str) -> str:- return f"dify-kfs-greenfield-activation:{tenant_id}"--def _is_zero_space_cutover_ledger(ledger: KnowledgeFSWorkspaceCutoverLedger) -> bool:return (ledger.source_revision_watermark == _ZERO_REVISION_WATERMARKdiff --git a/api/services/knowledge_fs/greenfield_anchor.py b/api/services/knowledge_fs/greenfield_anchor.pynew file mode 100644index 00000000000..221bdf1efa0--- /dev/null+++ b/api/services/knowledge_fs/greenfield_anchor.py@@ -0,0 +1,8 @@+"""Identity of the audit-only control space created for an empty Workspace."""++from uuid import NAMESPACE_URL, uuid5+++def greenfield_activation_identity(tenant_id: str) -> tuple[str, str]:+ provisioning_key = f"dify-kfs-greenfield-activation:{tenant_id}"+ return str(uuid5(NAMESPACE_URL, provisioning_key)), provisioning_keydiff --git a/api/services/knowledge_fs/membership_changes.py b/api/services/knowledge_fs/membership_changes.pyindex e798805bc50..b45a305e970 100644--- a/api/services/knowledge_fs/membership_changes.py+++ b/api/services/knowledge_fs/membership_changes.py@@ -15,7 +15,9 @@ from models.knowledge_fs import (KnowledgeFSControlSpacePermission,KnowledgeFSControlSpacePermissionRole,KnowledgeFSControlSpacePermissionStatus,+ KnowledgeFSControlSpaceState,)+from services.knowledge_fs.greenfield_anchor import greenfield_activation_identityfrom services.knowledge_fs.revocation_commands import KnowledgeFSRevocationCommandProducer_MAX_SAFE_INTEGER = 2**53 - 1@@ -146,13 +148,23 @@ def _lock_workspace_authorization(session: Session,tenant_id: str,) -> tuple[tuple[KnowledgeFSControlSpace, ...], dict[str, KnowledgeFSAuthorizationRevision]]:+ anchor_id, anchor_key = greenfield_activation_identity(tenant_id)+ # The greenfield activation anchor is an audit record, not an authorizable Space.spaces = tuple(- session.scalars(+ space+ for space in session.scalars(sa.select(KnowledgeFSControlSpace).where(KnowledgeFSControlSpace.tenant_id == tenant_id).order_by(KnowledgeFSControlSpace.id).with_for_update())+ if not (+ space.id == anchor_id+ and space.provisioning_key == anchor_key+ and space.state is KnowledgeFSControlSpaceState.DELETED+ and space.knowledge_space_id is None+ and space.lifecycle_operation_id == anchor_id+ ))if not spaces:return (), {}diff --git a/api/tests/unit_tests/services/knowledge_fs/test_membership_changes.py b/api/tests/unit_tests/services/knowledge_fs/test_membership_changes.pyindex a09ad52c270..ce306032779 100644--- a/api/tests/unit_tests/services/knowledge_fs/test_membership_changes.py+++ b/api/tests/unit_tests/services/knowledge_fs/test_membership_changes.py@@ -1,6 +1,7 @@from __future__ import annotationsfrom hashlib import sha256+from uuid import NAMESPACE_URL, uuid5import pytestfrom sqlalchemy import select@@ -18,6 +19,7 @@ from models.knowledge_fs import (KnowledgeFSLifecycleOutbox,)from services.knowledge_fs.membership_changes import (+ KnowledgeFSMembershipChangeInvariantError,KnowledgeFSWorkspaceMembershipChange,apply_workspace_membership_change,apply_workspace_rbac_role_change,@@ -41,12 +43,14 @@ from tests.helpers.unit.services.knowledge_fs_fakes import claims_summary, revokindirect=True,)def test_member_removal_reassigns_owned_spaces_and_revokes_grants_atomically(sqlite_session: Session) -> None:+ anchor = _greenfield_anchor(owner_account_id="member-1")space = _space(owner_account_id="member-1")removed_owner = _permission(space, "member-1", KnowledgeFSControlSpacePermissionRole.OWNER)replacement = _permission(space, "owner-1", KnowledgeFSControlSpacePermissionRole.EDITOR)revision = KnowledgeFSAuthorizationRevision(tenant_id="tenant-1", control_space_id=space.id)sqlite_session.add_all([+ anchor,space,removed_owner,replacement,@@ -69,6 +73,8 @@ def test_member_removal_reassigns_owned_spaces_and_revokes_grants_atomically(sqlsqlite_session.expire_all()command = sqlite_session.scalar(select(KnowledgeFSLifecycleOutbox))+ assert anchor.owner_account_id == "member-1"+ assert anchor.knowledge_space_id is Noneassert space.owner_account_id == "owner-1"assert removed_owner.status is KnowledgeFSControlSpacePermissionStatus.REVOKEDassert replacement.status is KnowledgeFSControlSpacePermissionStatus.ACTIVE@@ -147,6 +153,7 @@ def test_workspace_rbac_role_change_revokes_every_interactive_grant_without_toucrevision = KnowledgeFSAuthorizationRevision(tenant_id="tenant-1", control_space_id=space.id)sqlite_session.add_all([+ _greenfield_anchor(),space,revision,_audit(space, "member-1", "20000000-0000-4000-8000-000000000031"),@@ -181,6 +188,60 @@ def test_workspace_rbac_role_change_revokes_every_interactive_grant_without_toucassert {revoke_payload(command)["reason_code"] for command in commands} == {"workspace_rbac_role_changed"}+ "sqlite_session",+ [(KnowledgeFSControlSpace, KnowledgeFSAuthorizationRevision)],+ indirect=True,+)+def test_deleted_real_space_missing_revision_still_blocks_membership_change(sqlite_session: Session) -> None:+ space = _space()+ space.state = KnowledgeFSControlSpaceState.DELETED+ sqlite_session.add_all([_greenfield_anchor(), space])+ sqlite_session.commit()++ with pytest.raises(KnowledgeFSMembershipChangeInvariantError, match="authorization revision is missing"):+ apply_workspace_membership_change(+ session=sqlite_session,+ tenant_id="tenant-1",+ actor_account_id="owner-1",+ account_ids=("member-1",),+ change=KnowledgeFSWorkspaceMembershipChange.MEMBER_ADDED,+ )+++ "sqlite_session",+ [(KnowledgeFSControlSpace, KnowledgeFSAuthorizationRevision)],+ indirect=True,+)+ ("field", "value"),+ [+ ("id", "10000000-0000-4000-8000-000000000001"),+ ("provisioning_key", "not-the-anchor"),+ ("state", KnowledgeFSControlSpaceState.PROVISIONING),+ ("knowledge_space_id", "10000000-0000-4000-8000-000000000002"),+ ("lifecycle_operation_id", "10000000-0000-4000-8000-000000000003"),+ ],+)+def test_inconsistent_greenfield_anchor_missing_revision_still_blocks_membership_change(+ sqlite_session: Session, field: str, value: str | KnowledgeFSControlSpaceState+) -> None:+ anchor = _greenfield_anchor()+ setattr(anchor, field, value)+ sqlite_session.add(anchor)+ sqlite_session.commit()++ with pytest.raises(KnowledgeFSMembershipChangeInvariantError, match="authorization revision is missing"):+ apply_workspace_membership_change(+ session=sqlite_session,+ tenant_id="tenant-1",+ actor_account_id="owner-1",+ account_ids=("member-1",),+ change=KnowledgeFSWorkspaceMembershipChange.MEMBER_ADDED,+ )++@pytest.mark.parametrize("sqlite_session",[@@ -255,6 +316,20 @@ def test_member_removal_rolls_back_owner_and_epoch_when_revoke_reservation_is_inassert sqlite_session.scalar(select(KnowledgeFSLifecycleOutbox)) is None+def _greenfield_anchor(*, owner_account_id: str = "owner-1") -> KnowledgeFSControlSpace:+ provisioning_key = "dify-kfs-greenfield-activation:tenant-1"+ anchor_id = str(uuid5(NAMESPACE_URL, provisioning_key))+ anchor = KnowledgeFSControlSpace(+ tenant_id="tenant-1",+ owner_account_id=owner_account_id,+ provisioning_key=provisioning_key,+ state=KnowledgeFSControlSpaceState.DELETED,+ lifecycle_operation_id=anchor_id,+ )+ anchor.id = anchor_id+ return anchor++def _space(*, owner_account_id: str = "owner-1", suffix: str = "0") -> KnowledgeFSControlSpace:return KnowledgeFSControlSpace(tenant_id="tenant-1",diff --git a/api/tests/unit_tests/services/knowledge_fs/test_workspace_members.py b/api/tests/unit_tests/services/knowledge_fs/test_workspace_members.pyindex 9399eac0fdc..7aa3fca10c5 100644--- a/api/tests/unit_tests/services/knowledge_fs/test_workspace_members.py+++ b/api/tests/unit_tests/services/knowledge_fs/test_workspace_members.py@@ -1,6 +1,7 @@from __future__ import annotationsfrom hashlib import sha256+from uuid import NAMESPACE_URL, uuid5import pytestfrom sqlalchemy import select@@ -117,6 +118,43 @@ def test_remove_member_reassigns_owned_control_space_before_deleting_membership()[email protected]("sqlite_session", [_TABLES], indirect=True)+def test_remove_member_with_only_greenfield_audit_anchor(+ sqlite_session: Session, sqlite_session_factory: sessionmaker[Session]+) -> None:+ tenant, owner, member = _workspace_accounts(sqlite_session)+ provisioning_key = f"dify-kfs-greenfield-activation:{tenant.id}"+ anchor_id = str(uuid5(NAMESPACE_URL, provisioning_key))+ anchor = KnowledgeFSControlSpace(+ tenant_id=tenant.id,+ owner_account_id=member.id,+ provisioning_key=provisioning_key,+ state=KnowledgeFSControlSpaceState.DELETED,+ lifecycle_operation_id=anchor_id,+ )+ anchor.id = anchor_id+ sqlite_session.add(anchor)+ sqlite_session.commit()++ WorkspaceRepository(sqlite_session_factory).remove_member(+ workspace_id=tenant.id, account_id=member.id, owner_id=owner.id, actor_account_id=owner.id+ )+ sqlite_session.expire_all()++ assert anchor.owner_account_id == member.id+ assert sqlite_session.scalar(select(KnowledgeFSAuthorizationRevision)) is None+ assert sqlite_session.scalar(select(KnowledgeFSLifecycleOutbox)) is None+ assert (+ sqlite_session.scalar(+ select(TenantAccountJoin).where(+ TenantAccountJoin.tenant_id == tenant.id,+ TenantAccountJoin.account_id == member.id,+ )+ )+ is None+ )++def _workspace_accounts(session: Session,*,