From 2f852c8aa294698fab49713d14509963f47e515f Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Wed, 13 Mar 2024 14:27:26 +1100
Subject: [PATCH] Caddy fix (#6690)

* Caddyfile updates

- Provide CORS headers for /static/ and /media/

* Adjust config_template

- Make more open by default
---
 InvenTree/config_template.yaml | 10 ++----
 docker/Caddyfile               | 57 ++++++++++++++++++++++------------
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/InvenTree/config_template.yaml b/InvenTree/config_template.yaml
index f013fb8495..e429aa2bea 100644
--- a/InvenTree/config_template.yaml
+++ b/InvenTree/config_template.yaml
@@ -163,8 +163,8 @@ auto_update: False
 # Allowed hosts (see ALLOWED_HOSTS in Django settings documentation)
 # A list of strings representing the host/domain names that this Django site can serve.
 # Default behaviour is to allow all hosts (THIS IS NOT SECURE!)
-# allowed_hosts:
-# - '*'
+allowed_hosts:
+  - '*'
 
 # Trusted origins (see CSRF_TRUSTED_ORIGINS in Django settings documentation)
 # If you are running behind a proxy, you may need to add the proxy address here
@@ -183,10 +183,9 @@ use_x_forwarded_port: false
 
 # Cross Origin Resource Sharing (CORS) settings (see https://github.com/adamchainz/django-cors-headers)
 cors:
+  allow_all: true
   allow_credentials: true
 
-  # allow_all: false
-
   # whitelist:
   # - https://example.com
   # - https://sub.example.com
@@ -199,11 +198,8 @@ cors:
 # STATIC_ROOT is the local filesystem location for storing static files
 #static_root: '/home/inventree/data/static'
 
-### Backup configuration options ###
 # INVENTREE_BACKUP_DIR is the local filesystem location for storing backups
-backup_storage: django.core.files.storage.FileSystemStorage
 #backup_dir: '/home/inventree/data/backup'
-#backup_options:
 
 # Background worker options
 background:
diff --git a/docker/Caddyfile b/docker/Caddyfile
index ad7b2c26ba..b501f10552 100644
--- a/docker/Caddyfile
+++ b/docker/Caddyfile
@@ -4,33 +4,50 @@
 # - INVENTREE_SERVER: The internal URL of the Inventree container (default: http://inventree-server:8000)
 
 (log_common) {
-    log {
-        output file /var/log/caddy/{args.0}.access.log
-    }
+	log {
+		output file /var/log/caddy/{args[0]}.access.log
+	}
+}
+
+(cors-headers) {
+	header Access-Control-Allow-Origin *
+	header Access-Control-Allow-Methods GET,HEAD,OPTIONS
+	header Access-Control-Allow-Headers User-Agent,Content-Type
+
+	@cors_preflight{args[0]} method OPTIONS
+
+	handle @cors_preflight{args[0]} {
+		respond "" 204
+	}
 }
 
 # Change the host to your domain (this will serve at inventree.localhost)
 {$INVENTREE_SITE_URL:inventree.localhost} {
-    import log_common inventree
+	import log_common inventree
 
-    encode gzip
+	encode gzip
 
-    request_body {
-        max_size 100MB
-    }
+	request_body {
+		max_size 100MB
+	}
 
-    handle_path /static/* {
-        root * /var/www/static
-        file_server
-    }
+	handle_path /static/* {
+		import cors-headers static
 
-    handle_path /media/* {
-        forward_auth {$INVENTREE_SERVER:"http://inventree-server:8000"} {
-            uri /auth/
-        }
-        root * /var/www/media
-        file_server
-    }
+		root * /var/www/static
+		file_server
+	}
 
-    reverse_proxy {$INVENTREE_SERVER:"http://inventree-server:8000"}
+	handle_path /media/* {
+		import cors-headers media
+
+		root * /var/www/media
+		file_server
+
+		forward_auth {$INVENTREE_SERVER:"http://inventree-server:8000"} {
+			uri /auth/
+		}
+	}
+
+	reverse_proxy {$INVENTREE_SERVER:"http://inventree-server:8000"}
 }