diff --git a/README.md b/README.md index 7eecf4b..f199424 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,10 @@ make run - string - default: "redis:6379" - hostname and port for the Redis service +- RedisCachePassword + - string + - default: "" + - Password for the Redis service - UpdateIntervalSeconds - int64 - default: 60 @@ -183,6 +187,7 @@ http: forwardedHeadersCustomName: X-Custom-Header redisCacheEnabled: false redisCacheHost: "redis:6379" + redisCachePassword: password crowdsecLapiTLSCertificateAuthority: |- -----BEGIN CERTIFICATE----- MIIEBzCCAu+gAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwgZQxCzAJBgNVBAYTAlVT diff --git a/bouncer.go b/bouncer.go index 9353a63..88d67a1 100644 --- a/bouncer.go +++ b/bouncer.go @@ -141,7 +141,8 @@ func New(ctx context.Context, next http.Handler, config *configuration.Config, n }, cacheClient: &cache.Client{}, } - bouncer.cacheClient.New(config.RedisCacheEnabled, config.RedisCacheHost, config.RedisCachePass) + config.RedisCachePassword, _ = configuration.GetVariable(config, "RedisCachePassword") + bouncer.cacheClient.New(config.RedisCacheEnabled, config.RedisCacheHost, config.RedisCachePassword) //nolint:nestif if (config.CrowdsecMode == configuration.StreamMode || config.CrowdsecMode == configuration.AloneMode) && ticker == nil { diff --git a/pkg/configuration/configuration.go b/pkg/configuration/configuration.go index 8c62d1e..ed4c824 100644 --- a/pkg/configuration/configuration.go +++ b/pkg/configuration/configuration.go @@ -55,7 +55,8 @@ type Config struct { ClientTrustedIPs []string `json:"clientTrustedIps,omitempty"` RedisCacheEnabled bool `json:"redisCacheEnabled,omitempty"` RedisCacheHost string `json:"redisCacheHost,omitempty"` - RedisCachePass string `json:"redisCachePass,omitempty"` + RedisCachePassword string `json:"redisCachePassword,omitempty"` + RedisCachePasswordFile string `json:"redisCachePasswordFile,omitempty"` } func contains(source []string, target string) bool { @@ -84,7 +85,7 @@ func New() *Config { ClientTrustedIPs: []string{}, RedisCacheEnabled: false, RedisCacheHost: "redis:6379", - RedisCachePass: "", + RedisCachePassword: "", } } @@ -129,6 +130,10 @@ func ValidateParams(config *Config) error { if err := validateParamsIPs(config.ClientTrustedIPs, "ClientTrustedIPs"); err != nil { return err } + + if _, err := GetVariable(config, "RedisCachePassword"); err != nil { + return err + } if config.CrowdsecMode == AloneMode { if _, err := GetVariable(config, "CrowdsecCapiMachineID"); err != nil {