mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-08-09 04:40:57 +00:00
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>
This commit is contained in:
RockChinQ
@@ -6,8 +6,14 @@ Tests session management, reuse, and cleanup.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import asyncio
|
||||
import threading
|
||||
from types import SimpleNamespace
|
||||
from unittest.mock import AsyncMock
|
||||
|
||||
import pytest
|
||||
import aiohttp
|
||||
import httpx
|
||||
from aiohttp import web
|
||||
|
||||
from langbot.pkg.utils import httpclient
|
||||
@@ -25,6 +31,7 @@ class TestGetSession:
|
||||
|
||||
assert isinstance(session, aiohttp.ClientSession)
|
||||
assert not session.closed
|
||||
assert isinstance(session.cookie_jar, aiohttp.DummyCookieJar)
|
||||
|
||||
# Cleanup
|
||||
await session.close()
|
||||
@@ -87,6 +94,124 @@ class TestCloseAll:
|
||||
|
||||
assert len(httpclient._sessions) == 0
|
||||
|
||||
|
||||
class TestReadLimited:
|
||||
async def test_rejects_oversized_content_length_before_reading(self):
|
||||
content = SimpleNamespace(iter_chunked=None)
|
||||
response = SimpleNamespace(headers={'Content-Length': '11'}, content=content)
|
||||
|
||||
with pytest.raises(httpclient.RemoteResponseTooLargeError):
|
||||
await httpclient.read_limited(response, max_bytes=10)
|
||||
|
||||
async def test_rejects_chunked_body_that_crosses_limit(self):
|
||||
class Content:
|
||||
async def iter_chunked(self, _chunk_size):
|
||||
yield b'12345'
|
||||
yield b'678901'
|
||||
|
||||
response = SimpleNamespace(headers={}, content=Content())
|
||||
|
||||
with pytest.raises(httpclient.RemoteResponseTooLargeError):
|
||||
await httpclient.read_limited(response, max_bytes=10)
|
||||
|
||||
async def test_returns_body_within_limit(self):
|
||||
class Content:
|
||||
async def iter_chunked(self, _chunk_size):
|
||||
yield b'12345'
|
||||
yield b'67890'
|
||||
|
||||
response = SimpleNamespace(headers={}, content=Content())
|
||||
|
||||
assert await httpclient.read_limited(response, max_bytes=10) == b'1234567890'
|
||||
|
||||
async def test_json_reader_uses_same_limit(self):
|
||||
class Content:
|
||||
async def iter_chunked(self, _chunk_size):
|
||||
yield b'{"ok":true}'
|
||||
|
||||
response = SimpleNamespace(
|
||||
headers={},
|
||||
content=Content(),
|
||||
)
|
||||
|
||||
assert await httpclient.read_json_limited(response, max_bytes=16) == {'ok': True}
|
||||
|
||||
async def test_response_json_parse_runs_off_event_loop(self):
|
||||
event_loop_thread = threading.get_ident()
|
||||
response = SimpleNamespace(json=lambda: threading.get_ident())
|
||||
|
||||
assert await httpclient.parse_json_response(response) != event_loop_thread
|
||||
|
||||
async def test_response_json_parse_supports_async_test_doubles(self):
|
||||
response = SimpleNamespace(json=AsyncMock(return_value={'ok': True}))
|
||||
|
||||
assert await httpclient.parse_json_response(response) == {'ok': True}
|
||||
|
||||
async def test_response_text_runs_off_loop_and_caps_diagnostics(self):
|
||||
event_loop_thread = threading.get_ident()
|
||||
|
||||
class Response:
|
||||
@property
|
||||
def text(self):
|
||||
return f'{threading.get_ident()}:abcdef'
|
||||
|
||||
value = await httpclient.response_text(Response(), max_chars=4)
|
||||
|
||||
assert not value.startswith(str(event_loop_thread))
|
||||
assert value.endswith('[truncated]')
|
||||
|
||||
async def test_httpx_hook_rejects_before_automatic_buffer_grows(self):
|
||||
class Source(httpx.AsyncByteStream):
|
||||
def __init__(self):
|
||||
self.closed = False
|
||||
|
||||
async def __aiter__(self):
|
||||
yield b'123'
|
||||
yield b'45'
|
||||
|
||||
async def aclose(self):
|
||||
self.closed = True
|
||||
|
||||
source = Source()
|
||||
transport = httpx.MockTransport(lambda _request: httpx.Response(200, stream=source))
|
||||
async with httpx.AsyncClient(
|
||||
transport=transport,
|
||||
event_hooks=httpclient.httpx_response_limit_hooks(max_bytes=4),
|
||||
) as client:
|
||||
with pytest.raises(httpclient.RemoteResponseTooLargeError, match='4-byte'):
|
||||
await client.get('https://example.invalid')
|
||||
|
||||
assert source.closed
|
||||
|
||||
async def test_httpx_limited_stream_closes_source_when_consumer_is_cancelled(self):
|
||||
class Source(httpx.AsyncByteStream):
|
||||
def __init__(self):
|
||||
self.closed = False
|
||||
|
||||
async def __aiter__(self):
|
||||
yield b'123'
|
||||
await asyncio.Event().wait()
|
||||
|
||||
async def aclose(self):
|
||||
self.closed = True
|
||||
|
||||
source = Source()
|
||||
stream = httpclient._LimitedHTTPXAsyncByteStream(source, max_bytes=4)
|
||||
first_chunk_consumed = asyncio.Event()
|
||||
|
||||
async def consume():
|
||||
async for _chunk in stream:
|
||||
first_chunk_consumed.set()
|
||||
|
||||
task = asyncio.create_task(consume())
|
||||
await first_chunk_consumed.wait()
|
||||
task.cancel()
|
||||
|
||||
with pytest.raises(asyncio.CancelledError):
|
||||
await task
|
||||
|
||||
assert source.closed
|
||||
|
||||
async def test_close_all_handles_already_closed(self):
|
||||
"""close_all handles already closed sessions gracefully."""
|
||||
session = httpclient.get_session()
|
||||
@@ -144,3 +269,12 @@ class TestSessionPoolIntegration:
|
||||
assert session is session2
|
||||
|
||||
await httpclient.close_all()
|
||||
|
||||
async def test_shared_session_does_not_persist_cookies(self):
|
||||
"""Shared transport pooling never creates cross-Workspace cookie state."""
|
||||
session = httpclient.get_session()
|
||||
|
||||
session.cookie_jar.update_cookies({'workspace_session': 'secret'})
|
||||
|
||||
assert list(session.cookie_jar) == []
|
||||
await httpclient.close_all()
|
||||
|
||||
Reference in New Issue
Block a user