Skip to content

Personal AI, On Personal Devices

Python

fix: security middleware blocks CORS preflight, breaking desktop chat (#53)

Jon Saad-Falcon3f257f58aafc
diff --git a/src/openjarvis/server/middleware.py b/src/openjarvis/server/middleware.py
index 2179b2c3..0d22ecb0 100644
--- a/src/openjarvis/server/middleware.py
+++ b/src/openjarvis/server/middleware.py
@@ -17,9 +17,11 @@ def create_security_middleware() -> Any:
- X-Frame-Options: DENY
- X-XSS-Protection: 1; mode=block
- Strict-Transport-Security: max-age=31536000; includeSubDomains
- - Content-Security-Policy: default-src 'self'
- Referrer-Policy: strict-origin-when-cross-origin
- Permissions-Policy: camera=(), microphone=(), geolocation=()
+
+ OPTIONS requests are passed through without headers so that
+ CORS preflight is not blocked.
"""
try:
from starlette.middleware.base import BaseHTTPMiddleware
@@ -30,6 +32,11 @@ def create_security_middleware() -> Any:
class SecurityHeadersMiddleware(BaseHTTPMiddleware):
async def dispatch(self, request: Request, call_next: Any) -> Response:
+ # Let CORS preflight requests pass through without
+ # security headers that would conflict with CORS.
+ if request.method == "OPTIONS":
+ return await call_next(request)
+
response = await call_next(request)
response.headers["X-Content-Type-Options"] = "nosniff"
response.headers["X-Frame-Options"] = "DENY"
@@ -37,7 +44,6 @@ def create_security_middleware() -> Any:
response.headers["Strict-Transport-Security"] = (
"max-age=31536000; includeSubDomains"
)
- response.headers["Content-Security-Policy"] = "default-src 'self'"
response.headers["Referrer-Policy"] = "strict-origin-when-cross-origin"
response.headers["Permissions-Policy"] = (
"camera=(), microphone=(), geolocation=()"
@@ -53,7 +59,6 @@ SECURITY_HEADERS = {
"X-Frame-Options": "DENY",
"X-XSS-Protection": "1; mode=block",
"Strict-Transport-Security": "max-age=31536000; includeSubDomains",
- "Content-Security-Policy": "default-src 'self'",
"Referrer-Policy": "strict-origin-when-cross-origin",
"Permissions-Policy": "camera=(), microphone=(), geolocation=()",
}
diff --git a/tests/server/test_middleware.py b/tests/server/test_middleware.py
index 3c6f7baf..07dac292 100644
--- a/tests/server/test_middleware.py
+++ b/tests/server/test_middleware.py
@@ -17,7 +17,6 @@ class TestSecurityHeaders:
"X-Frame-Options",
"X-XSS-Protection",
"Strict-Transport-Security",
- "Content-Security-Policy",
"Referrer-Policy",
"Permissions-Policy",
}
@@ -77,3 +76,41 @@ class TestSecurityHeaders:
assert resp.headers.get(header_name) == header_value, (
f"Missing or wrong header: {header_name}"
)
+
+ def test_middleware_skips_options(self) -> None:
+ """OPTIONS requests pass through without security headers."""
+ import pytest
+ fastapi = pytest.importorskip("fastapi")
+ from fastapi.middleware.cors import CORSMiddleware
+ from fastapi.testclient import TestClient
+
+ app = fastapi.FastAPI()
+
+ # Add CORS first, then security (reverse execution order)
+ app.add_middleware(
+ CORSMiddleware,
+ allow_origins=["*"],
+ allow_methods=["*"],
+ allow_headers=["*"],
+ )
+ middleware_cls = create_security_middleware()
+ assert middleware_cls is not None
+ app.add_middleware(middleware_cls)
+
+ @app.post("/test")
+ def test_endpoint() -> dict:
+ return {"ok": True}
+
+ client = TestClient(app)
+ resp = client.options(
+ "/test",
+ headers={
+ "Origin": "https://tauri.localhost",
+ "Access-Control-Request-Method": "POST",
+ "Access-Control-Request-Headers": "content-type",
+ },
+ )
+ assert resp.status_code == 200
+ assert "access-control-allow-origin" in resp.headers
+ # Security headers should NOT be present on preflight
+ assert "X-Frame-Options" not in resp.headers