mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-11 19:08:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

enhancement: Load CSP configuration file if it exists

Browse Source
This commit is contained in:
Florian Schade
2024-09-23 16:12:48 +02:00
parent b3e5d80306
commit 349a25169b
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
changelog/unreleased/enhancement-load-csp-if-exists.md Normal file
View File

@@ -0,0 +1,8 @@
Enhancement: Load CSP configuration file if it exists
The Content Security Policy (CSP) configuration file is now loaded by default if it exists.
The configuration file looked for should be located at `$OCIS_BASE_DATA_PATH/proxy/csp.yaml`.
If the file does not exist, the default CSP configuration is used.
https://github.com/owncloud/ocis/pull/10139
https://github.com/owncloud/ocis/issues/10021

10
services/proxy/pkg/config/defaults/defaultconfig.go
View File

@@ -1,7 +1,9 @@
package defaults
import (
"os"
"path"
"path/filepath"
"strings"
"time"
@@ -332,6 +334,14 @@ func Sanitize(cfg *config.Config) {
if cfg.HTTP.Root != "/" {
cfg.HTTP.Root = strings.TrimSuffix(cfg.HTTP.Root, "/")
}
// if the CSP config file path is not set, we check if the default file exists and set it if it does
if cfg.CSPConfigFileLocation == "" {
defaultCSPConfigFilePath := filepath.Join(defaults.BaseDataPath(), "proxy", "csp.yaml")
if _, err := os.Stat(defaultCSPConfigFilePath); err == nil {
cfg.CSPConfigFileLocation = defaultCSPConfigFilePath
}
}
}
func mergePolicies(policies []config.Policy, additionalPolicies []config.Policy) []config.Policy {