Skip to content

V3/issue 1960 #2031

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

Closed
wants to merge 3 commits into from
Closed

V3/issue 1960 #2031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2e9ae1
Fixed bug described in issue-1960
airween Feb 21, 2019
f03c8a7
Fixed general secruleengine test
airween Feb 22, 2019
b32fee0
Set default status of intervention object
airween Feb 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/transaction.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,12 @@ bool Transaction::intervention(ModSecurityIntervention *it) {
it->url = strdup(m_it.url);
}
it->disruptive = m_it.disruptive;
it->status = m_it.status;
if (getRuleEngineState() != RulesProperties::DetectionOnlyRuleEngine) {
it->status = m_it.status;
}
else {
it->status = 200;
}

if (m_it.log != NULL) {
std::string log("");
Expand Down
120 changes: 120 additions & 0 deletions test/test-cases/regression/issue-1960.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
[
{
"enabled":1,
"version_min":300000,
"title":"Testing setvar :: SecRuleEngine DetectionOnly test",
"client":{
"ip":"200.249.12.31",
"port":123
},
"server":{
"ip":"200.249.12.31",
"port":80
},
"request":{
"headers":{
"Host": "localhost"
},
"uri":"/?a=exec(/bin/bash);",
"method":"GET"
},
"response":{
"headers":{
"Date":"Mon, 13 Jul 2015 20:02:41 GMT",
"Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT",
"Content-Type":"text/html"
},
"body":[
"no need."
]
},
"expected":{
"http_code":200
},
"rules":[
"SecRuleEngine DetectionOnly",
"SecDefaultAction \"phase:1,log,auditlog,deny,status:403\"",
"SecDefaultAction \"phase:2,log,auditlog,deny,status:403\"",
"SecRule ARGS \"@rx exec(?:\\s|)\\(\" \"id:1,phase:1,log,t:none,t:lowercase,t:cmdLine,block,msg:'PHP exec function call'\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Testing setvar :: SecRuleEngine DetectionOnly against test",
"client":{
"ip":"200.249.12.31",
"port":123
},
"server":{
"ip":"200.249.12.31",
"port":80
},
"request":{
"headers":{
"Host": "localhost"
},
"uri":"/?a=exec(/bin/bash);",
"method":"GET"
},
"response":{
"headers":{
"Date":"Mon, 13 Jul 2015 20:02:41 GMT",
"Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT",
"Content-Type":"text/html"
},
"body":[
"no need."
]
},
"expected":{
"http_code":403
},
"rules":[
"SecRuleEngine on",
"SecDefaultAction \"phase:1,log,auditlog,deny,status:403\"",
"SecDefaultAction \"phase:2,log,auditlog,deny,status:403\"",
"SecRule ARGS \"@rx exec(?:\\s|)\\(\" \"id:1,phase:1,log,t:none,t:lowercase,t:cmdLine,block,msg:'PHP exec function call'\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Testing setvar :: SecRuleEngine off test",
"client":{
"ip":"200.249.12.31",
"port":123
},
"server":{
"ip":"200.249.12.31",
"port":80
},
"request":{
"headers":{
"Host": "localhost"
},
"uri":"/?a=exec(/bin/bash);",
"method":"GET"
},
"response":{
"headers":{
"Date":"Mon, 13 Jul 2015 20:02:41 GMT",
"Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT",
"Content-Type":"text/html"
},
"body":[
"no need."
]
},
"expected":{
"http_code":200
},
"rules":[
"SecRuleEngine off",
"SecDefaultAction \"phase:1,log,auditlog,deny,status:403\"",
"SecDefaultAction \"phase:2,log,auditlog,deny,status:403\"",
"SecRule ARGS \"@rx exec(?:\\s|)\\(\" \"id:1,phase:1,log,t:none,t:lowercase,t:cmdLine,block,msg:'PHP exec function call'\""
]
}
]

2 changes: 1 addition & 1 deletion test/test-cases/regression/secruleengine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"version_min":300000,
"title":"Testing Disruptive actions (3/n)",
"expected":{
"http_code":404
"http_code":200
},
"rules":[
"SecRuleEngine On",
Expand Down