* feat: add TenantExtension auth to MCP endpoint Replace static MCP_AUTH_TOKEN check with TenantExtension authentication, making MCP use the same auth path as REST API. - MCPMiddleware now calls tenant_extension.authenticate() - Sets _current_schema from TenantContext for multi-tenant isolation - Returns 401 on AuthenticationError (same as REST API) - DefaultTenantExtension: no auth (local dev) - ApiKeyTenantExtension: validates against env var - CloudTenantExtension: HMAC + DB lookup (production) Adds tests for middleware auth rejection, acceptance, and schema routing. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Address PR review: backwards compatibility for MCP auth - Keep MCP_AUTH_TOKEN env var for legacy MCP servers - Add authenticate_mcp() method to TenantExtension base class - Default implementation calls authenticate() - Extensions can override to opt-out of MCP auth - Add mcp_auth_disabled config option to ApiKeyTenantExtension - Set HINDSIGHT_API_TENANT_MCP_AUTH_DISABLED=true to skip MCP auth - Remove CloudTenantExtension from public docstring - Add tests for legacy auth token and mcp_auth_disabled flag - Update MCP docs with new auth configuration Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Add search_docs MCP tool for documentation search Implements a new MCP tool that searches Hindsight documentation using Vectorize RAG pipelines. The tool supports: - Searching core (OSS) docs, cloud docs, or both - Configurable number of results (1-10) - Returns ranked results with URLs, similarity scores, and text snippets New environment variables: - HINDSIGHT_API_VECTORIZE_ORG_ID - HINDSIGHT_API_VECTORIZE_API_TOKEN - HINDSIGHT_API_VECTORIZE_CORE_PIPELINE_ID - HINDSIGHT_API_VECTORIZE_CLOUD_PIPELINE_ID - HINDSIGHT_API_VECTORIZE_API_BASE_URL Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Add documentation for search_docs MCP tool - Add Vectorize environment variables to configuration.md - Add search_docs tool to MCP server available tools - Add reflect tool documentation (was missing) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Add tests for search_docs MCP tool Tests cover: - DocsSource enum values and parsing - _clean_text HTML stripping helper - _search_vectorize_pipeline with mocked httpx - Tool registration and function execution - Source filtering (core/cloud/all) - Result sorting by similarity - Error handling for pipeline failures - HTML cleaning in results - Invalid source defaulting to 'all' Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Move search_docs to hindsight-cloud, add MCPExtension pattern - Add MCPExtension base class for registering additional MCP tools - Load MCPExtension in create_mcp_server when configured - Remove search_docs tool (moved to hindsight-cloud CloudMCPExtension) - Remove Vectorize config from hindsight-core - Add tests for MCPExtension pattern - Update docs to remove search_docs references The MCPExtension pattern allows cloud (or any extension package) to register additional MCP tools via: HINDSIGHT_API_MCP_EXTENSION=package.module:ExtensionClass Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Address PR review feedback - Remove CloudTenantExtension mention from MCPMiddleware docstring - Fix docs: clarify that ApiKeyTenantExtension must be explicitly enabled - Revert changes to versioned docs (0.3 and 0.4) - synced automatically on release Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Format mcp.py line length Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
90 lines
3.9 KiB
Python
90 lines
3.9 KiB
Python
"""Built-in tenant extension implementations."""
|
|
|
|
from hindsight_api.config import get_config
|
|
from hindsight_api.extensions.tenant import AuthenticationError, Tenant, TenantContext, TenantExtension
|
|
from hindsight_api.models import RequestContext
|
|
|
|
|
|
class DefaultTenantExtension(TenantExtension):
|
|
"""
|
|
Default single-tenant extension with no authentication.
|
|
|
|
This is the default extension used when no tenant extension is configured.
|
|
It provides single-tenant behavior using the configured schema from
|
|
HINDSIGHT_API_DATABASE_SCHEMA (defaults to 'public').
|
|
|
|
Features:
|
|
- No authentication required (passes all requests)
|
|
- Uses configured schema from environment
|
|
- Perfect for single-tenant deployments without auth
|
|
|
|
Configuration:
|
|
HINDSIGHT_API_DATABASE_SCHEMA=your-schema (optional, defaults to 'public')
|
|
|
|
This is automatically enabled by default. To use custom authentication,
|
|
configure a different tenant extension:
|
|
HINDSIGHT_API_TENANT_EXTENSION=hindsight_api.extensions.builtin.tenant:ApiKeyTenantExtension
|
|
"""
|
|
|
|
def __init__(self, config: dict[str, str]):
|
|
super().__init__(config)
|
|
# Cache the schema at initialization for consistency
|
|
# Support explicit schema override via config, otherwise use environment
|
|
self._schema = config.get("schema", get_config().database_schema)
|
|
|
|
async def authenticate(self, context: RequestContext) -> TenantContext:
|
|
"""Return configured schema without any authentication."""
|
|
return TenantContext(schema_name=self._schema)
|
|
|
|
async def list_tenants(self) -> list[Tenant]:
|
|
"""Return configured schema for single-tenant setup."""
|
|
return [Tenant(schema=self._schema)]
|
|
|
|
|
|
class ApiKeyTenantExtension(TenantExtension):
|
|
"""
|
|
Built-in tenant extension that validates API key against an environment variable.
|
|
|
|
This is a simple implementation that:
|
|
1. Validates the API key matches HINDSIGHT_API_TENANT_API_KEY
|
|
2. Returns the configured schema (HINDSIGHT_API_DATABASE_SCHEMA, default 'public')
|
|
for all authenticated requests
|
|
|
|
Configuration:
|
|
HINDSIGHT_API_TENANT_EXTENSION=hindsight_api.extensions.builtin.tenant:ApiKeyTenantExtension
|
|
HINDSIGHT_API_TENANT_API_KEY=your-secret-key
|
|
HINDSIGHT_API_DATABASE_SCHEMA=your-schema (optional, defaults to 'public')
|
|
HINDSIGHT_API_TENANT_MCP_AUTH_DISABLED=true (optional, disable auth for MCP endpoints)
|
|
|
|
For multi-tenant setups with separate schemas per tenant, implement a custom
|
|
TenantExtension that looks up the schema based on the API key or token claims.
|
|
"""
|
|
|
|
def __init__(self, config: dict[str, str]):
|
|
super().__init__(config)
|
|
self.expected_api_key = config.get("api_key")
|
|
if not self.expected_api_key:
|
|
raise ValueError("HINDSIGHT_API_TENANT_API_KEY is required when using ApiKeyTenantExtension")
|
|
# Allow disabling MCP auth for backwards compatibility
|
|
self.mcp_auth_disabled = config.get("mcp_auth_disabled", "").lower() in ("true", "1", "yes")
|
|
|
|
async def authenticate(self, context: RequestContext) -> TenantContext:
|
|
"""Validate API key and return configured schema context."""
|
|
if context.api_key != self.expected_api_key:
|
|
raise AuthenticationError("Invalid API key")
|
|
return TenantContext(schema_name=get_config().database_schema)
|
|
|
|
async def list_tenants(self) -> list[Tenant]:
|
|
"""Return configured schema for single-tenant setup."""
|
|
return [Tenant(schema=get_config().database_schema)]
|
|
|
|
async def authenticate_mcp(self, context: RequestContext) -> TenantContext:
|
|
"""
|
|
Authenticate MCP requests.
|
|
|
|
If mcp_auth_disabled is set, skip authentication for backwards compatibility.
|
|
Otherwise, delegate to authenticate().
|
|
"""
|
|
if self.mcp_auth_disabled:
|
|
return TenantContext(schema_name=get_config().database_schema)
|
|
return await self.authenticate(context)
|