feat(webserver): add CORS for /packs endpoints

Fixes #248
ajgon · Dec 12, 2020 · ede019d · ede019d
1 parent ac93374
commit ede019d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/templates/default/appserver.apache2.passenger.conf.erb b/templates/default/appserver.apache2.passenger.conf.erb
@@ -39,15 +39,15 @@ Header always unset "X-Powered-By"
   LimitRequestBody <%= @out[:limit_request_body] || '1048576' %>
   KeepAliveTimeout <%= @out[:keepalive_timeout] || '15' %>
 
-  <Location "/assets/">
+  <LocationMatch "/(assets|packs)/">
     ExpiresActive on
 
     Header set Cache-Control "public"
     Header set Access-Control-Allow-Origin "*"
     Header set Access-Control-Allow-Methods "GET, PUT, POST, DELETE"
     Header set Access-Control-Expose-Headers "ETag"
     Header set X-Content-Type-Options "nosniff"
-    </Location>
+  </LocationMatch>
 
 <% if @appserver_config[:max_pool_size] -%>
   PassengerMaxPoolSize <%= @appserver_config[:max_pool_size] %>
@@ -138,15 +138,15 @@ SSLStaplingCache "shmcb:logs/stapling-cache(150000)"
   LimitRequestBody <%= @out[:client_max_body_size] || '1048576' %>
   KeepAliveTimeout <%= @out[:keepalive_timeout] || '15' %>
 
-  <Location "/assets/">
+  <LocationMatch "/(assets|packs)/">
     ExpiresActive on
 
     Header set Cache-Control "public"
     Header set Access-Control-Allow-Origin "*"
     Header set Access-Control-Allow-Methods "GET, PUT, POST, DELETE"
     Header set Access-Control-Expose-Headers "ETag"
     Header set X-Content-Type-Options "nosniff"
-  </Location>
+  </LocationMatch>
 
 <% if @appserver_config[:max_pool_size] -%>
   PassengerMaxPoolSize <%= @appserver_config[:max_pool_size] %>

diff --git a/templates/default/appserver.apache2.upstream.conf.erb b/templates/default/appserver.apache2.upstream.conf.erb
@@ -37,15 +37,15 @@ Listen <%= @out[:port] %>
   LimitRequestBody <%= @out[:limit_request_body] || '1048576' %>
   KeepAliveTimeout <%= @out[:keepalive_timeout] || '15' %>
 
-  <Location "/assets/">
+  <LocationMatch "/(assets|packs)/">
     ExpiresActive on
 
     Header set Cache-Control "public"
     Header set Access-Control-Allow-Origin "*"
     Header set Access-Control-Allow-Methods "GET, PUT, POST, DELETE"
     Header set Access-Control-Expose-Headers "ETag"
     Header set X-Content-Type-Options "nosniff"
-  </Location>
+  </LocationMatch>
 
   RewriteEngine on
 
@@ -57,6 +57,7 @@ Listen <%= @out[:port] %>
   RewriteRule ^/(.*)$ balancer://<%= upstream %>%{REQUEST_URI} [P,QSA,L]
 
   ProxyPass /assets "!"
+  ProxyPass /packs "!"
   ProxyPass / balancer://<%= upstream %>/
   ProxyPassReverse / balancer://<%= upstream %>/
   ProxyPreserveHost on
@@ -125,15 +126,15 @@ SSLStaplingCache "shmcb:logs/stapling-cache(150000)"
   LimitRequestBody <%= @out[:client_max_body_size] || '1048576' %>
   KeepAliveTimeout <%= @out[:keepalive_timeout] || '15' %>
 
-  <Location "/assets/">
+  <LocationMatch "/(assets|packs)/">
     ExpiresActive on
 
     Header set Cache-Control "public"
     Header set Access-Control-Allow-Origin "*"
     Header set Access-Control-Allow-Methods "GET, PUT, POST, DELETE"
     Header set Access-Control-Expose-Headers "ETag"
     Header set X-Content-Type-Options "nosniff"
-  </Location>
+  </LocationMatch>
 
   RewriteEngine on
 
@@ -145,6 +146,7 @@ SSLStaplingCache "shmcb:logs/stapling-cache(150000)"
   RewriteRule ^/(.*)$ balancer://<%= upstream %>%{REQUEST_URI} [P,QSA,L]
 
   ProxyPass /assets "!"
+  ProxyPass /packs "!"
   ProxyPass / balancer://<%= upstream %>/
   ProxyPassReverse / balancer://<%= upstream %>/
   ProxyPreserveHost on

diff --git a/templates/default/appserver.nginx.conf.erb b/templates/default/appserver.nginx.conf.erb
@@ -38,7 +38,7 @@ server {
     try_files $uri/index.html $uri/index.htm @<%= @name %>;
   }
 
-  location ^~ /assets/ {
+  location ~* ^/(assets|packs)/ {
     gzip_static on;
     expires max;
     add_header Cache-Control public;
@@ -137,7 +137,7 @@ server {
     try_files $uri/index.html $uri/index.htm @<%= @name %>;
   }
 
-  location ^~ /assets/ {
+  location ~* ^/(assets|packs)/ {
     gzip_static on;
     expires max;
     add_header Cache-Control public;