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
@@ -0,0 +1,196 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import copy
|
||||
from types import SimpleNamespace
|
||||
from unittest.mock import AsyncMock
|
||||
|
||||
import pytest
|
||||
import quart
|
||||
|
||||
from langbot.pkg.api.http.controller.groups.knowledge.base import KnowledgeBaseRouterGroup
|
||||
from langbot.pkg.api.http.controller.groups.pipelines.pipelines import PipelinesRouterGroup
|
||||
from langbot.pkg.api.http.controller.groups.provider.models import LLMModelsRouterGroup
|
||||
from langbot.pkg.api.http.controller.groups.provider.providers import ModelProvidersRouterGroup
|
||||
from langbot.pkg.api.http.controller.groups.resources.mcp import MCPRouterGroup
|
||||
from langbot.pkg.api.http.controller.groups.webhook_mgmt import WebhookManagementRouterGroup
|
||||
from langbot.pkg.api.http.service.secrets import mask_secret_value, redact_secrets
|
||||
|
||||
|
||||
pytestmark = pytest.mark.asyncio
|
||||
WORKSPACE_UUID = '11111111-1111-4111-8111-111111111111'
|
||||
|
||||
RAW_PIPELINE = {
|
||||
'uuid': 'pipeline-test',
|
||||
'config': {'ai': {'n8n': {'webhook-url': 'https://hook.invalid/bearer-secret'}}},
|
||||
}
|
||||
RAW_MODEL = {
|
||||
'uuid': 'model-test',
|
||||
'provider_uuid': 'provider-test',
|
||||
'extra_args': {'headers': {'Authorization': 'Bearer model-secret'}},
|
||||
}
|
||||
RAW_PROVIDER = {
|
||||
'uuid': 'provider-test',
|
||||
'base_url': 'https://provider-user:provider-password@provider.invalid/v1?token=url-secret®ion=sg',
|
||||
'api_keys': ['provider-secret'],
|
||||
}
|
||||
RAW_MCP_SERVER = {
|
||||
'uuid': 'mcp-test',
|
||||
'name': 'MCP Test',
|
||||
'extra_args': {'url': 'https://mcp-user:mcp-password@mcp.invalid/connect?api_key=url-secret&transport=http'},
|
||||
}
|
||||
RAW_KNOWLEDGE_BASE = {
|
||||
'uuid': 'kb-test',
|
||||
'creation_settings': {'dify_apikey': 'knowledge-secret'},
|
||||
}
|
||||
RAW_WEBHOOK = {'id': 1, 'url': 'https://hook.invalid/path?token=webhook-secret'}
|
||||
|
||||
|
||||
def _access(role: str):
|
||||
return SimpleNamespace(
|
||||
workspace=SimpleNamespace(uuid=WORKSPACE_UUID),
|
||||
membership=SimpleNamespace(uuid='membership-test', role=role, projection_revision=1),
|
||||
execution=SimpleNamespace(instance_uuid='instance-test', placement_generation=1),
|
||||
)
|
||||
|
||||
|
||||
async def _create_client(role: str):
|
||||
application = SimpleNamespace()
|
||||
account = SimpleNamespace(uuid='account-test', user='test@example.com')
|
||||
application.user_service = SimpleNamespace(get_authenticated_account=AsyncMock(return_value=account))
|
||||
application.apikey_service = SimpleNamespace(authenticate_api_key=AsyncMock(return_value=None))
|
||||
application.workspace_collaboration_service = SimpleNamespace(
|
||||
resolve_account_workspace=AsyncMock(return_value=_access(role))
|
||||
)
|
||||
|
||||
async def get_pipelines(_context, *_args, include_secret=False):
|
||||
value = copy.deepcopy(RAW_PIPELINE)
|
||||
return [value] if include_secret else [redact_secrets(value)]
|
||||
|
||||
async def get_pipeline(_context, _uuid, *, include_secret=False):
|
||||
value = copy.deepcopy(RAW_PIPELINE)
|
||||
return value if include_secret else redact_secrets(value)
|
||||
|
||||
application.pipeline_service = SimpleNamespace(
|
||||
get_pipelines=AsyncMock(side_effect=get_pipelines),
|
||||
get_pipeline=AsyncMock(side_effect=get_pipeline),
|
||||
)
|
||||
application.plugin_connector = SimpleNamespace(list_plugins=AsyncMock(return_value=[]))
|
||||
application.mcp_service = SimpleNamespace(
|
||||
get_mcp_servers=AsyncMock(return_value=[redact_secrets(copy.deepcopy(RAW_MCP_SERVER))])
|
||||
)
|
||||
application.skill_service = SimpleNamespace(list_skills=AsyncMock(return_value=[]))
|
||||
|
||||
async def get_models_by_provider(_context, _provider_uuid, *, include_secret=False):
|
||||
value = copy.deepcopy(RAW_MODEL)
|
||||
return [value] if include_secret else [redact_secrets(value)]
|
||||
|
||||
application.llm_model_service = SimpleNamespace(
|
||||
get_llm_models_by_provider=AsyncMock(side_effect=get_models_by_provider)
|
||||
)
|
||||
|
||||
async def get_providers(_context, *, include_secret=False):
|
||||
value = copy.deepcopy(RAW_PROVIDER)
|
||||
return [value] if include_secret else [redact_secrets(value)]
|
||||
|
||||
application.provider_service = SimpleNamespace(
|
||||
get_providers=AsyncMock(side_effect=get_providers),
|
||||
get_provider_model_counts=AsyncMock(return_value={'llm_count': 0, 'embedding_count': 0, 'rerank_count': 0}),
|
||||
)
|
||||
|
||||
async def get_knowledge_bases(_context, *, include_secret=False):
|
||||
value = copy.deepcopy(RAW_KNOWLEDGE_BASE)
|
||||
return [value] if include_secret else [redact_secrets(value)]
|
||||
|
||||
application.knowledge_service = SimpleNamespace(get_knowledge_bases=AsyncMock(side_effect=get_knowledge_bases))
|
||||
|
||||
async def get_webhooks(_context, *, include_secret=False):
|
||||
value = copy.deepcopy(RAW_WEBHOOK)
|
||||
if not include_secret:
|
||||
value['url'] = mask_secret_value(value['url'])
|
||||
return [value]
|
||||
|
||||
application.webhook_service = SimpleNamespace(get_webhooks=AsyncMock(side_effect=get_webhooks))
|
||||
|
||||
quart_app = quart.Quart(__name__)
|
||||
for router_type in (
|
||||
PipelinesRouterGroup,
|
||||
LLMModelsRouterGroup,
|
||||
ModelProvidersRouterGroup,
|
||||
MCPRouterGroup,
|
||||
KnowledgeBaseRouterGroup,
|
||||
WebhookManagementRouterGroup,
|
||||
):
|
||||
await router_type(application, quart_app).initialize()
|
||||
return application, quart_app.test_client()
|
||||
|
||||
|
||||
def _headers() -> dict[str, str]:
|
||||
return {'Authorization': 'Bearer test-token', 'X-Workspace-Id': WORKSPACE_UUID}
|
||||
|
||||
|
||||
@pytest.mark.parametrize('role', ['viewer', 'operator'])
|
||||
async def test_viewer_and_operator_resource_reads_are_redacted(role: str):
|
||||
application, client = await _create_client(role)
|
||||
|
||||
pipeline = (await (await client.get('/api/v1/pipelines', headers=_headers())).get_json())['data']['pipelines'][0]
|
||||
model = (
|
||||
await (
|
||||
await client.get(
|
||||
'/api/v1/provider/models/llm?provider_uuid=provider-test',
|
||||
headers=_headers(),
|
||||
)
|
||||
).get_json()
|
||||
)['data']['models'][0]
|
||||
provider = (await (await client.get('/api/v1/provider/providers', headers=_headers())).get_json())['data'][
|
||||
'providers'
|
||||
][0]
|
||||
mcp_server = (await (await client.get('/api/v1/mcp/servers', headers=_headers())).get_json())['data']['servers'][0]
|
||||
knowledge_base = (await (await client.get('/api/v1/knowledge/bases', headers=_headers())).get_json())['data'][
|
||||
'bases'
|
||||
][0]
|
||||
webhook = (await (await client.get('/api/v1/webhooks', headers=_headers())).get_json())['data']['webhooks'][0]
|
||||
|
||||
assert pipeline['config']['ai']['n8n']['webhook-url'] == '***'
|
||||
assert model['extra_args']['headers']['Authorization'] == '***'
|
||||
assert provider['api_keys'] == ['***']
|
||||
assert provider['base_url'] == 'https://***@provider.invalid/v1?token=***®ion=sg'
|
||||
assert mcp_server['extra_args']['url'] == 'https://***@mcp.invalid/connect?api_key=***&transport=http'
|
||||
assert knowledge_base['creation_settings']['dify_apikey'] == '***'
|
||||
assert webhook['url'] == '***'
|
||||
assert application.pipeline_service.get_pipelines.await_args.kwargs['include_secret'] is False
|
||||
assert application.llm_model_service.get_llm_models_by_provider.await_args.kwargs['include_secret'] is False
|
||||
assert application.provider_service.get_providers.await_args.kwargs['include_secret'] is False
|
||||
assert application.knowledge_service.get_knowledge_bases.await_args.kwargs['include_secret'] is False
|
||||
assert application.webhook_service.get_webhooks.await_args.kwargs['include_secret'] is False
|
||||
|
||||
|
||||
async def test_resource_manager_receives_credentials_needed_for_management():
|
||||
application, client = await _create_client('developer')
|
||||
|
||||
pipeline = (await (await client.get('/api/v1/pipelines', headers=_headers())).get_json())['data']['pipelines'][0]
|
||||
model = (
|
||||
await (
|
||||
await client.get(
|
||||
'/api/v1/provider/models/llm?provider_uuid=provider-test',
|
||||
headers=_headers(),
|
||||
)
|
||||
).get_json()
|
||||
)['data']['models'][0]
|
||||
provider = (await (await client.get('/api/v1/provider/providers', headers=_headers())).get_json())['data'][
|
||||
'providers'
|
||||
][0]
|
||||
knowledge_base = (await (await client.get('/api/v1/knowledge/bases', headers=_headers())).get_json())['data'][
|
||||
'bases'
|
||||
][0]
|
||||
webhook = (await (await client.get('/api/v1/webhooks', headers=_headers())).get_json())['data']['webhooks'][0]
|
||||
|
||||
assert pipeline == RAW_PIPELINE
|
||||
assert model == RAW_MODEL
|
||||
assert provider['api_keys'] == ['provider-secret']
|
||||
assert knowledge_base == RAW_KNOWLEDGE_BASE
|
||||
assert webhook == RAW_WEBHOOK
|
||||
assert application.pipeline_service.get_pipelines.await_args.kwargs['include_secret'] is True
|
||||
assert application.llm_model_service.get_llm_models_by_provider.await_args.kwargs['include_secret'] is True
|
||||
assert application.provider_service.get_providers.await_args.kwargs['include_secret'] is True
|
||||
assert application.knowledge_service.get_knowledge_bases.await_args.kwargs['include_secret'] is True
|
||||
assert application.webhook_service.get_webhooks.await_args.kwargs['include_secret'] is True
|
||||
Reference in New Issue
Block a user