Skip to content

Commit

Permalink
Merge pull request #3080 from airween/v3/testfixes
Browse files Browse the repository at this point in the history 
test: Logical, syntax and cosmetic fixes on test cases
  • Loading branch information
Marc Stern authored Feb 14, 2024
2 parents ca5f516 + 16c899f commit 4e4f329
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
10 changes: 5 additions & 5 deletions test/test-cases/regression/action-ctl_rule_remove_by_id.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Cookie": "PHPSESSID=rAAAAAAA2t5uvjq435r4q7ib3vtdjq120",
"Content-Type": "text/xml"
},
"uri":"/wp-login.php?whee&pwd=lhebs",
"uri":"/wp-login.php?whee=something&pwd=lhebs",
"method":"GET",
"body": [ ]
},
Expand All @@ -28,15 +28,15 @@
},
"rules":[
"SecRule REQUEST_FILENAME \"@endsWith /wp-login.php\" \"id:9002100,phase:2,t:none,nolog,pass,ctl:ruleRemoveById=1\"",
"SecRule ARGS \"@contais whe\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS'\""
"SecRule ARGS_NAMES \"@contains whee\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS'\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Testing CtlRuleRemoteById (2)",
"expected":{
"debug_log": "Target value: .*Variable: ARGS:pwd"
"debug_log": "Target value: .*Variable: ARGS_NAMES:whee"
},
"client":{
"ip":"200.249.12.31",
Expand All @@ -50,7 +50,7 @@
"Cookie": "PHPSESSID=rAAAAAAA2t5uvjq435r4q7ib3vtdjq120",
"Content-Type": "text/xml"
},
"uri":"/wp-login.php?whee&pwd=lhebs",
"uri":"/wp-login.php?whee=something&pwd=lhebs",
"method":"GET",
"body": [ ]
},
Expand All @@ -60,7 +60,7 @@
},
"rules":[
"SecRule REQUEST_FILENAME \"@endsWith /wp-login.php\" \"id:9002100,phase:2,t:none,nolog,pass,ctl:ruleRemoveById=123\"",
"SecRule ARGS \"@contais whe\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS2'\""
"SecRule ARGS_NAMES \"@contains whee\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS2'\""
]
}
]
2 changes: 1 addition & 1 deletion test/test-cases/regression/action-ctl_rule_remove_by_tag.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"debug_log":"Skipped rule id '2'. Skipped due to a ruleRemoveByTag action."
},
"rules":[
"SecRule ARGS:key \".\" \"id:4,ctl:ruleRemoveByTag=tag123",
"SecRule ARGS:key \".\" \"id:4,ctl:ruleRemoveByTag=tag123\"",
"SecRule ARGS \"@contains test1\" \"id:1,pass,t:trim\"",
"SecRule ARGS \"@contains test2\" \"id:2,pass,t:trim,tag:tag123\"",
"SecRule ARGS \"@contains test3\" \"id:3,pass,t:trim\""
Expand Down
8 changes: 4 additions & 4 deletions test/test-cases/regression/action-ctl_rule_remove_target_by_id.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"version_min":300000,
"title":"Testing CtlRuleRemoveTargetById (2)",
"expected":{
"debug_log": "Target value: .*Variable: ARGS:pwd"
"debug_log": "Target value: .*Variable: ARGS_NAMES:whee"
},
"client":{
"ip":"200.249.12.31",
Expand All @@ -51,7 +51,7 @@
"Cookie": "PHPSESSID=rAAAAAAA2t5uvjq435r4q7ib3vtdjq120",
"Content-Type": "text/xml"
},
"uri":"/wp-login.php?whee&pwd=lhebs",
"uri":"/wp-login.php?whee=something&pwd=lhebs",
"method":"GET",
"body": [ ]
},
Expand All @@ -61,7 +61,7 @@
},
"rules":[
"SecRule REQUEST_FILENAME \"@endsWith /wp-login.php\" \"id:9002100,phase:2,t:none,nolog,pass,ctl:ruleRemoveTargetById=123;ARGS:pwd\"",
"SecRule ARGS \"@contais whe\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS2'\""
"SecRule ARGS_NAMES \"@contains whee\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS2'\""
]
},
{
Expand All @@ -83,7 +83,7 @@
"Cookie": "PHPSESSID=rAAAAAAA2t5uvjq435r4q7ib3vtdjq120",
"Content-Type": "text/xml"
},
"uri":"/wp-login.php?whee&pwd=lhebs",
"uri":"/wp-login.php?whee=something&pwd=lhebs",
"method":"GET",
"body": [ ]
},
Expand Down
10 changes: 5 additions & 5 deletions test/test-cases/regression/action-ctl_rule_remove_target_by_tag.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"version_min":300000,
"title":"Testing CtlRuleRemoteTargetByTag (2)",
"expected":{
"debug_log": "Target value: .*Variable: ARGS:pwd"
"debug_log": "Target value: .*Variable: ARGS_NAMES:pwd"
},
"client":{
"ip":"200.249.12.31",
Expand All @@ -61,15 +61,15 @@
},
"rules":[
"SecRule REQUEST_FILENAME \"@endsWith /wp-login.php\" \"id:9002100,phase:2,t:none,nolog,pass,ctl:ruleRemoveTargetByTag=CRS;ARGS:pwd\"",
"SecRule ARGS \"@contais whe\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS2'\""
"SecRule ARGS_NAMES \"@contains pwd\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS2'\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Testing CtlRuleRemoteTargetByTag (3)",
"expected":{
"debug_log": "Target value: .*Variable: ARGS:pwd"
"debug_log": "Target value: .*Variable: ARGS_NAMES:whee"
},
"client":{
"ip":"200.249.12.31",
Expand All @@ -83,7 +83,7 @@
"Cookie": "PHPSESSID=rAAAAAAA2t5uvjq435r4q7ib3vtdjq120",
"Content-Type": "text/xml"
},
"uri":"/wp-login.php?whee&pwd=lhebs",
"uri":"/wp-login.php?whee=something&pwd=lhebs",
"method":"GET",
"body": [ ]
},
Expand All @@ -93,7 +93,7 @@
},
"rules":[
"SecRule REQUEST_FILENAME \"@endsWith /wp-login.php\" \"id:9002100,phase:2,t:none,nolog,pass,ctl:ruleRemoveTargetByTag=CRS;ARGS\"",
"SecRule ARGS \"@contais whe\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS2'\""
"SecRule ARGS_NAMES \"@contains whee\" \"id:1,phase:3,t:none,nolog,pass,tag:'CRS2'\""
]
}
]
2 changes: 1 addition & 1 deletion test/test-cases/regression/issue-1850.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"rules": [
"SecRuleEngine On",
"SecDefaultAction \"phase:1,status:404,deny\"",
"SecRule REQUEST_URI \"@contains /\" \"id:2000001,phase:1,log,redirect:'http://1.1.1.1/failed.html',t:none,msg:\"Unauthorized administrator request'\""
"SecRule REQUEST_URI \"@contains /\" \"id:2000001,phase:1,log,redirect:'http://1.1.1.1/failed.html',t:none,msg:'Unauthorized administrator request'\""
]
}
]
2 changes: 1 addition & 1 deletion test/test-cases/regression/misc-variable-under-quotes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"debug_log":"t:lowercase:"
},
"rules":[
"SecRule \"REQUEST_LINE\" \"@contains index.php/admin/cms/wysiwyg/directive/\" \"id:1,t:lowercase,ctl:auditLogParts=+E\""
"SecRule \"REQUEST_LINE\" \"@contains index.php/admin/cms/wysiwyg/directive/\" \"id:1,phase:1,t:lowercase,ctl:auditLogParts=+E\""
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion test/test-cases/regression/rule-920200.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Accept-Language":"en-us,en;q=0.5",
"Accept":"*/*",
"Keep-Alive":"300",
"Range": "bytes=1-10,11-20,21-30,31-40,41-50,51-60"
"Range": "bytes=1-10,11-20,21-30,31-40,41-50,51-60"
},
"uri":"/",
"method":"GET"
Expand Down

0 comments on commit 4e4f329

Please sign in to comment.