Add more CORS headers to make TUS work

butonic · Apr 17, 2020 · 025dcd7 · 025dcd7
1 parent 23e65d0
commit 025dcd7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/internal/http/interceptors/cors/cors.go b/internal/http/interceptors/cors/cors.go
@@ -109,6 +109,12 @@ func New(m map[string]interface{}) (global.Middleware, int, error) {
 		}
 	}
 
+	if len(conf.ExposedHeaders) == 0 {
+		conf.ExposedHeaders = []string{
+			"Location",
+		}
+	}
+
 	// TODO(jfd): use log from request context, otherwise fmt will be used to log,
 	// preventing us from pinging the log to eg jq
 	c := cors.New(cors.Options{

diff --git a/internal/http/services/dataprovider/handler/unrouted_handler.go b/internal/http/services/dataprovider/handler/unrouted_handler.go
@@ -247,7 +247,7 @@ func (handler *UnroutedHandler) Middleware(h http.Handler) http.Handler {
 			if r.Method == "OPTIONS" {
 				// Preflight request
 				header.Add("Access-Control-Allow-Methods", "POST, GET, HEAD, PATCH, DELETE, OPTIONS")
-				header.Add("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Upload-Length, Upload-Offset, Tus-Resumable, Upload-Metadata, Upload-Defer-Length, Upload-Concat")
+				header.Add("Access-Control-Allow-Headers", "Authorization, Origin, X-Requested-With, Content-Type, Upload-Length, Upload-Offset, Tus-Resumable, Upload-Metadata, Upload-Defer-Length, Upload-Concat")
 				header.Set("Access-Control-Max-Age", "86400")
 
 			} else {

diff --git a/internal/http/services/owncloud/ocdav/ocdav.go b/internal/http/services/owncloud/ocdav/ocdav.go
@@ -113,6 +113,8 @@ func (s *svc) Handler() http.Handler {
 
 		// the webdav api is accessible from anywhere
 		w.Header().Set("Access-Control-Allow-Origin", "*")
+		w.Header().Add("Access-Control-Allow-Headers", "Upload-Offset, Location, Upload-Length, Tus-Version, Tus-Resumable, Tus-Max-Size, Tus-Extension, Upload-Metadata, Upload-Defer-Length, Upload-Concat")
+		w.Header().Add("Access-Control-Expose-Headers", "Upload-Offset, Location, Upload-Length, Tus-Version, Tus-Resumable, Tus-Max-Size, Tus-Extension, Upload-Metadata, Upload-Defer-Length, Upload-Concat")
 
 		// TODO(jfd): do we need this?
 		// fake litmus testing for empty namespace: see https://github.com/golang/net/blob/e514e69ffb8bc3c76a71ae40de0118d794855992/webdav/litmus_test_server.go#L58-L89