From 56a414bdd05f85fc2580112097571cd4ce8c2e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 21 Dec 2023 11:06:07 +0100
Subject: [PATCH] Update nginx.conf

---
 conf/nginx.conf | 47 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index f3e1778..0ce86a4 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,54 +4,82 @@ set $allowed_origins "https://${sandbox_domain}";
 set $api_domain "__DOMAIN__";
 set $files_domain "__DOMAIN__";
 ssl_ecdh_curve secp384r1;
+
 more_set_headers "Access-Control-Allow-Origin: '${allowed_origins}'";
 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;
 }
+
+if ($uri ~ ^(\/|.*\/|.*\.html)$) {
+    set $cacheControl no-cache;
+}
+
 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}";
+
 set $fontSrc    "'self' data: https://${main_domain}";
+
 set $imgSrc     "'self' data: blob: https://${main_domain}";
+
 set $frameSrc   "'self' https://${sandbox_domain} blob:";
+
 set $mediaSrc   "blob:";
+
 set $childSrc   "https://${main_domain}";
+
 set $workerSrc  "'self'";
+
 set $scriptSrc  "'self' resource: https://${main_domain}";
+
 set $frameAncestors "'self' https://${main_domain}";
+
 set $unsafe 0;
+
 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; }
+
+# privileged contexts allow a few more rights than unprivileged contexts, though limits are still applied
 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;
+
+    # 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;
@@ -62,9 +90,11 @@ location ~ ^/api/.*$ {
     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 "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";
@@ -80,12 +110,9 @@ location ^~ /blob/ {
     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;
 }
-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;