beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix log level propagation + log requests to the appsec engine

Browse source
This commit is contained in:
Sebastien Blot 2023-12-05 17:22:51 +01:00
parent f7c5726a0a
commit 169e39a4a9
No known key found for this signature in database
GPG key ID: DFC2902F40449F6A
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/acquisition/modules/appsec/appsec.go
View file

@ -97,11 +97,6 @@ func (wc *AppsecSource) UnmarshalConfig(yamlConfig []byte) error {
return errors.Wrap(err, "Cannot parse appsec configuration")
}
if wc.config.LogLevel == nil {
level := new(log.Level)
*level = log.InfoLevel
wc.config.LogLevel = level
}
if wc.config.ListenAddr == "" {
wc.config.ListenAddr = "127.0.0.1:7422"
}
@ -152,7 +147,6 @@ func (w *AppsecSource) Configure(yamlConfig []byte, logger *log.Entry) error {
return errors.Wrap(err, "unable to parse appsec configuration")
}
w.logger = logger
w.logger.Logger.SetLevel(*w.config.LogLevel)
w.logger.Tracef("Appsec configuration: %+v", w.config)
@ -222,7 +216,6 @@ func (w *AppsecSource) Configure(yamlConfig []byte, logger *log.Entry) error {
//We don´t use the wrapper provided by coraza because we want to fully control what happens when a rule match to send the information in crowdsec
w.mux.HandleFunc(w.config.Path, w.appsecHandler)
return nil
}
@ -316,6 +309,9 @@ func (w *AppsecSource) IsAuth(apiKey string) bool {
// should this be in the runner ?
func (w *AppsecSource) appsecHandler(rw http.ResponseWriter, r *http.Request) {
w.logger.Debugf("Received request from '%s' on %s", r.RemoteAddr, r.URL.Path)
apiKey := r.Header.Get(appsec.APIKeyHeaderName)
clientIP := r.Header.Get(appsec.IPHeaderName)
remoteIP := r.RemoteAddr

4
pkg/appsec/appsec.go
View file

@ -157,10 +157,10 @@ func (wc *AppsecConfig) LoadByPath(file string) error {
return fmt.Errorf("name cannot be empty")
}
if wc.LogLevel == nil {
lvl := log.InfoLevel
lvl := wc.Logger.Logger.GetLevel()
wc.LogLevel = &lvl
}
wc.Logger = wc.Logger.WithField("name", wc.Name)
wc.Logger = wc.Logger.Dup().WithField("name", wc.Name)
wc.Logger.Logger.SetLevel(*wc.LogLevel)
if wc.DefaultRemediation == "" {
return fmt.Errorf("default_remediation cannot be empty")