Merge pull request #3906 from butonic/fix-cors-headers

fix preflight requests
cs3org · May 22, 2023 · cacc3ca · cacc3ca
2 parents fde10c4 + aa29171
commit cacc3ca
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/changelog/unreleased/fix-preflight-requests.md b/changelog/unreleased/fix-preflight-requests.md
@@ -0,0 +1,5 @@
+Bugfix: fix preflight requests
+
+The datagateway now correctly overwrites the preconfigured CORS related headers with the headers returned by a dataprovider.
+
+https://github.com/cs3org/reva/pull/
diff --git a/internal/http/interceptors/cors/cors.go b/internal/http/interceptors/cors/cors.go
@@ -112,7 +112,7 @@ func New(m map[string]interface{}) (global.Middleware, int, error) {
 	}
 
 	// TODO(jfd): use log from request context, otherwise fmt will be used to log,
-	// preventing us from pinging the log to eg jq
+	// preventing us from piping the log to eg jq
 	c := cors.New(cors.Options{
 		AllowCredentials:   conf.AllowCredentials,
 		AllowedHeaders:     conf.AllowedHeaders,

diff --git a/internal/http/services/datagateway/datagateway.go b/internal/http/services/datagateway/datagateway.go
@@ -393,7 +393,7 @@ func (s *svc) doPatch(w http.ResponseWriter, r *http.Request) {
 func copyHeader(dst, src http.Header) {
 	for key, values := range src {
 		for i := range values {
-			dst.Add(key, values[i])
+			dst.Set(key, values[i])
 		}
 	}
 }
diff --git a/internal/http/services/owncloud/ocdav/tus.go b/internal/http/services/owncloud/ocdav/tus.go
@@ -92,7 +92,7 @@ func (s *svc) handleSpacesTusPost(w http.ResponseWriter, r *http.Request, spaceI
 
 func (s *svc) handleTusPost(ctx context.Context, w http.ResponseWriter, r *http.Request, meta map[string]string, ref *provider.Reference, log zerolog.Logger) {
 	w.Header().Add(net.HeaderAccessControlAllowHeaders, strings.Join([]string{net.HeaderTusResumable, net.HeaderUploadLength, net.HeaderUploadMetadata, net.HeaderIfMatch}, ", "))
-	w.Header().Add(net.HeaderAccessControlExposeHeaders, strings.Join([]string{net.HeaderTusResumable, net.HeaderLocation}, ", "))
+	w.Header().Add(net.HeaderAccessControlExposeHeaders, strings.Join([]string{net.HeaderTusResumable, net.HeaderUploadOffset, net.HeaderLocation}, ", "))
 	w.Header().Set(net.HeaderTusExtension, "creation,creation-with-upload,checksum,expiration")
 
 	w.Header().Set(net.HeaderTusResumable, "1.0.0")