Merge pull request #983 from lucapiccinelli/develop

Environment variable to disable CORS middleware
cheshire-cat-ai · Dec 9, 2024 · 599bfbc · 599bfbc
2 parents 2fdf311 + 5d664c1
commit 599bfbc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/core/cat/env.py b/core/cat/env.py
@@ -21,6 +21,7 @@ def get_supported_env_variables():
         "CCAT_JWT_EXPIRE_MINUTES": str(60 * 24),  # JWT expires after 1 day
         "CCAT_HTTPS_PROXY_MODE": False,
         "CCAT_CORS_FORWARDED_ALLOW_IPS": "*",
+        "CCAT_CORS_ENABLED": "true"
     }
 
 

diff --git a/core/cat/startup.py b/core/cat/startup.py
@@ -69,15 +69,17 @@ def custom_generate_unique_id(route: APIRoute):
 )
 
 # Configures the CORS middleware for the FastAPI app
-cors_allowed_origins_str = get_env("CCAT_CORS_ALLOWED_ORIGINS")
-origins = cors_allowed_origins_str.split(",") if cors_allowed_origins_str else ["*"]
-cheshire_cat_api.add_middleware(
-    CORSMiddleware,
-    allow_origins=origins,
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
+cors_enabled = get_env("CCAT_CORS_ENABLED")
+if cors_enabled == "true":
+    cors_allowed_origins_str = get_env("CCAT_CORS_ALLOWED_ORIGINS")
+    origins = cors_allowed_origins_str.split(",") if cors_allowed_origins_str else ["*"]
+    cheshire_cat_api.add_middleware(
+        CORSMiddleware,
+        allow_origins=origins,
+        allow_credentials=True,
+        allow_methods=["*"],
+        allow_headers=["*"],
+    )
 
 # Add routers to the middleware stack.
 cheshire_cat_api.include_router(base.router, tags=["Home"])