Refactor CORS configuration and request handling

Author: BotellaA

nginx.conf

@@ -18,43 +18,59 @@ http {
     server_name localhost;
 
     client_max_body_size 0;
-    
-    # === CORS configuration for ALL locations ===
-    add_header 'Access-Control-Allow-Origin'      $allow_origin always;
-    add_header 'Access-Control-Allow-Credentials' 'true' always;
-    add_header 'Access-Control-Allow-Methods'     'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
-    add_header 'Access-Control-Allow-Headers'     'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,X-CSRF-Token' always;
-    add_header 'Access-Control-Expose-Headers'    'Content-Length,Content-Range' always;
-    add_header 'Vary'                             'Origin' always;
 
-    # Handle preflight OPTIONS requests globally (very important!)
-    if ($request_method = 'OPTIONS') {
-      add_header 'Access-Control-Max-Age' 1728000;   # Cache preflight for 20 days
-      add_header 'Content-Type' 'text/plain; charset=utf-8';
-      add_header 'Content-Length' 0;
-      return 204;   # No Content — standard for preflight
+    location / {
+      if ($request_method = OPTIONS) {
+        add_header 'Access-Control-Allow-Origin'      $allow_origin always;
+        add_header 'Access-Control-Allow-Credentials' 'true' always;
+        add_header 'Access-Control-Allow-Methods'     'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers'     'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,X-CSRF-Token' always;
+        add_header 'Access-Control-Max-Age'           86400 always;
+        add_header 'Vary'                             'Origin' always;
+        add_header 'Content-Type'                     'text/plain; charset=utf-8' always;
+        add_header 'Content-Length'                   0 always;
+        return 204;
+      }
+      return 404;
     }
-
     location ~ "^/geode/" {
-      if ($request_method !~ ^(DELETE|GET|POST|PUT|OPTIONS)$) {
-        return 405;
+      limit_except DELETE GET POST PUT OPTIONS {
+        deny all;
       }
+    
+      add_header 'Access-Control-Allow-Origin'      $allow_origin always;
+      add_header 'Access-Control-Allow-Credentials' 'true' always;
+      add_header 'Access-Control-Allow-Methods'     'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
+      add_header 'Access-Control-Allow-Headers'     'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,X-CSRF-Token' always;
+      add_header 'Access-Control-Expose-Headers'    'Content-Length,Content-Range' always;
+      add_header 'Vary'            
+        
       rewrite "^/geode/(.*)" /$1 break;
       proxy_pass http://localhost:5000;
       proxy_http_version 1.1;
+      
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
     }
 
     location ~ "^/viewer/" {
-      if ($request_method !~ ^(GET|POST|OPTIONS)$) {
-        return 405;
+      limit_except GET POST OPTIONS {
+        deny all;
       }
+      
+      add_header 'Access-Control-Allow-Origin'      $allow_origin always;
+      add_header 'Access-Control-Allow-Credentials' 'true' always;
+      add_header 'Access-Control-Allow-Methods'     'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
+      add_header 'Access-Control-Allow-Headers'     'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,X-CSRF-Token' always;
+      add_header 'Access-Control-Expose-Headers'    'Content-Length,Content-Range' always;
+      add_header 'Vary'                             'Origin' always;
+
       rewrite "^/viewer/(.*)" /$1 break;
       proxy_pass http://localhost:1234;
       proxy_http_version 1.1;
+      
       proxy_set_header Host $host;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;