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

fix Remove{in,out}bandRuleBy{name,tag} for pre_eval

Browse source
This commit is contained in:
Sebastien Blot 2023-12-04 15:13:11 +01:00
parent cb030beaca
commit b01901b04e
No known key found for this signature in database
GPG key ID: DFC2902F40449F6A
3 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/waf/tx.go
View file

@ -27,6 +27,11 @@ func (t *ExtendedTransaction) RemoveRuleByIDWithError(id int) error {
return nil
}
func (t *ExtendedTransaction) RemoveRuleByTagWithError(tag string) error {
t.Tx.RemoveRuleByTag(tag)
return nil
}
func (t *ExtendedTransaction) IsRuleEngineOff() bool {
return t.Tx.IsRuleEngineOff()
}

32
pkg/waf/waap.go
View file

@ -425,6 +425,38 @@ func (w *WaapRuntimeConfig) RemoveOutbandRuleByID(params ...any) (any, error) {
return nil, nil
}
// func (w *WaapRuntimeConfig) RemoveInbandRuleByTag(tag string) error {
func (w *WaapRuntimeConfig) RemoveInbandRuleByTag(params ...any) (any, error) {
tag := params[0].(string)
w.Logger.Debugf("removing inband rule with tag %s", tag)
_ = w.InBandTx.RemoveRuleByTagWithError(tag)
return nil, nil
}
// func (w *WaapRuntimeConfig) RemoveOutbandRuleByTag(tag string) error {
func (w *WaapRuntimeConfig) RemoveOutbandRuleByTag(params ...any) (any, error) {
tag := params[0].(string)
w.Logger.Debugf("removing outband rule with tag %s", tag)
_ = w.OutOfBandTx.RemoveRuleByTagWithError(tag)
return nil, nil
}
// func (w *WaapRuntimeConfig) RemoveInbandRuleByName(name string) error {
func (w *WaapRuntimeConfig) RemoveInbandRuleByName(params ...any) (any, error) {
tag := fmt.Sprintf("crowdsec-%s", params[0].(string))
w.Logger.Debugf("removing inband rule %s", tag)
_ = w.InBandTx.RemoveRuleByTagWithError(tag)
return nil, nil
}
// func (w *WaapRuntimeConfig) RemoveOutbandRuleByName(name string) error {
func (w *WaapRuntimeConfig) RemoveOutbandRuleByName(params ...any) (any, error) {
tag := fmt.Sprintf("crowdsec-%s", params[0].(string))
w.Logger.Debugf("removing outband rule %s", tag)
_ = w.OutOfBandTx.RemoveRuleByTagWithError(tag)
return nil, nil
}
func (w *WaapRuntimeConfig) CancelEvent(params ...any) (any, error) {
w.Logger.Debugf("canceling event")
w.Response.SendEvent = false

22
pkg/waf/waf_helpers.go
View file

@ -23,9 +23,9 @@ func GetOnLoadEnv(w *WaapRuntimeConfig) map[string]interface{} {
//FIXME: use expr.Function instead of this
return map[string]interface{}{
"RemoveInBandRuleByID": w.DisableInBandRuleByID,
"RemoveOutBandRuleByID": w.DisableOutBandRuleByID,
"RemoveInBandRuleByName": w.DisableInBandRuleByName,
"RemoveInBandRuleByTag": w.DisableInBandRuleByTag,
"RemoveInBandRuleByName": w.DisableInBandRuleByName,
"RemoveOutBandRuleByID": w.DisableOutBandRuleByID,
"RemoveOutBandRuleByTag": w.DisableOutBandRuleByTag,
"RemoveOutBandRuleByName": w.DisableOutBandRuleByName,
"SetRemediationByTag": w.SetActionByTag,
@ -37,13 +37,17 @@ func GetOnLoadEnv(w *WaapRuntimeConfig) map[string]interface{} {
func GetPreEvalEnv(w *WaapRuntimeConfig, request *ParsedRequest) map[string]interface{} {
//FIXME: use expr.Function instead of this
return map[string]interface{}{
"IsInBand": request.IsInBand,
"IsOutBand": request.IsOutBand,
"RemoveInBandRuleByID": w.RemoveInbandRuleByID,
"RemoveOutBandRuleByID": w.RemoveOutbandRuleByID,
"SetRemediationByTag": w.SetActionByTag,
"SetRemediationByID": w.SetActionByID,
"SetRemediationByName": w.SetActionByName,
"IsInBand": request.IsInBand,
"IsOutBand": request.IsOutBand,
"RemoveInBandRuleByID": w.RemoveInbandRuleByID,
"RemoveInBandRuleByName": w.RemoveInbandRuleByName,
"RemoveInBandRuleByTag": w.RemoveInbandRuleByTag,
"RemoveOutBandRuleByID": w.RemoveOutbandRuleByID,
"RemoveOutBandRuleByTag": w.RemoveOutbandRuleByTag,
"RemoveOutBandRuleByName": w.RemoveOutbandRuleByName,
"SetRemediationByTag": w.SetActionByTag,
"SetRemediationByID": w.SetActionByID,
"SetRemediationByName": w.SetActionByName,
}
}