@raghulm/aegis-mcp 1.0.5 → 1.0.9

package/server/config.py

@@ -1,82 +1,82 @@
-from __future__ import annotations
-
-import json
-import os
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Any
-
-
-@dataclass(frozen=True)
-class Settings:
-    """Runtime configuration for the MCP service."""
-
-    service_name: str = "aegis"
-    environment: str = "dev"
-    policy_roles_path: Path = Path("policies/roles.yaml")
-    policy_scopes_path: Path = Path("policies/scope_rules.yaml")
-    oidc_issuer: str | None = None
-    oidc_audience: str | None = None
-
-
-
-def _parse_simple_yaml(raw: str) -> dict[str, Any]:
-    """Very small YAML subset parser for key/list policy files."""
-    root: dict[str, Any] = {}
-    current_section: dict[str, list[str]] | None = None
-    current_key: str | None = None
-    for line in raw.splitlines():
-        stripped = line.rstrip()
-        if not stripped or stripped.lstrip().startswith("#"):
-            continue
-        if not line.startswith(" ") and stripped.endswith(":"):
-            section = stripped[:-1]
-            root[section] = {}
-            current_section = root[section]
-            current_key = None
-        elif current_section is not None and line.startswith("  ") and stripped.endswith(":"):
-            current_key = stripped[:-1]
-            current_section[current_key] = []
-        elif current_section is not None and current_key and line.strip().startswith("-"):
-            value = line.split("-", maxsplit=1)[1].strip().strip('"')
-            current_section[current_key].append(value)
-    return root
-
-
-
-def _load_yaml(path: Path) -> dict[str, Any]:
-    if not path.exists():
-        return {}
-    content = path.read_text(encoding="utf-8")
-    try:
-        import yaml  # type: ignore
-
-        return yaml.safe_load(content) or {}
-    except Exception:
-        return _parse_simple_yaml(content)
-
-
-
-def load_settings() -> Settings:
-    return Settings(
-        service_name=os.getenv("MCP_SERVICE_NAME", "aegis"),
-        environment=os.getenv("MCP_ENV", "dev"),
-        policy_roles_path=Path(os.getenv("MCP_ROLES_FILE", "policies/roles.yaml")),
-        policy_scopes_path=Path(os.getenv("MCP_SCOPES_FILE", "policies/scope_rules.yaml")),
-        oidc_issuer=os.getenv("OIDC_ISSUER"),
-        oidc_audience=os.getenv("OIDC_AUDIENCE"),
-    )
-
-
-
-def load_role_policies(settings: Settings) -> dict[str, list[str]]:
-    raw = _load_yaml(settings.policy_roles_path)
-    roles = raw.get("roles", {})
-    return {str(k): [str(v) for v in values] for k, values in roles.items()}
-
-
-
-def load_scope_policies(settings: Settings) -> dict[str, list[str]]:
-    raw = _load_yaml(settings.policy_scopes_path)
-    scopes = raw.get("scopes", {})
-    return {str(k): [str(v) for v in values] for k, values in scopes.items()}
+from __future__ import annotations
+
+import json
+import os
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any
+
+
+@dataclass(frozen=True)
+class Settings:
+    """Runtime configuration for the MCP service."""
+
+    service_name: str = "aegis"
+    environment: str = "dev"
+    policy_roles_path: Path = Path("policies/roles.yaml")
+    policy_scopes_path: Path = Path("policies/scope_rules.yaml")
+    oidc_issuer: str | None = None
+    oidc_audience: str | None = None
+
+
+
+def _parse_simple_yaml(raw: str) -> dict[str, Any]:
+    """Very small YAML subset parser for key/list policy files."""
+    root: dict[str, Any] = {}
+    current_section: dict[str, list[str]] | None = None
+    current_key: str | None = None
+    for line in raw.splitlines():
+        stripped = line.rstrip()
+        if not stripped or stripped.lstrip().startswith("#"):
+            continue
+        if not line.startswith(" ") and stripped.endswith(":"):
+            section = stripped[:-1]
+            root[section] = {}
+            current_section = root[section]
+            current_key = None
+        elif current_section is not None and line.startswith("  ") and stripped.endswith(":"):
+            current_key = stripped[:-1]
+            current_section[current_key] = []
+        elif current_section is not None and current_key and line.strip().startswith("-"):
+            value = line.split("-", maxsplit=1)[1].strip().strip('"')
+            current_section[current_key].append(value)
+    return root
+
+
+
+def _load_yaml(path: Path) -> dict[str, Any]:
+    if not path.exists():
+        return {}
+    content = path.read_text(encoding="utf-8")
+    try:
+        import yaml  # type: ignore
+
+        return yaml.safe_load(content) or {}
+    except Exception:
+        return _parse_simple_yaml(content)
+
+
+
+def load_settings() -> Settings:
+    return Settings(
+        service_name=os.getenv("MCP_SERVICE_NAME", "aegis"),
+        environment=os.getenv("MCP_ENV", "dev"),
+        policy_roles_path=Path(os.getenv("MCP_ROLES_FILE", "policies/roles.yaml")),
+        policy_scopes_path=Path(os.getenv("MCP_SCOPES_FILE", "policies/scope_rules.yaml")),
+        oidc_issuer=os.getenv("OIDC_ISSUER"),
+        oidc_audience=os.getenv("OIDC_AUDIENCE"),
+    )
+
+
+
+def load_role_policies(settings: Settings) -> dict[str, list[str]]:
+    raw = _load_yaml(settings.policy_roles_path)
+    roles = raw.get("roles", {})
+    return {str(k): [str(v) for v in values] for k, values in roles.items()}
+
+
+
+def load_scope_policies(settings: Settings) -> dict[str, list[str]]:
+    raw = _load_yaml(settings.policy_scopes_path)
+    scopes = raw.get("scopes", {})
+    return {str(k): [str(v) for v in values] for k, values in scopes.items()}

package/server/health.py

@@ -1,19 +1,19 @@
-from __future__ import annotations
-
-from fastapi import FastAPI
-from fastapi.responses import JSONResponse
-from mcp.server.fastmcp import FastMCP
-
-from server.config import load_settings
-
-settings = load_settings()
-mcp = FastMCP(settings.service_name, json_response=True)
-app = FastAPI(title="aegis-mcp")
-
-
-@app.get("/health")
-def health() -> JSONResponse:
-    return JSONResponse({"status": "ok", "service": settings.service_name})
-
-
-app.mount("/mcp", mcp.streamable_http_app())
+from __future__ import annotations
+
+from fastapi import FastAPI
+from fastapi.responses import JSONResponse
+from mcp.server.fastmcp import FastMCP
+
+from server.config import load_settings
+
+settings = load_settings()
+mcp = FastMCP(settings.service_name, json_response=True)
+app = FastAPI(title="aegis-mcp")
+
+
+@app.get("/health")
+def health() -> JSONResponse:
+    return JSONResponse({"status": "ok", "service": settings.service_name})
+
+
+app.mount("/mcp", mcp.streamable_http_app())

package/server/logging.py

@@ -1,33 +1,33 @@
-from __future__ import annotations
-
-import json
-import logging
-import sys
-from datetime import datetime, timezone
-from typing import Any
-
-
-class JsonFormatter(logging.Formatter):
-    def format(self, record: logging.LogRecord) -> str:
-        payload: dict[str, Any] = {
-            "timestamp": datetime.now(tz=timezone.utc).isoformat(),
-            "level": record.levelname,
-            "message": record.getMessage(),
-            "logger": record.name,
-        }
-        extra = getattr(record, "extra_payload", None)
-        if isinstance(extra, dict):
-            payload.update(extra)
-        return json.dumps(payload, default=str)
-
-
-def get_logger(name: str = "mcp.aegis") -> logging.Logger:
-    logger = logging.getLogger(name)
-    if logger.handlers:
-        return logger
-    logger.setLevel(logging.INFO)
-    handler = logging.StreamHandler(sys.stderr)
-    handler.setFormatter(JsonFormatter())
-    logger.addHandler(handler)
-    logger.propagate = False
-    return logger
+from __future__ import annotations
+
+import json
+import logging
+import sys
+from datetime import datetime, timezone
+from typing import Any
+
+
+class JsonFormatter(logging.Formatter):
+    def format(self, record: logging.LogRecord) -> str:
+        payload: dict[str, Any] = {
+            "timestamp": datetime.now(tz=timezone.utc).isoformat(),
+            "level": record.levelname,
+            "message": record.getMessage(),
+            "logger": record.name,
+        }
+        extra = getattr(record, "extra_payload", None)
+        if isinstance(extra, dict):
+            payload.update(extra)
+        return json.dumps(payload, default=str)
+
+
+def get_logger(name: str = "mcp.aegis") -> logging.Logger:
+    logger = logging.getLogger(name)
+    if logger.handlers:
+        return logger
+    logger.setLevel(logging.INFO)
+    handler = logging.StreamHandler(sys.stderr)
+    handler.setFormatter(JsonFormatter())
+    logger.addHandler(handler)
+    logger.propagate = False
+    return logger