mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-08-28 13:17:14 +00:00
e1ac5e0fc8
* 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>
118 lines
4.3 KiB
Python
118 lines
4.3 KiB
Python
"""Base class for connectors that may manage a local runtime subprocess."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import asyncio
|
|
import contextlib
|
|
import os
|
|
import sys
|
|
from typing import TYPE_CHECKING, Awaitable, Callable
|
|
|
|
if TYPE_CHECKING:
|
|
from ..core import app as core_app
|
|
|
|
|
|
class ManagedRuntimeConnector:
|
|
"""Base class for connectors that may manage a local runtime subprocess.
|
|
|
|
Provides shared lifecycle helpers: subprocess launch, health-check retry,
|
|
and graceful termination. Concrete connectors (plugin, box, …) inherit
|
|
this and add their own protocol-specific logic.
|
|
"""
|
|
|
|
ap: 'core_app.Application'
|
|
runtime_subprocess: asyncio.subprocess.Process | None
|
|
runtime_subprocess_task: asyncio.Task | None
|
|
|
|
def __init__(self, ap: 'core_app.Application'):
|
|
self.ap = ap
|
|
self.runtime_subprocess = None
|
|
self.runtime_subprocess_task = None
|
|
self._lifecycle_lock = asyncio.Lock()
|
|
self._closing = False
|
|
|
|
async def _start_runtime_subprocess(
|
|
self,
|
|
*args: str,
|
|
env_overrides: dict[str, str] | None = None,
|
|
) -> None:
|
|
"""Launch a local runtime as a subprocess of the current Python interpreter.
|
|
|
|
If a subprocess is already running (no *returncode* yet), this is a no-op.
|
|
"""
|
|
if self.runtime_subprocess is not None and self.runtime_subprocess.returncode is None:
|
|
return
|
|
|
|
python_path = sys.executable
|
|
env = os.environ.copy()
|
|
if env_overrides:
|
|
env.update(env_overrides)
|
|
self.runtime_subprocess = await asyncio.create_subprocess_exec(
|
|
python_path,
|
|
*args,
|
|
env=env,
|
|
)
|
|
self.runtime_subprocess_task = asyncio.create_task(self.runtime_subprocess.wait())
|
|
|
|
async def _wait_until_ready(
|
|
self,
|
|
check: Callable[[], Awaitable[None]],
|
|
retries: int = 40,
|
|
interval: float = 0.25,
|
|
runtime_name: str = 'runtime',
|
|
) -> None:
|
|
"""Repeatedly call *check* until it succeeds or retries are exhausted.
|
|
|
|
Between attempts the method sleeps for *interval* seconds. If the
|
|
managed subprocess exits before readiness is confirmed, a
|
|
``RuntimeError`` is raised immediately.
|
|
"""
|
|
last_exc: Exception | None = None
|
|
for _ in range(retries):
|
|
# Fast-fail if the process already died.
|
|
if self.runtime_subprocess is not None and self.runtime_subprocess.returncode is not None:
|
|
raise RuntimeError(
|
|
f'local {runtime_name} exited before becoming ready (code {self.runtime_subprocess.returncode})'
|
|
)
|
|
|
|
try:
|
|
await check()
|
|
return
|
|
except Exception as exc:
|
|
last_exc = exc
|
|
await asyncio.sleep(interval)
|
|
|
|
if last_exc is not None:
|
|
raise last_exc
|
|
raise RuntimeError(f'local {runtime_name} did not become ready')
|
|
|
|
def _dispose_subprocess(self) -> None:
|
|
"""Terminate the managed subprocess and cancel its wait task."""
|
|
if self.runtime_subprocess is not None and self.runtime_subprocess.returncode is None:
|
|
self.ap.logger.info('Terminating managed runtime process...')
|
|
self.runtime_subprocess.terminate()
|
|
|
|
if self.runtime_subprocess_task is not None:
|
|
self.runtime_subprocess_task.cancel()
|
|
self.runtime_subprocess_task = None
|
|
|
|
async def _close_managed_subprocess(self) -> None:
|
|
"""Terminate, escalate, and reap the optional owned subprocess."""
|
|
process = self.runtime_subprocess
|
|
wait_task = self.runtime_subprocess_task
|
|
if process is not None and process.returncode is None:
|
|
with contextlib.suppress(ProcessLookupError):
|
|
process.terminate()
|
|
try:
|
|
await asyncio.wait_for(process.wait(), timeout=3)
|
|
except asyncio.TimeoutError:
|
|
with contextlib.suppress(ProcessLookupError):
|
|
process.kill()
|
|
await process.wait()
|
|
if wait_task is not None and wait_task is not asyncio.current_task():
|
|
if not wait_task.done():
|
|
wait_task.cancel()
|
|
await asyncio.gather(wait_task, return_exceptions=True)
|
|
self.runtime_subprocess = None
|
|
self.runtime_subprocess_task = None
|