mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2025-12-23 22:29:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

actually load overrideyaml

Browse Source 
Signed-off-by: Christian Richter <c.richter@opencloud.eu>
This commit is contained in:
Christian Richter
2025-11-18 16:04:00 +01:00
parent 8007e8a269
commit f9807f9f3a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/proxy/pkg/middleware/security.go
View File

@@ -15,14 +15,14 @@ import (
// LoadCSPConfig loads CSP header configuration from a yaml file.
func LoadCSPConfig(proxyCfg *config.Config) (*config.CSP, error) {
presetYamlContent, customYamlContent, err := loadCSPYaml(proxyCfg)
yamlContent, customYamlContent, err := loadCSPYaml(proxyCfg)
if err != nil {
return nil, err
}
if proxyCfg.CSPConfigFileOverrideLocation == "" {
return loadCSPConfig(presetYamlContent, customYamlContent)
return loadCSPConfig(yamlContent, customYamlContent)
} else {
return loadCSPConfig(presetYamlContent, []byte{})
return loadCSPConfig(yamlContent, []byte{})
}
}
@@ -126,6 +126,10 @@ func sliceContains(slice []interface{}, val interface{}) bool {
}
func loadCSPYaml(proxyCfg *config.Config) ([]byte, []byte, error) {
if proxyCfg.CSPConfigFileOverrideLocation != "" {
overrideCSPYaml, err := os.ReadFile(proxyCfg.CSPConfigFileOverrideLocation)
return overrideCSPYaml, []byte{}, err
}
if proxyCfg.CSPConfigFileLocation == "" {
return []byte(config.DefaultCSPConfig), nil, nil
}