diff --git a/conf/old.nginx.conf b/conf/old.nginx.conf index f3e1778..a55f371 100644 --- a/conf/old.nginx.conf +++ b/conf/old.nginx.conf @@ -4,18 +4,27 @@ set $allowed_origins "https://${sandbox_domain}"; set $api_domain "__DOMAIN__"; set $files_domain "__DOMAIN__"; ssl_ecdh_curve secp384r1; + +more_set_headers "X-XSS-Protection: '1; mode=block'"; +more_set_headers "X-Content-Type-Options: nosniff"; more_set_headers "Access-Control-Allow-Origin: '${allowed_origins}'"; +more_set_headers "Access-Control-Allow-Credentials: true"; + more_set_headers "Cross-Origin-Resource-Policy: cross-origin"; more_set_headers "Cross-Origin-Embedder-Policy: require-corp"; + root __INSTALL_DIR__/; index index.html; error_page 404 /customize.dist/404.html; + if ($uri ~ ^(\/|.*\/|.*\.html)$) { set $cacheControl no-cache; } + if ($args ~ ver=) { set $cacheControl max-age=31536000; } + more_set_headers "Cache-Control: $cacheControl"; set $styleSrc "'unsafe-inline' 'self' https://${main_domain}"; set $connectSrc "'self' https://${main_domain} blob: wss://${api_domain} https://${sandbox_domain}"; @@ -32,39 +41,54 @@ if ($uri ~ ^\/(sheet|doc|presentation)\/inner.html.*$) { set $unsafe 1; } if ($uri ~ ^\/common\/onlyoffice\/.*\/.*\.html.*$) { set $unsafe 1; } if ($host != $sandbox_domain) { set $unsafe 0; } if ($uri ~ ^\/unsafeiframe\/inner\.html.*$) { set $unsafe 1; } + if ($unsafe) { set $scriptSrc "'self' 'unsafe-eval' 'unsafe-inline' resource: https://${main_domain}"; } + more_set_headers "Content-Security-Policy: default-src 'none'; child-src $childSrc; worker-src $workerSrc; media-src $mediaSrc; style-src $styleSrc; script-src $scriptSrc; connect-src $connectSrc; font-src $fontSrc; img-src $imgSrc; frame-src $frameSrc; frame-ancestors $frameAncestors"; -location ^~ /cryptpad_websocket { - proxy_pass http://127.0.0.1:__PORT__; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection upgrade; + + +types { + application/javascript mjs; } + +location ^~ /cryptpad_websocket { + proxy_pass http://127.0.0.1:__PORT_SOCKET__; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + # WebSocket support (nginx 1.4) + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection upgrade; +} + location ^~ /customize.dist/ { # This is needed in order to prevent infinite recursion between /customize/ and the root } + location ^~ /customize/ { rewrite ^/customize/(.*)$ $1 break; try_files /customize/$uri /customize.dist/$uri; } + location ~ ^/api/.*$ { proxy_pass http://127.0.0.1:__PORT__; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_hide_header Cross-Origin-Resource-Policy; more_set_headers "Cross-Origin-Resource-Policy: cross-origin"; proxy_hide_header Cross-Origin-Embedder-Policy; more_set_headers "Cross-Origin-Embedder-Policy: require-corp"; } -location ^~ /blob/ { +location ~ ^/(blob|block)/.*$ { if ($request_method = 'OPTIONS') { more_set_headers "Access-Control-Allow-Origin: ${allowed_origins}"; + more_set_headers add_header "Access-Control-Allow-Credentials: true"; more_set_headers "Access-Control-Allow-Methods: 'GET, POST, OPTIONS'"; more_set_headers "Access-Control-Allow-Headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range"; more_set_headers "Access-Control-Max-Age: 1728000"; @@ -72,20 +96,18 @@ location ^~ /blob/ { more_set_headers "Content-Length: 0"; return 204; } - more_set_headers "X-Content-Type-Options: nosniff"; - more_set_headers "Cache-Control: max-age=31536000'"; - more_set_headers "Access-Control-Allow-Origin: ${allowed_origins}"; - more_set_headers "Access-Control-Allow-Methods: 'GET, POST, OPTIONS'"; - more_set_headers "Access-Control-Allow-Headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,Content-Length"; - more_set_headers "Access-Control-Expose-Headers: DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,Content-Length"; - try_files $uri =404; + proxy_hide_header 'X-Content-Type-Options'; + proxy_hide_header 'Access-Control-Allow-Origin'; + proxy_hide_header 'Permissions-Policy'; + proxy_hide_header 'X-XSS-Protection'; + proxy_hide_header 'Cross-Origin-Resource-Policy'; + proxy_hide_header 'Cross-Origin-Embedder-Policy'; + proxy_pass http://127.0.0.1:__PORT__; } -location ^~ /block/ { - more_set_headers "X-Content-Type-Options: nosniff"; - more_set_headers "Cache-Control: max-age=0"; - try_files $uri =404; -} -location ~ ^/(register|login|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc|form|report|convert|checkup)$ { + +location ~ ^/(register|login|recovery|settings|user|pad|drive|poll|slide|code|whiteboard|file|media|profile|contacts|todo|filepicker|debug|kanban|sheet|support|admin|notifications|teams|calendar|presentation|doc|form|report|convert|checkup|diagram)$ { rewrite ^(.*)$ $1/ redirect; } -try_files /customize/www/$uri /customize/www/$uri/index.html /www/$uri /www/$uri/index.html /customize/$uri; + +# Finally, serve anything the above exceptions don't govern. +try_files /customize/www/$uri /customize/www/$uri/index.html /www/$uri /www/$uri/index.html /customize/$uri; \ No newline at end of file