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

appsec: get the original UA from headers (#2809)

Browse source
This commit is contained in:
blotus 2024-03-08 15:04:36 +01:00 committed by GitHub
parent a928b4d001
commit e8ff13bc17
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkg/appsec/request.go
View file

@ -17,11 +17,12 @@ import (
) )
const ( const (
URIHeaderName = "X-Crowdsec-Appsec-Uri" URIHeaderName = "X-Crowdsec-Appsec-Uri"
VerbHeaderName = "X-Crowdsec-Appsec-Verb" VerbHeaderName = "X-Crowdsec-Appsec-Verb"
HostHeaderName = "X-Crowdsec-Appsec-Host" HostHeaderName = "X-Crowdsec-Appsec-Host"
IPHeaderName = "X-Crowdsec-Appsec-Ip" IPHeaderName = "X-Crowdsec-Appsec-Ip"
APIKeyHeaderName = "X-Crowdsec-Appsec-Api-Key" APIKeyHeaderName = "X-Crowdsec-Appsec-Api-Key"
UserAgentHeaderName = "X-Crowdsec-Appsec-User-Agent"
) )
type ParsedRequest struct { type ParsedRequest struct {
@ -311,11 +312,14 @@ func NewParsedRequestFromRequest(r *http.Request, logger *logrus.Entry) (ParsedR
logger.Debugf("missing '%s' header", HostHeaderName) logger.Debugf("missing '%s' header", HostHeaderName)
} }
userAgent := r.Header.Get(UserAgentHeaderName) //This one is optional
// delete those headers before coraza process the request // delete those headers before coraza process the request
delete(r.Header, IPHeaderName) delete(r.Header, IPHeaderName)
delete(r.Header, HostHeaderName) delete(r.Header, HostHeaderName)
delete(r.Header, URIHeaderName) delete(r.Header, URIHeaderName)
delete(r.Header, VerbHeaderName) delete(r.Header, VerbHeaderName)
delete(r.Header, UserAgentHeaderName)
originalHTTPRequest := r.Clone(r.Context()) originalHTTPRequest := r.Clone(r.Context())
originalHTTPRequest.Body = io.NopCloser(bytes.NewBuffer(body)) originalHTTPRequest.Body = io.NopCloser(bytes.NewBuffer(body))
@ -323,6 +327,13 @@ func NewParsedRequestFromRequest(r *http.Request, logger *logrus.Entry) (ParsedR
originalHTTPRequest.RequestURI = clientURI originalHTTPRequest.RequestURI = clientURI
originalHTTPRequest.Method = clientMethod originalHTTPRequest.Method = clientMethod
originalHTTPRequest.Host = clientHost originalHTTPRequest.Host = clientHost
if userAgent != "" {
originalHTTPRequest.Header.Set("User-Agent", userAgent)
r.Header.Set("User-Agent", userAgent) //Override the UA in the original request, as this is what will be used by the waf engine
} else {
//If we don't have a forwarded UA, delete the one that was set by the bouncer
originalHTTPRequest.Header.Del("User-Agent")
}
parsedURL, err := url.Parse(clientURI) parsedURL, err := url.Parse(clientURI)
if err != nil { if err != nil {