-
-
Notifications
You must be signed in to change notification settings - Fork 230
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add support for case sensitive args (#1059)
* feat: add support for case sensitive args Signed-off-by: Felipe Zipitria <[email protected]> * Change args names to be case sensitive tag (#1065) * feat: adds build tag for case sensitive args keys. * chore: updates license year. * Update README with new build tag --------- Signed-off-by: Felipe Zipitria <[email protected]> Co-authored-by: José Carlos Chávez <[email protected]> Co-authored-by: Matteo Pace <[email protected]>
- Loading branch information
3 people
authored
May 28, 2024
1 parent
bef0335
commit 711e4a4
Showing
11 changed files
with
256 additions
and
201 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| // Copyright 2024 Juan Pablo Tosso and the OWASP Coraza contributors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| //go:build coraza.rule.case_sensitive_args_keys | ||
|
|
||
| package corazawaf | ||
|
|
||
| var shouldUseCaseSensitiveNamedCollection = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| // Copyright 2024 Juan Pablo Tosso and the OWASP Coraza contributors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| //go:build !coraza.rule.case_sensitive_args_keys | ||
|
|
||
| package corazawaf | ||
|
|
||
| var shouldUseCaseSensitiveNamedCollection = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // Copyright 2024 Juan Pablo Tosso and the OWASP Coraza contributors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| //go:build coraza.rule.case_sensitive_args_keys | ||
|
|
||
| package corazawaf | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/corazawaf/coraza/v3/types/variables" | ||
| ) | ||
|
|
||
| func TestCaseSensitiveArgsVariableKeys(t *testing.T) { | ||
| rule := NewRule() | ||
| if err := rule.AddVariable(variables.ArgsGet, "Som3ThinG", false); err != nil { | ||
| t.Error(err) | ||
| } | ||
| if rule.variables[0].KeyStr != "Som3ThinG" { | ||
| t.Error("variable key is not case insensitive") | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| // Copyright 2024 Juan Pablo Tosso and the OWASP Coraza contributors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| //go:build coraza.rule.case_sensitive_args_keys | ||
|
|
||
| package seclang | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/corazawaf/coraza/v3/internal/corazawaf" | ||
| ) | ||
|
|
||
| func TestCaseSensitiveRuleMatchRegex(t *testing.T) { | ||
| waf := corazawaf.NewWAF() | ||
| parser := NewParser(waf) | ||
| err := parser.FromString(` | ||
| SecRuleEngine On | ||
| SecRule ARGS:/^Key/ "@streq my-value" "id:1028,phase:1,deny,status:403,msg:'ARGS:key matched.'" | ||
| `) | ||
| if err != nil { | ||
| t.Error(err.Error()) | ||
| } | ||
| tx := waf.NewTransaction() | ||
| tx.ProcessURI("https://asdf.com/index.php?t1=aaa&T1=zzz&t2=bbb&t3=ccc&Keyless=my-value&a=test&jsessionid=74B0CB414BD77D17B5680A6386EF1666", "GET", "HTTP/1.1") | ||
| tx.ProcessConnection("127.0.0.1", 0, "", 0) | ||
| tx.ProcessRequestHeaders() | ||
| if len(tx.MatchedRules()) != 1 { | ||
| t.Errorf("failed to match rules with %d", len(tx.MatchedRules())) | ||
| } | ||
| if tx.Interruption() == nil { | ||
| t.Fatal("failed to interrupt transaction") | ||
| } | ||
| } | ||
|
|
||
| func TestCaseSensitiveArguments(t *testing.T) { | ||
| waf := corazawaf.NewWAF() | ||
| rules := `SecRule ARGS:Test1 "Xyz" "id:3, phase:2, log, deny"` | ||
| parser := NewParser(waf) | ||
|
|
||
| err := parser.FromString(rules) | ||
| if err != nil { | ||
| t.Error() | ||
| return | ||
| } | ||
|
|
||
| tx := waf.NewTransaction() | ||
| tx.ProcessRequestHeaders() | ||
| tx.AddPostRequestArgument("Test1", "Xyz") | ||
| it, err := tx.ProcessRequestBody() | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
| if it == nil { | ||
| t.Errorf("failed to test arguments value match: Same case argument name, %+v\n", tx.MatchedRules()) | ||
| } | ||
|
|
||
| tx = waf.NewTransaction() | ||
| tx.ProcessRequestHeaders() | ||
| tx.AddPostRequestArgument("TEST1", "Xyz") | ||
| it, err = tx.ProcessRequestBody() | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
| if it != nil { | ||
| t.Errorf("failed to test arguments value match: argument is matching a different case, %+v\n", tx.MatchedRules()) | ||
| } | ||
|
|
||
| tx = waf.NewTransaction() | ||
| tx.ProcessRequestHeaders() | ||
| tx.AddPostRequestArgument("Test1", "XYZ") | ||
| it, err = tx.ProcessRequestBody() | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
| if it != nil { | ||
| t.Errorf("failed to test arguments value match: argument is matching a different case, %+v\n", tx.MatchedRules()) | ||
| } | ||
| } | ||
|
|
||
| func TestCaseSensitiveURIQueryParam(t *testing.T) { | ||
| waf := corazawaf.NewWAF() | ||
| rules := `SecRule ARGS:Test1 "@contains SQLI" "id:3, phase:2, log, pass"` | ||
| parser := NewParser(waf) | ||
|
|
||
| err := parser.FromString(rules) | ||
| if err != nil { | ||
| t.Error() | ||
| return | ||
| } | ||
|
|
||
| tx := waf.NewTransaction() | ||
| tx.ProcessURI("/url?Test1='SQLI", "POST", "HTTP/1.1") | ||
| tx.ProcessRequestHeaders() | ||
| _, err = tx.ProcessRequestBody() | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
|
|
||
| if len(tx.MatchedRules()) == 1 { | ||
| if len(tx.MatchedRules()[0].MatchedDatas()) != 1 { | ||
| t.Errorf("failed to test uri query param. Found matches: %d, %+v\n", | ||
| len(tx.MatchedRules()[0].MatchedDatas()), tx.MatchedRules()) | ||
| } | ||
| if !isMatchData(tx.MatchedRules()[0].MatchedDatas(), "Test1") { | ||
| t.Error("Key did not match: Test1 !=", tx.MatchedRules()[0]) | ||
| } | ||
| } else { | ||
| t.Errorf("failed to test uri query param: Same case arg name: %d, %+v\n", | ||
| len(tx.MatchedRules()), tx.MatchedRules()) | ||
| } | ||
|
|
||
| tx = waf.NewTransaction() | ||
| tx.ProcessURI("/test?test1='SQLI&Test1='SQLI&TEST1='SQLI", "POST", "HTTP/1.1") | ||
| tx.ProcessRequestHeaders() | ||
| _, err = tx.ProcessRequestBody() | ||
| if err != nil { | ||
| t.Error(err) | ||
| } | ||
|
|
||
| if len(tx.MatchedRules()) == 1 { | ||
| if len(tx.MatchedRules()[0].MatchedDatas()) != 1 { | ||
| t.Errorf("failed to test uri query param. Found matches: %d, %+v\n", | ||
| len(tx.MatchedRules()[0].MatchedDatas()), tx.MatchedRules()) | ||
| } | ||
| if !isMatchData(tx.MatchedRules()[0].MatchedDatas(), "Test1") { | ||
| t.Error("Key did not match: Test1 !=", tx.MatchedRules()[0]) | ||
| } | ||
| } else { | ||
| t.Errorf("failed to test qparam pollution: Multiple arg different case: %d, %+v\n", | ||
| len(tx.MatchedRules()), tx.MatchedRules()) | ||
| } | ||
| } |
Oops, something went wrong.