From d741b20d235dd271b0087acf07954640a13fb7c6 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 23 Jan 2021 14:26:08 -0600 Subject: [PATCH] =?UTF-8?q?feat(reverse-proxy):=20=E2=9C=A8=20configure=20?= =?UTF-8?q?CORS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reverse-proxy/conf.d.dev/default.conf | 26 ++--------------- reverse-proxy/conf.d/default.conf | 42 +++------------------------ reverse-proxy/svr-includes/cors.conf | 33 +++++++++++++++++++++ reverse-proxy/svr-includes/proxy.conf | 8 +++++ 4 files changed, 47 insertions(+), 62 deletions(-) create mode 100644 reverse-proxy/svr-includes/cors.conf create mode 100644 reverse-proxy/svr-includes/proxy.conf diff --git a/reverse-proxy/conf.d.dev/default.conf b/reverse-proxy/conf.d.dev/default.conf index f7eea1d61..01188f142 100644 --- a/reverse-proxy/conf.d.dev/default.conf +++ b/reverse-proxy/conf.d.dev/default.conf @@ -1,42 +1,20 @@ server { listen 80 default_server; + include svr-includes/*; + add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'none'; form-action 'none'; frame-ancestors 'none';" always; location ^~ /api/archival/ { rewrite ^/api/archival/(.*)$ /$1 break; proxy_pass http://archival-api:80; - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $http_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 ^~ /api/directory/ { rewrite ^/api/directory/(.*)$ /$1 break; proxy_pass http://directory-api:80; - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $http_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 ^~ /api/ { rewrite ^/api/(.*)$ /$1 break; proxy_pass http://api-docs:8080; - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $http_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; } } \ No newline at end of file diff --git a/reverse-proxy/conf.d/default.conf b/reverse-proxy/conf.d/default.conf index 32fc4b017..fd1a28d15 100644 --- a/reverse-proxy/conf.d/default.conf +++ b/reverse-proxy/conf.d/default.conf @@ -1,63 +1,28 @@ server { listen 443 default_server ssl http2; server_name filterlists.com; - include svr-includes/*; - ssl_certificate /etc/nginx/cert/filterlists_cert.pem; ssl_certificate_key /etc/nginx/cert/filterlists_key.pem; - add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'none'; form-action 'none'; frame-ancestors 'none';" always; location ^~ /api/archival/ { rewrite ^/api/archival/(.*)$ /$1 break; proxy_pass http://archival-api:80; - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $http_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 ^~ /api/directory/ { rewrite ^/api/directory/(.*)$ /$1 break; proxy_pass http://directory-api:80; - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $http_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 ^~ /api/ { rewrite ^/api/(.*)$ /$1 break; proxy_pass http://api-docs:8080; - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $http_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 / { proxy_pass http://web:80; - proxy_http_version 1.1; - proxy_cache_bypass $http_upgrade; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $http_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; } } @@ -65,7 +30,8 @@ server { server { listen 80 default_server; server_name filterlists.com; - + include svr-includes/*; + add_header Content-Security-Policy "default-src 'none';" always; return 301 https://filterlists.com$request_uri; } @@ -74,9 +40,9 @@ server { listen 80; listen 443 ssl http2; server_name www.filterlists.com; - + include svr-includes/*; + add_header Content-Security-Policy "default-src 'none';" always; ssl_certificate /etc/nginx/cert/filterlists_cert.pem; ssl_certificate_key /etc/nginx/cert/filterlists_key.pem; - return 301 https://filterlists.com$request_uri; } \ No newline at end of file diff --git a/reverse-proxy/svr-includes/cors.conf b/reverse-proxy/svr-includes/cors.conf new file mode 100644 index 000000000..ad91d9750 --- /dev/null +++ b/reverse-proxy/svr-includes/cors.conf @@ -0,0 +1,33 @@ +# https://enable-cors.org/server_nginx.html +# +# Wide-open CORS config for nginx +# +location / { + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + # + # Custom headers and headers various browsers *should* be OK with but aren't + # + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + # + # Tell client that this pre-flight info is valid for 20 days + # + add_header 'Access-Control-Max-Age' 1728000; + add_header 'Content-Type' 'text/plain; charset=utf-8'; + add_header 'Content-Length' 0; + return 204; + } + if ($request_method = 'POST') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; + } + if ($request_method = 'GET') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; + } +} \ No newline at end of file diff --git a/reverse-proxy/svr-includes/proxy.conf b/reverse-proxy/svr-includes/proxy.conf new file mode 100644 index 000000000..11bce4643 --- /dev/null +++ b/reverse-proxy/svr-includes/proxy.conf @@ -0,0 +1,8 @@ +proxy_http_version 1.1; +proxy_cache_bypass $http_upgrade; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header Connection keep-alive; +proxy_set_header Host $http_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; \ No newline at end of file