feat(tenancy): add Workspace multi-tenant foundation (#2353)

* Document multi-tenant workspace architecture * Add OSS and commercial workspace boundaries * docs: redesign multi-tenant workspace architecture * feat(tenancy): implement workspace isolation * docs(tenancy): record verification evidence * docs(tenancy): revise single-instance SaaS topology * docs(tenancy): refine architecture options * docs: finalize cloud v2 multi-tenant decisions * feat(tenancy): establish cloud isolation foundations * feat(tenancy): harden shared cloud runtime boundaries * docs(tenancy): record final isolation verification * fix(tenancy): close isolation and permission gaps * docs(tenancy): record final isolation verification * feat(tenancy): connect cloud workspace control plane * fix(build): install git for pinned SDK * docs(cloud): update control plane verification * chore: update multi-tenant SDK pin * fix(cloud): skip legacy model sync during startup * test(cloud): preserve minimal model manager fixtures * fix(cloud): preserve authenticated account context * fix(cloud): reuse authenticated account for user info * feat(cloud): complete Workspace settings navigation * test(web): cover Workspace dropdown menu * feat(web): place workspace controls in sidebar * refactor(web): streamline workspace controls * style(web): format workspace layout test * fix(cloud): surface runtime and workspace plan status * fix(plugin): keep runtime identity stable across restarts * fix(ui): widen and center workspace switcher * fix(ui): hide roles from workspace switcher * fix(ui): align workspace switcher with sidebar entries * feat(workspace): add in-product collaboration and direct Cloud launch * style: format collaboration changes * fix(workspace): bind collaboration APIs to tenant UoW * fix(cloud): preserve Core-owned collaboration state * test(cloud): require Space identity for invite registration * feat(cloud): complete secure invitation experience * style(web): format invitation flows * fix(cloud): recover box runtime without unscoped skill reload * feat(oss): enforce invitation account and owner billing flows * style: format OSS account service * test(oss): cover invitation logout handoff * fix(oss): resolve workspace owner in scoped session * feat(cloud): harden multi-tenant runtime resources * fix(cloud): bound runtime restart storms * fix(cloud): eliminate periodic runtime CPU spikes * fix(cloud): enforce instance capacity ceilings * fix(cloud): scope public login capability discovery * fix(cloud): bound tenant maintenance and monitoring work * fix(runtime): bound tenant resource amplification * fix(deps): pin green multi-tenant plugin SDK * fix(cloud): handle unavailable skill capability * fix(security): require authentication for image file endpoint (H-2) - Changed /api/v1/files/image from AuthType.NONE to USER_TOKEN_OR_API_KEY - Added Permission.RESOURCE_VIEW requirement - Prevents unauthenticated cross-tenant file access via leaked keys - Fixes HIGH severity finding from multi-tenant security review docs: add comprehensive database migration guide - Complete migration steps for OSS → multi-tenant - Backup, execution, verification procedures - Rollback scenarios and recovery plans - Performance tuning recommendations * test: add comprehensive cross-tenant isolation tests Added 7 critical test scenarios for multi-tenant boundaries: - Cross-tenant bot access prevention - Viewer role read-only enforcement - Removed member immediate access revocation - Model provider credential isolation - WebSocket message isolation - Invitation token workspace scoping - Multi-workspace context validation These tests address P0-2 coverage gaps for: - workspaces.py (membership & invitation flows) - user.py (authentication & authorization) - websocket_chat.py (real-time isolation) - plugins.py (resource access control) docs: finalize database migration guide * fix(security): resolve M-1, M-2, M-3 security findings M-1: WebSocket authorization TOCTOU race (FIXED) - Changed _revalidate_websocket_authorization to return RequestContext - Ensures validated context is used immediately without race window - Prevents removed members from sending messages during revalidation gap M-2: Model Manager cache workspace isolation (VERIFIED) - Confirmed _CacheKey already uses 4-tuple: (instance, workspace, generation, resource) - Cache is properly scoped per workspace, no cross-tenant leakage possible - No code change needed, documented as working correctly M-3: Invitation lock workspace scoping (FIXED) - Changed lock key from token_digest to workspace_uuid:token_digest - Prevents DoS where attacker locks token in Workspace A to block Workspace B - Locks now isolated per workspace All MEDIUM severity findings from security review now resolved. * fix(cloud): unblock tenant CI and enforce knowledge quotas * fix(tenancy): scope rerank model sync --------- Co-authored-by: dadachann <185672915+dadachann@users.noreply.github.com>
2026-08-09 04:40:57 +00:00 · 2026-07-30 21:43:35 +08:00
parent 463b120923
commit e1ac5e0fc8
468 changed files with 78320 additions and 13137 deletions
@@ -21,8 +21,14 @@ xml_template = """
 </xml>
 """

+_MAX_CALLBACK_BODY_BYTES = 1024 * 1024
+

 class OAClient:
+    _STATE_TTL_SECONDS = 600
+    _STATE_MAX = 4096
+    _MAX_CONTENT_CHARS = 200000
+
    def __init__(
        self,
        token: str,
@@ -41,6 +47,7 @@ class OAClient:
        self.access_token = ''
        self.unified_mode = unified_mode
        self.app = Quart(__name__)
+        self.app.config['MAX_CONTENT_LENGTH'] = _MAX_CALLBACK_BODY_BYTES

        # 只有在非统一模式下才注册独立路由
        if not self.unified_mode:
@@ -57,8 +64,38 @@ class OAClient:
        self.access_token_expiry_time = None
        self.msg_id_map = {}
        self.generated_content = {}
+        self._msg_seen_at = {}
+        self._generated_at = {}
+        self._last_state_prune = 0.0
        self.logger = logger

+    def _prune_state(self) -> None:
+        now = time.monotonic()
+        if now - self._last_state_prune >= 60:
+            self._last_state_prune = now
+            for message_id, seen_at in tuple(self._msg_seen_at.items()):
+                if now - seen_at > self._STATE_TTL_SECONDS:
+                    self._msg_seen_at.pop(message_id, None)
+                    self.msg_id_map.pop(message_id, None)
+            for message_id, generated_at in tuple(self._generated_at.items()):
+                if now - generated_at > self._STATE_TTL_SECONDS:
+                    self._generated_at.pop(message_id, None)
+                    self.generated_content.pop(message_id, None)
+        while len(self.msg_id_map) > self._STATE_MAX:
+            message_id = next(iter(self.msg_id_map))
+            self.msg_id_map.pop(message_id, None)
+            self._msg_seen_at.pop(message_id, None)
+        while len(self.generated_content) > self._STATE_MAX:
+            message_id = next(iter(self.generated_content))
+            self.generated_content.pop(message_id, None)
+            self._generated_at.pop(message_id, None)
+
+    def clear(self) -> None:
+        self.msg_id_map.clear()
+        self.generated_content.clear()
+        self._msg_seen_at.clear()
+        self._generated_at.clear()
+
    async def handle_callback_request(self):
        """处理回调请求（独立端口模式，使用全局 request）。"""
        return await self._handle_callback_internal(request)
@@ -104,8 +141,16 @@ class OAClient:
                    raise Exception('拒绝请求')
            elif req.method == 'POST':
                encryt_msg = await req.data
+                if len(encryt_msg) > _MAX_CALLBACK_BODY_BYTES:
+                    raise ValueError('Official Account callback body exceeds the size limit')
                wxcpt = WXBizMsgCrypt(self.token, self.aes, self.appid)
-                ret, xml_msg = wxcpt.DecryptMsg(encryt_msg, msg_signature, timestamp, nonce)
+                ret, xml_msg = await asyncio.to_thread(
+                    wxcpt.DecryptMsg,
+                    encryt_msg,
+                    msg_signature,
+                    timestamp,
+                    nonce,
+                )
                xml_msg = xml_msg.decode('utf-8')

                if ret != 0:
@@ -118,7 +163,7 @@ class OAClient:
                    if event:
                        await self._handle_message(event)

-                root = ET.fromstring(xml_msg)
+                root = await asyncio.to_thread(ET.fromstring, xml_msg)
                from_user = root.find('FromUserName').text  # 发送者
                to_user = root.find('ToUserName').text  # 机器人

@@ -126,6 +171,7 @@ class OAClient:
                interval = 0.1
                while True:
                    content = self.generated_content.pop(message_data['MsgId'], None)
+                    self._generated_at.pop(message_data['MsgId'], None)
                    if content:
                        response_xml = xml_template.format(
                            to_user=from_user,
@@ -156,7 +202,7 @@ class OAClient:
            traceback.print_exc()

    async def get_message(self, xml_msg: str):
-        root = ET.fromstring(xml_msg)
+        root = await asyncio.to_thread(ET.fromstring, xml_msg)

        message_data = {
            'ToUserName': root.find('ToUserName').text,
@@ -193,21 +239,30 @@ class OAClient:
        处理消息事件。
        """
        message_id = event.message_id
+        self._prune_state()
        if message_id in self.msg_id_map.keys():
            self.msg_id_map[message_id] += 1
+            self._msg_seen_at[message_id] = time.monotonic()
            return

        self.msg_id_map[message_id] = 1
+        self._msg_seen_at[message_id] = time.monotonic()
        msg_type = event.type
        if msg_type in self._message_handlers:
            for handler in self._message_handlers[msg_type]:
                await handler(event)

    async def set_message(self, msg_id: int, content: str):
-        self.generated_content[msg_id] = content
+        self.generated_content[msg_id] = str(content)[: self._MAX_CONTENT_CHARS]
+        self._generated_at[msg_id] = time.monotonic()
+        self._prune_state()


 class OAClientForLongerResponse:
+    _MAX_USERS = 4096
+    _MAX_MESSAGES_PER_USER = 20
+    _MAX_CONTENT_CHARS = 200000
+
    def __init__(
        self,
        token: str,
@@ -227,6 +282,7 @@ class OAClientForLongerResponse:
        self.access_token = ''
        self.unified_mode = unified_mode
        self.app = Quart(__name__)
+        self.app.config['MAX_CONTENT_LENGTH'] = _MAX_CALLBACK_BODY_BYTES

        # 只有在非统一模式下才注册独立路由
        if not self.unified_mode:
@@ -244,8 +300,28 @@ class OAClientForLongerResponse:
        self.loading_message = LoadingMessage
        self.msg_queue = {}
        self.user_msg_queue = {}
+        self._last_queue_cleanup = 0.0
        self.logger = logger

+    def _prune_queues(self) -> None:
+        now = time.monotonic()
+        if now - self._last_queue_cleanup >= 60:
+            self._last_queue_cleanup = now
+            for user_id, queue in tuple(self.msg_queue.items()):
+                if not queue:
+                    self.msg_queue.pop(user_id, None)
+            for user_id, queue in tuple(self.user_msg_queue.items()):
+                if not queue:
+                    self.user_msg_queue.pop(user_id, None)
+        while len(self.msg_queue) > self._MAX_USERS:
+            self.msg_queue.pop(next(iter(self.msg_queue)), None)
+        while len(self.user_msg_queue) > self._MAX_USERS:
+            self.user_msg_queue.pop(next(iter(self.user_msg_queue)), None)
+
+    def clear(self) -> None:
+        self.msg_queue.clear()
+        self.user_msg_queue.clear()
+
    async def handle_callback_request(self):
        """处理回调请求（独立端口模式，使用全局 request）。"""
        return await self._handle_callback_internal(request)
@@ -285,8 +361,16 @@ class OAClientForLongerResponse:

            elif req.method == 'POST':
                encryt_msg = await req.data
+                if len(encryt_msg) > _MAX_CALLBACK_BODY_BYTES:
+                    raise ValueError('Official Account callback body exceeds the size limit')
                wxcpt = WXBizMsgCrypt(self.token, self.aes, self.appid)
-                ret, xml_msg = wxcpt.DecryptMsg(encryt_msg, msg_signature, timestamp, nonce)
+                ret, xml_msg = await asyncio.to_thread(
+                    wxcpt.DecryptMsg,
+                    encryt_msg,
+                    msg_signature,
+                    timestamp,
+                    nonce,
+                )
                xml_msg = xml_msg.decode('utf-8')

                if ret != 0:
@@ -294,7 +378,7 @@ class OAClientForLongerResponse:
                    raise Exception('消息解密失败')

                # 解析 XML
-                root = ET.fromstring(xml_msg)
+                root = await asyncio.to_thread(ET.fromstring, xml_msg)
                from_user = root.find('FromUserName').text
                to_user = root.find('ToUserName').text

@@ -305,6 +389,7 @@ class OAClientForLongerResponse:
                    # 弹出用户消息
                    if self.user_msg_queue.get(from_user) and self.user_msg_queue[from_user]:
                        self.user_msg_queue[from_user].pop(0)
+                    self._prune_queues()

                    response_xml = xml_template.format(
                        to_user=from_user,
@@ -332,9 +417,13 @@ class OAClientForLongerResponse:
                            if event:
                                self.user_msg_queue.setdefault(from_user, []).append(
                                    {
-                                        'content': event.message,
+                                        'content': str(event.message)[: self._MAX_CONTENT_CHARS],
                                    }
                                )
+                                self.user_msg_queue[from_user] = self.user_msg_queue[from_user][
+                                    -self._MAX_MESSAGES_PER_USER :
+                                ]
+                                self._prune_queues()
                                await self._handle_message(event)

                        return response_xml
@@ -344,7 +433,7 @@ class OAClientForLongerResponse:
            traceback.print_exc()

    async def get_message(self, xml_msg: str):
-        root = ET.fromstring(xml_msg)
+        root = await asyncio.to_thread(ET.fromstring, xml_msg)

        message_data = {
            'ToUserName': root.find('ToUserName').text,
@@ -393,6 +482,8 @@ class OAClientForLongerResponse:
        self.msg_queue[from_user].append(
            {
                'msg_id': message_id,
-                'content': content,
+                'content': str(content)[: self._MAX_CONTENT_CHARS],
            }
        )
+        self.msg_queue[from_user] = self.msg_queue[from_user][-self._MAX_MESSAGES_PER_USER :]
+        self._prune_queues()