Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[appsec] implement count transformation #2698

Merged
merged 5 commits into from Jan 12, 2024
Merged

[appsec] implement count transformation #2698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0cc3bb
implement count transfo
buixor Jan 5, 2024
4c353bb
clean
buixor Jan 5, 2024
a7d221c
Merge branch 'master' into appsec_count
buixor Jan 5, 2024
c4e9bde
Merge branch 'master' into appsec_count
buixor Jan 11, 2024
16de289
lint
buixor Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/appsec/appsec_rule/modsec_rule_test.go
View file
Open in desktop
Expand Up @@ -8,6 +8,16 @@ func TestVPatchRuleString(t *testing.T) {
rule CustomRule
expected string
}{
{
name: "Collection count",
rule: CustomRule{
Zones: []string{"ARGS"},
Variables: []string{"foo"},
Match: match{Type: "eq", Value: "1"},
Transform: []string{"count"},
},
expected: `SecRule &ARGS_GET:foo "@eq 1" "id:853070236,phase:2,deny,log,msg:'Collection count',tag:'crowdsec-Collection count'"`,
},
{
name: "Base Rule",
rule: CustomRule{
Expand Down
15 changes: 14 additions & 1 deletion pkg/appsec/appsec_rule/modsecurity.go
View file
Open in desktop
Expand Up @@ -122,6 +122,16 @@ func (m *ModsecurityRule) buildRules(rule *CustomRule, appsecRuleName string, an
return ret, nil
}

zone_prefix := ""
variable_prefix := ""
if rule.Transform != nil {
for tidx, transform := range rule.Transform {
if transform == "count" {
zone_prefix = "&"
rule.Transform[tidx] = ""
}
}
}
for idx, zone := range rule.Zones {
mappedZone, ok := zonesMap[zone]
if !ok {
Expand All @@ -134,7 +144,7 @@ func (m *ModsecurityRule) buildRules(rule *CustomRule, appsecRuleName string, an
if idx > 0 || j > 0 {
r.WriteByte('|')
}
r.WriteString(fmt.Sprintf("%s:%s", mappedZone, variable))
r.WriteString(fmt.Sprintf("%s%s:%s%s", zone_prefix, mappedZone, variable_prefix, variable))
}
}
}
Expand All @@ -157,6 +167,9 @@ func (m *ModsecurityRule) buildRules(rule *CustomRule, appsecRuleName string, an

if rule.Transform != nil {
for _, transform := range rule.Transform {
if transform == "" {
continue
}
r.WriteByte(',')
if mappedTransform, ok := transformMap[transform]; ok {
r.WriteString(mappedTransform)
Expand Down