Skip to content

Commit

Permalink
enhancement: Load CSP configuration file if it exists
Browse files Browse the repository at this point in the history
  • Loading branch information
fschade committed Sep 23, 2024
1 parent b3e5d80 commit 349a251
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
8 changes: 8 additions & 0 deletions changelog/unreleased/enhancement-load-csp-if-exists.md
Original file line number Diff line number Diff line change
@@ -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 changes: 10 additions & 0 deletions services/proxy/pkg/config/defaults/defaultconfig.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package defaults

import (
"os"
"path"
"path/filepath"
"strings"
"time"

Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 349a251

Please sign in to comment.