pretecno/crowdsec-bouncer-traefik-plugin
3
0
Fork 0
mirror of https://github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin.git synced 2025-11-08 15:15:05 +01:00
Code Issues Packages Releases Activity

🍱 fix lint

Browse Source
This commit is contained in:
Max Lerebourg
2025-08-06 08:46:45 +02:00
parent 854dbc831b
commit 16a5ea05be
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bouncer.go
View File

@@ -232,16 +232,14 @@ func New(_ context.Context, next http.Handler, config *configuration.Config, nam
)
config.CaptchaSiteKey, _ = configuration.GetVariable(config, "CaptchaSiteKey")
config.CaptchaSecretKey, _ = configuration.GetVariable(config, "CaptchaSecretKey")
tlsConfig2 := new(tls.Config)
tlsConfig2.InsecureSkipVerify = true
var infoProvider *captcha.InfoProvider
if config.CaptchaProvider == configuration.CustomProvider {
infoProvider = &captcha.InfoProvider{
js: config.CaptchaCustomJsURL,
validate: config.CaptchaCustomValidateURL,
key: config.CaptchaCustomKey,
js: config.CaptchaCustomJsURL,
key: config.CaptchaCustomKey,
response: config.CaptchaCustomResponse,
validate: config.CaptchaCustomValidateURL,
}
}
@@ -249,11 +247,7 @@ func New(_ context.Context, next http.Handler, config *configuration.Config, nam
log,
bouncer.cacheClient,
&http.Client{
Transport: &http.Transport{
MaxIdleConns: 10,
IdleConnTimeout: 30 * time.Second,
TLSClientConfig: tlsConfig2,
},
Transport: &http.Transport{MaxIdleConns: 10, IdleConnTimeout: 30 * time.Second},
Timeout: time.Duration(config.HTTPTimeoutSeconds) * time.Second,
},
infoProvider,

12
pkg/configuration/configuration.go
View File

@@ -85,7 +85,7 @@ type Config struct {
BanHTMLFilePath string `json:"banHtmlFilePath,omitempty"`
CaptchaHTMLFilePath string `json:"captchaHtmlFilePath,omitempty"`
CaptchaProvider string `json:"captchaProvider,omitempty"`
CaptchaCustomJsURL string `json:"captchaCustomJsUrl,omitempty"`
CaptchaCustomJsURL string `json:"captchaCustomJsUrl,omitempty"`
CaptchaCustomValidateURL string `json:"captchaCustomValidateURL,omitempty"`
CaptchaCustomKey string `json:"captchaCustomKey,omitempty"`
CaptchaCustomResponse string `json:"captchaCustomResponse,omitempty"`
@@ -130,7 +130,7 @@ func New() *Config {
RemediationStatusCode: http.StatusForbidden,
HTTPTimeoutSeconds: 10,
CaptchaProvider: "",
CaptchaCustomJsURL: "",
CaptchaCustomJsURL: "",
CaptchaCustomValidateURL: "",
CaptchaCustomKey: "",
CaptchaCustomResponse: "",
@@ -204,7 +204,7 @@ func ValidateParams(config *Config) error {
if err := validateParamsRequired(config); err != nil {
return err
}
if err := validateCaptcha(config); err != nil {
return err
}
@@ -352,7 +352,7 @@ func validateCaptcha(config *Config) error {
if config.CaptchaCustomKey == "" || config.CaptchaCustomResponse == "" || config.CaptchaCustomValidateURL == "" || config.CaptchaCustomJsURL == "" {
return fmt.Errorf(
"CaptchaProvider: provider is custom, captchaCustom variables must be filled: CaptchaCustomKey:%s, CaptchaCustomResponse:%s, CaptchaCustomValidateURL:%s, CaptchaCustomJsURL:%s",
config.CaptchaCustomKey ,
config.CaptchaCustomKey,
config.CaptchaCustomResponse,
config.CaptchaCustomValidateURL,
config.CaptchaCustomJsURL,
@@ -378,7 +378,7 @@ func validateParamsRequired(config *Config) error {
}
for key, val := range requiredInt0 {
if val < 0 {
return errors.New(key + ": cannot be less than 0", )
return errors.New(key + ": cannot be less than 0")
}
}
requiredInt1 := map[string]int64{
@@ -389,7 +389,7 @@ func validateParamsRequired(config *Config) error {
}
for key, val := range requiredInt1 {
if val < 1 {
return errors.New(key + ": cannot be less than 1", )
return errors.New(key + ": cannot be less than 1")
}
}
if config.UpdateMaxFailure < -1 {