auth-fixes #3

Merged
aetos merged 4 commits from auth-fixes into main 2026-07-19 14:47:03 +00:00
Showing only changes of commit 0dc96907fa - Show all commits

View File

@@ -32,12 +32,35 @@ Notes:
- Alter FastAPI dependency injection semantics.
"""
import os
import re
from fastapi import FastAPI
from .binder import bind_routes
from .loader import load_openapi
from .security import make_security_dependencies, parse_security_schemes
_env_pattern = re.compile(r"\{(\w+)\}")
def _resolve_env(value: str) -> str:
"""Replace {ENV_VAR} placeholders with values from os.environ."""
def _replace(m: re.Match) -> str:
return os.environ.get(m.group(1), m.group(0))
return _env_pattern.sub(_replace, value)
def _resolve_spec_env_vars(obj):
"""Recursively resolve {ENV_VAR} in all string values of the spec."""
if isinstance(obj, str):
return _resolve_env(obj)
if isinstance(obj, dict):
return {k: _resolve_spec_env_vars(v) for k, v in obj.items()}
if isinstance(obj, list):
return [_resolve_spec_env_vars(v) for v in obj]
return obj
class OpenAPIFirstApp(FastAPI):
"""
@@ -107,7 +130,7 @@ class OpenAPIFirstApp(FastAPI):
super().__init__(**fastapi_kwargs)
# Load and validate OpenAPI specification
self._openapi_spec = load_openapi(openapi_path)
self._openapi_spec = _resolve_spec_env_vars(load_openapi(openapi_path))
# Parse security schemes and build per-route dependencies
security_schemes = parse_security_schemes(self._openapi_spec)