Merge pull request #52 from devilbox/release-1.0.10

Streamline CORS headers
devilbox · Dec 31, 2022 · 2fc92d7 · 2fc92d7
2 parents 98cdbd3 + e313907
commit 2fc92d7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/bin/vhost-gen b/bin/vhost-gen
@@ -29,8 +29,8 @@ if os.environ.get("MYPY_CHECK", False):
 # --------------------------------------------------------------------------------------------------
 APPNAME = "vhost-gen"
 APPREPO = "https://github.com/devilbox/vhost-gen"
-VERSION = "1.0.9"
-RELDATE = "2022-12-27"
+VERSION = "1.0.10"
+RELDATE = "2022-12-31"
 
 # Default paths
 CONFIG_PATH = "/etc/vhost-gen/conf.yml"

diff --git a/etc/templates/apache22.yml b/etc/templates/apache22.yml
@@ -181,13 +181,16 @@ features:
         Allow from all
     </Location>
 
+  # https://stackoverflow.com/a/42558499
+  # https://fetch.spec.whatwg.org/#forbidden-header-name
   xdomain_request: |
     # Allow cross domain request from these hosts
     SetEnvIf Origin "__REGEX__" AccessControlAllowOrigin=$0
-    Header add Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
-    Header always set Access-Control-Allow-Methods "POST, GET, OPTIONS, DELETE, PUT"
+    Header always set Access-Control-Allow-Origin   %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
+    Header always set Access-Control-Allow-Methods  "HEAD, GET, POST, PUT, PATCH, DELETE, OPTIONS"
+    Header always set Access-Control-Allow-Headers  "Accept, Authorization, Content-Security-Policy, Content-Type, Location, Origin, X-Requested-With"
+    Header always set Access-Control-Expose-Headers "Content-Security-Policy, Location"
     Header always set Access-Control-Max-Age "0"
-    Header always set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token"
     # Added a rewrite to respond with a 200 SUCCESS on every OPTIONS request.
     RewriteEngine On
     RewriteCond %{REQUEST_METHOD} OPTIONS

diff --git a/etc/templates/apache24.yml b/etc/templates/apache24.yml
@@ -206,13 +206,16 @@ features:
         Require all granted
     </Location>
 
+  # https://stackoverflow.com/a/42558499
+  # https://fetch.spec.whatwg.org/#forbidden-header-name
   xdomain_request: |
     # Allow cross domain request from these hosts
     SetEnvIf Origin "__REGEX__" AccessControlAllowOrigin=$0
-    Header add Access-Control-Allow-Origin %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
-    Header always set Access-Control-Allow-Methods "POST, GET, OPTIONS, DELETE, PUT"
+    Header always set Access-Control-Allow-Origin   %{AccessControlAllowOrigin}e env=AccessControlAllowOrigin
+    Header always set Access-Control-Allow-Methods  "HEAD, GET, POST, PUT, PATCH, DELETE, OPTIONS"
+    Header always set Access-Control-Allow-Headers  "Accept, Authorization, Content-Security-Policy, Content-Type, Location, Origin, X-Requested-With"
+    Header always set Access-Control-Expose-Headers "Content-Security-Policy, Location"
     Header always set Access-Control-Max-Age "0"
-    Header always set Access-Control-Allow-Headers "x-requested-with, Content-Type, origin, authorization, accept, client-security-token"
     # Added a rewrite to respond with a 200 SUCCESS on every OPTIONS request.
     RewriteEngine On
     RewriteCond %{REQUEST_METHOD} OPTIONS

diff --git a/etc/templates/nginx.yml b/etc/templates/nginx.yml
@@ -166,11 +166,12 @@ features:
 
   xdomain_request: |
     # Allow cross domain request from these hosts
+    # https://fetch.spec.whatwg.org/#forbidden-header-name
     if ( $http_origin ~* (__REGEX__) ) {
-        add_header "Access-Control-Allow-Origin" "$http_origin";
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
-        add_header 'Access-Control-Expose-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
+        add_header "Access-Control-Allow-Origin"   "$http_origin";
+        add_header 'Access-Control-Allow-Methods'  'HEAD, GET, POST, PUT, PATCH, DELETE, OPTIONS';
+        add_header 'Access-Control-Allow-Headers'  'Accept, Authorization, Content-Security-Policy, Content-Type, Location, Origin, X-Requested-With';
+        add_header 'Access-Control-Expose-Headers' 'Content-Security-Policy, Location';
         add_header 'Access-Control-Max-Age' 0;
         return 200;
     }
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="vhost-gen",
-    version="1.0.9",
+    version="1.0.10",
     description="Configurable vHost generator for Apache 2.2, Apache 2.4 and Nginx.",
     license="MIT",
     long_description=long_description,