MetaList 0.7.0__tar.gz → 0.7.2__tar.gz

{metalist-0.7.0 → metalist-0.7.2}/MANIFEST.in

@@ -1,4 +1,6 @@
 recursive-include app/static *
 recursive-include app/templates *.html
+prune evals
+prune tests
 prune app/__pycache__
 global-exclude .DS_Store

{metalist-0.7.0/metalist.egg-info → metalist-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metalist
-Version: 0.7.0
+Version: 0.7.2
 Summary: A minimalist single-user note-taking app with SSR, fast in-memory tree operations, and efficient sync.
 Project-URL: Homepage, https://github.com/evolvingstuff/metalist
 Project-URL: Repository, https://github.com/evolvingstuff/metalist
@@ -48,6 +48,14 @@ A minimalist single-user note-taking app focused on server-side rendering (SSR),
 - Multi-tab search contexts with server-persisted scroll/search state (survives browser restarts)
 - Manual namespace backups/restores to a user-selected backup folder with retention controls
 
+## Changes in 0.7.2
+
+- Login, hydration, and workspace requests share one initialized browser-tab identity. Losing the `sessionStorage` copy while opening the workspace no longer causes the reported missing-tab-ID crash. The external trigger for that storage loss remains unconfirmed.
+- AI chat preserves the edited note and includes its permitted tree, tags, and cached URL titles. Search redaction and cloud privacy restrictions apply to every node; blocked selections expose only their availability reason.
+- Added on-demand AI help and menu actions, privacy previews, and Copy Response throughout assistant message bubbles. OpenAI is the supported inference provider.
+- LLM regressions use current production prompts, default to five trials with cache-aware parallel scheduling, and can run only cases affected by prompt or skill changes.
+- Improved Grammarly edit preservation and search suggestions that match the complete active clause.
+
 ## Changes in 0.6.3
 
 - Restored HTTPS connection reuse and aligned the pending accept queue with the existing worker capacity, so a browser’s six-connection startup burst is admitted.
@@ -213,6 +221,18 @@ METALIST_HOST=192.168.1.20 metalist
 ```
 On a fresh machine, that first launch also creates the default TLS cert pair automatically. Then open either `http://192.168.1.20:8000` or `https://192.168.1.20:8443` from the other machine.
 
+Starting with 0.7.1, an explicit `METALIST_HOST` or `METALIST_ALLOWED_HOSTS`
+configuration is saved in `~/MetaList/network-settings.json` (under
+`METALIST_DATA_DIRECTORY` when overridden). Subsequent source launches, plain
+`metalist` launches, and updates reuse it. Environment values override and update
+the corresponding saved settings. This file stores only the bind address and
+allowed hosts; namespace ports remain in their launch profiles, and shell access
+still requires `--enable-shell` on each launch. Invalid settings stop startup
+with an error. Fresh installations continue to bind to localhost by default.
+To switch back to local-only access, run `METALIST_HOST=127.0.0.1 metalist` once.
+Older installed versions do not read this file; keep supplying their LAN settings
+until upgrading to 0.7.1 or later.
+
 To keep `@shell` available on the host laptop while allowing another laptop to
 use normal MetaList features, bind both interfaces and explicitly allow the LAN
 address:

{metalist-0.7.0 → metalist-0.7.2}/README.md

@@ -12,6 +12,14 @@ A minimalist single-user note-taking app focused on server-side rendering (SSR),
 - Multi-tab search contexts with server-persisted scroll/search state (survives browser restarts)
 - Manual namespace backups/restores to a user-selected backup folder with retention controls
 
+## Changes in 0.7.2
+
+- Login, hydration, and workspace requests share one initialized browser-tab identity. Losing the `sessionStorage` copy while opening the workspace no longer causes the reported missing-tab-ID crash. The external trigger for that storage loss remains unconfirmed.
+- AI chat preserves the edited note and includes its permitted tree, tags, and cached URL titles. Search redaction and cloud privacy restrictions apply to every node; blocked selections expose only their availability reason.
+- Added on-demand AI help and menu actions, privacy previews, and Copy Response throughout assistant message bubbles. OpenAI is the supported inference provider.
+- LLM regressions use current production prompts, default to five trials with cache-aware parallel scheduling, and can run only cases affected by prompt or skill changes.
+- Improved Grammarly edit preservation and search suggestions that match the complete active clause.
+
 ## Changes in 0.6.3
 
 - Restored HTTPS connection reuse and aligned the pending accept queue with the existing worker capacity, so a browser’s six-connection startup burst is admitted.
@@ -177,6 +185,18 @@ METALIST_HOST=192.168.1.20 metalist
 ```
 On a fresh machine, that first launch also creates the default TLS cert pair automatically. Then open either `http://192.168.1.20:8000` or `https://192.168.1.20:8443` from the other machine.
 
+Starting with 0.7.1, an explicit `METALIST_HOST` or `METALIST_ALLOWED_HOSTS`
+configuration is saved in `~/MetaList/network-settings.json` (under
+`METALIST_DATA_DIRECTORY` when overridden). Subsequent source launches, plain
+`metalist` launches, and updates reuse it. Environment values override and update
+the corresponding saved settings. This file stores only the bind address and
+allowed hosts; namespace ports remain in their launch profiles, and shell access
+still requires `--enable-shell` on each launch. Invalid settings stop startup
+with an error. Fresh installations continue to bind to localhost by default.
+To switch back to local-only access, run `METALIST_HOST=127.0.0.1 metalist` once.
+Older installed versions do not read this file; keep supplying their LAN settings
+until upgrading to 0.7.1 or later.
+
 To keep `@shell` available on the host laptop while allowing another laptop to
 use normal MetaList features, bind both interfaces and explicitly allow the LAN
 address:

{metalist-0.7.0 → metalist-0.7.2}/app/api/routes/ai.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import asyncio
 import json
 import math
 from collections.abc import AsyncIterator
@@ -27,7 +26,6 @@ from app.services.agent.cloud_privacy import cloud_privacy_evaluator
 from app.services.agent.cloud_privacy import resolve_cloud_privacy_boundary
 from app.services.agent.inference import InferenceAdapter
 from app.services.agent.model_policy import SingleModelPolicy
-from app.services.agent.ollama_inference import OllamaInferenceAdapter
 from app.services.agent.openai_inference import OPENAI_API_BASE_URL
 from app.services.agent.openai_inference import OPENAI_MODELS
 from app.services.agent.openai_inference import OpenAIInferenceAdapter
@@ -50,15 +48,10 @@ from app.services.agent.skill_settings import resolve_agent_skill_set
 from app.services.agent.token_estimation import estimate_input_tokens
 from app.services.agent.tools import read_only_agent_tools
 from app.services.agent.trace import agent_trace_store
+from app.services.agent.menu_actions import MenuResult, menu_action_store
 from app.services.client_state_service import load_client_preferences
 from app.services.markdown_rendering import render_markdown_to_html
-from app.services.managed_ollama_runtime import ManagedOllamaRuntimeError
-from app.services.managed_ollama_runtime import managed_ollama_runtime
 from app.services.note_store import store as note_store
-from app.services.ollama_provider import OllamaProviderError
-from app.services.ollama_provider import ollama_provider
-from app.services.ollama_provider import resolve_ollama_think_value
-from app.services.ollama_provider import validate_ollama_model
 from app.services.openai_credentials import OpenAICredentialInputError
 from app.services.openai_credentials import openai_credential_store
 from app.services.openai_credentials import validate_openai_api_key
@@ -89,17 +82,10 @@ def _agent_runtime(*, inference: InferenceAdapter) -> AgentRuntime:
     )
 
 
-agent_runtime = _agent_runtime(
-    inference=OllamaInferenceAdapter(provider=ollama_provider)
-)
-
-
-
-
 class AiModelsRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    provider: Literal["ollama", "openai"]
+    provider: Literal["openai"]
 
 
 class AiModelsResponse(BaseModel):
@@ -128,7 +114,7 @@ class OpenAICostResponse(BaseModel):
 class CloudPrivacyPreviewRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    provider: Literal["ollama", "openai"]
+    provider: Literal["openai"]
     note_ids: list[str] = Field(..., max_length=20_000)
 
     @field_validator("note_ids")
@@ -163,27 +149,16 @@ class AiPromptDefaultsResponse(BaseModel):
     skills: list[AiSkillDefaultResponse]
 
 
-class AiModelPullRequest(BaseModel):
-    model_config = ConfigDict(extra="forbid")
-
-    provider: Literal["ollama"]
-    model: str
-
-    @field_validator("model")
-    @classmethod
-    def validate_model(cls, value: str) -> str:
-        return validate_ollama_model(value)
-
-
 class AiChatRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    provider: Literal["ollama", "openai"]
+    provider: Literal["openai"]
     model: str
     thinking_level: Literal["off", "low", "medium", "high"]
     show_diagnostics: bool
     message: str = Field(..., max_length=32_000)
     scope: AgentScopeDescriptor
+    selected_note_id: str = Field(..., max_length=128, pattern=r"^(?:\S+)?$")
 
     @field_validator("model")
     @classmethod
@@ -202,14 +177,7 @@ class AiChatRequest(BaseModel):
 
     @model_validator(mode="after")
     def validate_thinking_level_for_model(self) -> Self:
-        if self.provider == "ollama":
-            validate_ollama_model(self.model)
-            resolve_ollama_think_value(
-                model=self.model,
-                thinking_level=self.thinking_level,
-            )
-        else:
-            validate_openai_model(self.model)
+        validate_openai_model(self.model)
         return self
 
 
@@ -239,7 +207,7 @@ class AiChatMessage(BaseModel):
     rendered_thinking: str
     status: Literal["complete", "streaming", "error"]
     error: str
-    provider: Literal["ollama", "openai"]
+    provider: Literal["openai"]
     model: str
     activities: list[AiChatActivity]
 
@@ -308,15 +276,8 @@ async def list_ai_models(
     payload: AiModelsRequest,
     token: Annotated[str, Depends(require_request_auth_token)],
 ) -> AiModelsResponse:
-    del token
-    if payload.provider == "openai":
-        return AiModelsResponse(models=list(OPENAI_MODELS))
-    try:
-        runtime_info = await asyncio.to_thread(managed_ollama_runtime.ensure_running)
-        models = await ollama_provider.list_models(base_url=runtime_info.base_url)
-    except (ManagedOllamaRuntimeError, OllamaProviderError) as exc:
-        raise HTTPException(status_code=502, detail=str(exc)) from exc
-    return AiModelsResponse(models=models)
+    del token, payload
+    return AiModelsResponse(models=list(OPENAI_MODELS))
 
 
 @router.get(
@@ -476,38 +437,6 @@ def preview_cloud_privacy(
     )
 
 
-@router.post("/models/pull")
-@transactional_route
-def pull_ai_model(
-    payload: AiModelPullRequest,
-    token: Annotated[str, Depends(require_request_auth_token)],
-) -> StreamingResponse:
-    del token
-
-    async def stream_events() -> AsyncIterator[str]:
-        try:
-            runtime_info = await asyncio.to_thread(managed_ollama_runtime.ensure_running)
-            async for event in ollama_provider.stream_pull(
-                base_url=runtime_info.base_url,
-                model=payload.model,
-            ):
-                yield f"{json.dumps(event, separators=(',', ':'))}\n"
-        # lint: allow-PY001 rationale="pull errors must be delivered after response headers are sent"
-        except (ManagedOllamaRuntimeError, OllamaProviderError) as exc:
-            error_event = {"type": "error", "message": str(exc)}
-            yield f"{json.dumps(error_event, separators=(',', ':'))}\n"
-
-    return StreamingResponse(
-        stream_events(),
-        media_type="application/x-ndjson",
-        headers={
-            "X-Accel-Buffering": "no",
-            "Cache-Control": "no-store",
-            "Content-Encoding": "identity",
-        },
-    )
-
-
 @router.get("/session", response_model=AiSessionResponse)
 def get_ai_session(
     response: Response,
@@ -589,6 +518,17 @@ def get_ai_debug_snapshot(
     )
 
 
+@router.get("/history")
+def get_ai_history(
+    response: Response,
+    token: Annotated[str, Depends(require_request_auth_token)],
+) -> list:
+    response.headers["Cache-Control"] = "no-store"
+    return agent_trace_store.export_history(
+        session_key=token_service.get_session_key(token)
+    )
+
+
 @router.put("/debug", response_model=AiDebugSnapshotResponse)
 @transactional_route
 def put_ai_debug_details(
@@ -666,21 +606,19 @@ def stream_ai_chat(
     token: Annotated[str, Depends(require_request_auth_token)],
 ) -> StreamingResponse:
     session_key = token_service.get_session_key(token)
-    openai_api_key = ""
-    if payload.provider == "openai":
-        credential_status = openai_credential_store.status(
-            token=token,
-            session_key=session_key,
-        )
-        if not credential_status.configured:
-            raise HTTPException(
-                status_code=409,
-                detail="OpenAI API key is not configured",
-            )
-        openai_api_key = openai_credential_store.resolve(
-            token=token,
-            session_key=session_key,
+    credential_status = openai_credential_store.status(
+        token=token,
+        session_key=session_key,
+    )
+    if not credential_status.configured:
+        raise HTTPException(
+            status_code=409,
+            detail="OpenAI API key is not configured",
         )
+    openai_api_key = openai_credential_store.resolve(
+        token=token,
+        session_key=session_key,
+    )
     preferences = load_client_preferences(token=token)
     prompts = resolve_agent_prompt_set(preferences=preferences)
     skills = resolve_agent_skill_set(preferences=preferences)
@@ -704,6 +642,11 @@ def stream_ai_chat(
     authoritative_sort_mode = tab_state_store.get_sort_mode(
         tab_id=payload.scope.scope_tab_id
     )
+    active_search_query = authoritative_search_query
+    active_sort_mode = authoritative_sort_mode
+    if payload.selected_note_id and payload.scope.active_tab_id != payload.scope.scope_tab_id:
+        active_search_query = tab_state_store.get_search_query(tab_id=authoritative_active_tab_id)
+        active_sort_mode = tab_state_store.get_sort_mode(tab_id=authoritative_active_tab_id)
     frozen_scope = scoped_search_snapshot_factory.freeze(
         descriptor=payload.scope,
         authoritative_search_query=authoritative_search_query,
@@ -711,6 +654,9 @@ def stream_ai_chat(
         run_id=str(uuid4()),
         session_key=session_key,
         privacy_boundary=privacy_boundary,
+        selected_note_id=payload.selected_note_id,
+        authoritative_active_search_query=active_search_query,
+        authoritative_active_sort_mode=active_sort_mode,
     )
     tagging_run = TaggingRun(token=token, snapshot=frozen_scope, preferences=preferences, sync_uuid=get_current_sync_uuid(),
         batch_tokens=resolve_tagging_batch_tokens(preferences, payload.provider))
@@ -758,18 +704,9 @@ async def _stream_runtime_events(
     action, start_label = 'provider_runtime', 'Connecting to OpenAI API'
     ready_label = 'OpenAI API ready · 1,050,000-token context'
     base_url = OPENAI_API_BASE_URL
-    if payload.provider == 'ollama':
-        action = 'ollama_runtime'
-        start_label = 'Starting MetaList-managed Ollama · 32,768-token context'
-        runtime = agent_runtime
-    else:
-        runtime = _agent_runtime(inference=OpenAIInferenceAdapter(api_key=openai_api_key, cost_tracker=openai_cost_tracker))
+    runtime = _agent_runtime(inference=OpenAIInferenceAdapter(api_key=openai_api_key, cost_tracker=openai_cost_tracker))
     yield dict(type='action_status', action=action, status='started', label=start_label,
                approx_input_tokens=initial_input_tokens, output_tokens_received=0, duration_ms=0.0)
-    if payload.provider == 'ollama':
-        runtime_info = await asyncio.to_thread(managed_ollama_runtime.ensure_running)
-        base_url = runtime_info.base_url
-        ready_label = f'MetaList-managed Ollama ready · {runtime_info.context_tokens:,}-token context'
     yield dict(type='action_status', action=action, status='completed', label=ready_label,
                approx_input_tokens=initial_input_tokens, output_tokens_received=0, duration_ms=0.0)
     events = runtime.stream_scoped(session_key=session_key, base_url=base_url,
@@ -783,6 +720,18 @@ async def _stream_runtime_events(
         await events.aclose()
 
 
+@router.post("/menu-result")
+@transactional_route
+async def acknowledge_menu_result(payload: MenuResult, token: Annotated[str, Depends(require_request_auth_token)]):
+    # lint: allow-PY001 rationale="browser acknowledgments can be stale or belong to another session"
+    try:
+        menu_action_store.acknowledge(session_key=token_service.get_session_key(token), result=payload)
+    # lint: allow-PY001 rationale="reject invalid external menu acknowledgment with a conflict response"
+    except ValueError as exc:
+        raise HTTPException(status_code=409, detail=str(exc)) from exc
+    return {"acknowledged": True}
+
+
 class BulkAnswerRequest(BaseModel):
     model_config = ConfigDict(extra="forbid")
     question_id: str = Field(..., min_length=1)

{metalist-0.7.0 → metalist-0.7.2}/app/exception_boundaries.py

@@ -78,9 +78,9 @@ CAPTURE_BOUNDARIES = {
     # Translate explicitly validated domain input/resource rejection.
     'app/main.py:namespace_renamed_page:job_record_capture': ('NamespaceInputRejected', 'FileNotFoundError'),
     # Parse external host, URL, IP or date input at the named boundary.
-    'app/security/request_boundary.py:_normalize_configured_hostname:normalize_capture': ('ValueError',),
+    'app/security/request_hosts.py:_normalize_configured_hostname:normalize_capture': ('ValueError',),
     # Parse external host, URL, IP or date input at the named boundary.
-    'app/security/request_boundary.py:_normalize_hostname:ip_capture': ('ValueError',),
+    'app/security/request_hosts.py:_normalize_hostname:ip_capture': ('ValueError',),
     # Parse external host, URL, IP or date input at the named boundary.
     'app/security/request_boundary.py:_parse_host_header:parse_capture': ('ValueError',),
     # Parse external host, URL, IP or date input at the named boundary.
@@ -112,16 +112,6 @@ CAPTURE_BOUNDARIES = {
     # Handle expected external I/O, provider, image or LaTeX parsing failure.
     'app/services/link_titles.py:fetch_link_title:target_capture': ('_LinkTitleTargetRejected',),
     # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_acquire_startup_lock:lock_capture': ('FileExistsError',),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_is_process_running:process_capture': ('ProcessLookupError', 'PermissionError'),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_probe_ollama_version:probe_capture': ('HTTPError', 'JSONDecodeError'),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_remove_stale_lock:missing_capture': ('FileNotFoundError',),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
-    'app/services/managed_ollama_runtime.py:_remove_stale_lock:read_capture': ('FileNotFoundError',),
-    # Handle expected external I/O, provider, image or LaTeX parsing failure.
     'app/services/namespace_deletion_worker.py:_is_process_running:kill_capture': ('ProcessLookupError', 'PermissionError'),
     # Handle expected external I/O, provider, image or LaTeX parsing failure.
     'app/services/namespace_deletion_worker.py:_send_signal_if_running:signal_capture': ('ProcessLookupError',),

metalist-0.7.2/app/network_settings.py

@@ -0,0 +1,61 @@
+"""Machine network preferences shared by source and installed entrypoints.
+
+Only an explicit bind address/allowed-host configuration opts into persistence.
+Namespace ports, shell capability, credentials, and backups are not stored here.
+"""
+from __future__ import annotations
+
+from collections.abc import MutableMapping
+import json
+import os
+from pathlib import Path
+from uuid import uuid4
+
+from app.data_directory import resolve_data_directory
+from app.security.request_hosts import resolve_allowed_request_hosts
+
+
+_NETWORK_ENVIRONMENT_KEYS = frozenset({'METALIST_HOST', 'METALIST_ALLOWED_HOSTS'})
+
+
+def _validate_network_environment(environment: object) -> dict[str, str]:
+    if not isinstance(environment, dict) or not environment.keys() <= _NETWORK_ENVIRONMENT_KEYS:
+        raise RuntimeError('Network settings must contain only bind-address and allowed-host preferences')
+    if any(not isinstance(value, str) for value in environment.values()):
+        raise RuntimeError('Network settings values must be strings')
+    resolve_allowed_request_hosts(environ=environment)
+    return dict(environment)
+
+
+def _read_network_settings(path: Path) -> dict[str, str]:
+    if not path.exists():
+        return {}
+    payload = json.loads(path.read_text(encoding='utf-8'))
+    if (not isinstance(payload, dict) or set(payload) != {'version', 'environment'}
+            or type(payload['version']) is not int or payload['version'] != 1):
+        raise RuntimeError(f'Invalid network settings file: {path}')
+    return _validate_network_environment(payload['environment'])
+
+
+def _write_network_settings(path: Path, environment: dict[str, str]) -> None:
+    assert path.name == 'network-settings.json'
+    path.parent.mkdir(parents=True, exist_ok=True)
+    temporary = path.with_name(f'.network-settings-{uuid4().hex}.tmp')
+    try:
+        with temporary.open('x', encoding='utf-8') as stream:
+            json.dump({'version': 1, 'environment': environment}, stream, indent=2)
+            stream.write('\n')
+        os.replace(temporary, path)
+    finally:
+        temporary.unlink(missing_ok=True)
+
+
+def apply_network_settings(*, environ: MutableMapping[str, str], persist: bool) -> None:
+    path = resolve_data_directory(environ=environ) / 'network-settings.json'
+    saved = _read_network_settings(path)
+    configured = {key: environ[key] for key in _NETWORK_ENVIRONMENT_KEYS if key in environ}
+    effective = _validate_network_environment(saved | configured)
+    if persist and effective != saved:
+        _write_network_settings(path, effective)
+        print(f'[startup] Saved network settings: {path}', flush=True)
+    environ.update(effective)

{metalist-0.7.0 → metalist-0.7.2}/app/security/request_boundary.py

@@ -1,9 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Mapping
 from dataclasses import dataclass
-import ipaddress
-import re
 from urllib.parse import urlsplit
 
 from fastapi import Request
@@ -12,14 +9,10 @@ from starlette.middleware.base import BaseHTTPMiddleware
 
 from app.api.request_auth import AUTH_COOKIE_NAME
 from app.services.exception_capture import CapturedExceptionContext
+from app.security.request_hosts import _normalize_hostname, resolve_allowed_request_hosts
 
 
-_LOOPBACK_REQUEST_HOSTS = frozenset({"127.0.0.1", "::1", "localhost"})
-_WILDCARD_BIND_HOSTS = frozenset({"0.0.0.0", "::"})
 _SAFE_METHODS = frozenset({"GET", "HEAD", "OPTIONS"})
-_DNS_HOSTNAME_PATTERN = re.compile(
-    r"^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$"
-)
 
 
 @dataclass(frozen=True)
@@ -28,72 +21,6 @@ class RequestBoundaryRejection:
     detail: str
 
 
-def _normalize_hostname(*, hostname: str, context: str) -> str:
-    normalized = hostname.strip().casefold().rstrip(".")
-    if normalized == "":
-        raise ValueError(f"{context} hostname must not be empty")
-
-    ip_capture = CapturedExceptionContext(ValueError, boundary='app/security/request_boundary.py:_normalize_hostname:ip_capture')
-    parsed_ip: ipaddress._BaseAddress | None = None
-    with ip_capture:
-        parsed_ip = ipaddress.ip_address(normalized)
-    if ip_capture.captured_exception is None:
-        if parsed_ip is None:
-            raise RuntimeError("IP parser returned no address")
-        return parsed_ip.compressed.casefold()
-
-    if _DNS_HOSTNAME_PATTERN.fullmatch(normalized) is None:
-        raise ValueError(f"{context} contains an invalid hostname: {hostname!r}")
-    return normalized
-
-
-def _normalize_configured_hostname(*, raw_value: str) -> str:
-    value = raw_value.strip()
-    if value == "":
-        raise RuntimeError("METALIST_ALLOWED_HOSTS contains an empty entry")
-    if value == "*":
-        raise RuntimeError("METALIST_ALLOWED_HOSTS must not contain '*'")
-    if "://" in value or "/" in value or "@" in value:
-        raise RuntimeError(
-            "METALIST_ALLOWED_HOSTS entries must be hostnames without schemes, ports, or paths"
-        )
-
-    unbracketed_value = value
-    if value.startswith("[") and value.endswith("]"):
-        unbracketed_value = value[1:-1]
-    normalize_capture = CapturedExceptionContext(ValueError, boundary='app/security/request_boundary.py:_normalize_configured_hostname:normalize_capture')
-    normalized_hostname: str | None = None
-    with normalize_capture:
-        normalized_hostname = _normalize_hostname(
-            hostname=unbracketed_value,
-            context="METALIST_ALLOWED_HOSTS",
-        )
-    if normalize_capture.captured_exception is not None:
-        exc = normalize_capture.captured_exception
-        raise RuntimeError(str(exc)) from exc
-    if normalized_hostname is None:
-        raise RuntimeError("METALIST_ALLOWED_HOSTS parser returned no hostname")
-    return normalized_hostname
-
-
-def resolve_allowed_request_hosts(*, environ: Mapping[str, str]) -> frozenset[str]:
-    allowed_hosts = set(_LOOPBACK_REQUEST_HOSTS)
-    bind_host = environ.get("METALIST_HOST", "127.0.0.1").strip()
-    if bind_host == "":
-        raise RuntimeError("METALIST_HOST must not be empty")
-    normalized_bind_host = _normalize_configured_hostname(raw_value=bind_host)
-    if normalized_bind_host not in _WILDCARD_BIND_HOSTS:
-        allowed_hosts.add(normalized_bind_host)
-
-    configured_hosts = environ.get("METALIST_ALLOWED_HOSTS")
-    if configured_hosts is not None:
-        if configured_hosts.strip() == "":
-            raise RuntimeError("METALIST_ALLOWED_HOSTS must not be empty when set")
-        for raw_host in configured_hosts.split(","):
-            allowed_hosts.add(_normalize_configured_hostname(raw_value=raw_host))
-    return frozenset(allowed_hosts)
-
-
 def _parse_host_header(host_header: str) -> tuple[str, int | None] | None:
     raw_host = host_header.strip()
     if raw_host == "":

metalist-0.7.2/app/security/request_hosts.py

@@ -0,0 +1,83 @@
+"""Host validation shared by early launch settings and HTTP request checks."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+import ipaddress
+import re
+
+from app.services.exception_capture import CapturedExceptionContext
+
+
+_LOOPBACK_REQUEST_HOSTS = frozenset({"127.0.0.1", "::1", "localhost"})
+_WILDCARD_BIND_HOSTS = frozenset({"0.0.0.0", "::"})
+_DNS_HOSTNAME_PATTERN = re.compile(
+    r"^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)*$"
+)
+
+
+def _normalize_hostname(*, hostname: str, context: str) -> str:
+    normalized = hostname.strip().casefold().rstrip(".")
+    if normalized == "":
+        raise ValueError(f"{context} hostname must not be empty")
+
+    ip_capture = CapturedExceptionContext(ValueError, boundary='app/security/request_hosts.py:_normalize_hostname:ip_capture')
+    parsed_ip: ipaddress._BaseAddress | None = None
+    with ip_capture:
+        parsed_ip = ipaddress.ip_address(normalized)
+    if ip_capture.captured_exception is None:
+        if parsed_ip is None:
+            raise RuntimeError("IP parser returned no address")
+        return parsed_ip.compressed.casefold()
+
+    if _DNS_HOSTNAME_PATTERN.fullmatch(normalized) is None:
+        raise ValueError(f"{context} contains an invalid hostname: {hostname!r}")
+    return normalized
+
+
+def _normalize_configured_hostname(*, raw_value: str) -> str:
+    value = raw_value.strip()
+    if value == "":
+        raise RuntimeError("METALIST_ALLOWED_HOSTS contains an empty entry")
+    if value == "*":
+        raise RuntimeError("METALIST_ALLOWED_HOSTS must not contain '*'")
+    if "://" in value or "/" in value or "@" in value:
+        raise RuntimeError(
+            "METALIST_ALLOWED_HOSTS entries must be hostnames without schemes, ports, or paths"
+        )
+
+    unbracketed_value = value
+    if value.startswith("[") and value.endswith("]"):
+        unbracketed_value = value[1:-1]
+    normalize_capture = CapturedExceptionContext(ValueError, boundary='app/security/request_hosts.py:_normalize_configured_hostname:normalize_capture')
+    normalized_hostname: str | None = None
+    with normalize_capture:
+        normalized_hostname = _normalize_hostname(
+            hostname=unbracketed_value,
+            context="METALIST_ALLOWED_HOSTS",
+        )
+    if normalize_capture.captured_exception is not None:
+        exc = normalize_capture.captured_exception
+        raise RuntimeError(str(exc)) from exc
+    if normalized_hostname is None:
+        raise RuntimeError("METALIST_ALLOWED_HOSTS parser returned no hostname")
+    return normalized_hostname
+
+
+def resolve_allowed_request_hosts(*, environ: Mapping[str, str]) -> frozenset[str]:
+    allowed_hosts = set(_LOOPBACK_REQUEST_HOSTS)
+    bind_host = environ.get("METALIST_HOST", "127.0.0.1").strip()
+    if bind_host == "":
+        raise RuntimeError("METALIST_HOST must not be empty")
+    normalized_bind_host = _normalize_configured_hostname(raw_value=bind_host)
+    if normalized_bind_host not in _WILDCARD_BIND_HOSTS:
+        allowed_hosts.add(normalized_bind_host)
+
+    configured_hosts = environ.get("METALIST_ALLOWED_HOSTS")
+    if configured_hosts is not None:
+        if configured_hosts.strip() == "":
+            raise RuntimeError("METALIST_ALLOWED_HOSTS must not be empty when set")
+        for raw_host in configured_hosts.split(","):
+            allowed_hosts.add(_normalize_configured_hostname(raw_value=raw_host))
+    return frozenset(allowed_hosts)
+
+