From f9807f9f3a221dbb35ee5eca0620cd4680ce9045 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Tue, 18 Nov 2025 16:04:00 +0100 Subject: [PATCH] actually load overrideyaml Signed-off-by: Christian Richter --- services/proxy/pkg/middleware/security.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/services/proxy/pkg/middleware/security.go b/services/proxy/pkg/middleware/security.go index 35d12e1cc..c9d689648 100644 --- a/services/proxy/pkg/middleware/security.go +++ b/services/proxy/pkg/middleware/security.go @@ -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 }