From fb199e6fbf4e0158484863d1208d84426350c97a Mon Sep 17 00:00:00 2001 From: Roman Perekhod Date: Fri, 28 Jul 2023 10:34:19 +0200 Subject: [PATCH] Fix CORS issues --- changelog/unreleased/fix-cors.md | 6 ++++++ services/frontend/pkg/config/defaults/defaultconfig.go | 1 + services/ocdav/pkg/config/defaults/defaultconfig.go | 1 + services/ocs/pkg/config/defaults/defaultconfig.go | 2 +- services/webdav/pkg/config/defaults/defaultconfig.go | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/fix-cors.md diff --git a/changelog/unreleased/fix-cors.md b/changelog/unreleased/fix-cors.md new file mode 100644 index 0000000000..3ee0cb261e --- /dev/null +++ b/changelog/unreleased/fix-cors.md @@ -0,0 +1,6 @@ +Bugfix: Fix CORS issues + +We fixed the CORS issues when client asking for the 'Cache-Control' header before load the file + +https://github.com/owncloud/ocis/pull/6912 +https://github.com/owncloud/ocis/issues/5108 diff --git a/services/frontend/pkg/config/defaults/defaultconfig.go b/services/frontend/pkg/config/defaults/defaultconfig.go index 512ac11a5e..39bf0c4d31 100644 --- a/services/frontend/pkg/config/defaults/defaultconfig.go +++ b/services/frontend/pkg/config/defaults/defaultconfig.go @@ -70,6 +70,7 @@ func DefaultConfig() *config.Config { "Upload-Checksum", "Upload-Offset", "X-HTTP-Method-Override", + "Cache-Control", }, AllowCredentials: true, }, diff --git a/services/ocdav/pkg/config/defaults/defaultconfig.go b/services/ocdav/pkg/config/defaults/defaultconfig.go index 35d5b3c66e..07d11f6bd8 100644 --- a/services/ocdav/pkg/config/defaults/defaultconfig.go +++ b/services/ocdav/pkg/config/defaults/defaultconfig.go @@ -69,6 +69,7 @@ func DefaultConfig() *config.Config { "Upload-Checksum", "Upload-Offset", "X-HTTP-Method-Override", + "Cache-Control", }, AllowCredentials: true, }, diff --git a/services/ocs/pkg/config/defaults/defaultconfig.go b/services/ocs/pkg/config/defaults/defaultconfig.go index 79c15eb227..02a456b0d5 100644 --- a/services/ocs/pkg/config/defaults/defaultconfig.go +++ b/services/ocs/pkg/config/defaults/defaultconfig.go @@ -31,7 +31,7 @@ func DefaultConfig() *config.Config { CORS: config.CORS{ AllowedOrigins: []string{"*"}, AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}, - AllowedHeaders: []string{"Authorization", "Origin", "Content-Type", "Accept", "X-Requested-With", "X-Request-Id"}, + AllowedHeaders: []string{"Authorization", "Origin", "Content-Type", "Accept", "X-Requested-With", "X-Request-Id", "Cache-Control"}, AllowCredentials: true, }, }, diff --git a/services/webdav/pkg/config/defaults/defaultconfig.go b/services/webdav/pkg/config/defaults/defaultconfig.go index efa0b4287b..29ffc1d791 100644 --- a/services/webdav/pkg/config/defaults/defaultconfig.go +++ b/services/webdav/pkg/config/defaults/defaultconfig.go @@ -32,7 +32,7 @@ func DefaultConfig() *config.Config { CORS: config.CORS{ AllowedOrigins: []string{"*"}, AllowedMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"}, - AllowedHeaders: []string{"Authorization", "Origin", "Content-Type", "Accept", "X-Requested-With", "X-Request-Id"}, + AllowedHeaders: []string{"Authorization", "Origin", "Content-Type", "Accept", "X-Requested-With", "X-Request-Id", "Cache-Control"}, AllowCredentials: true, }, },