Skip to content

fix using relevant statuses + noauditlog #2643

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 1 commit into from
Closed

fix using relevant statuses + noauditlog #2643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ TESTS+=test/test-cases/regression/variable-variation-count.json
TESTS+=test/test-cases/regression/variable-variation-exclusion.json
TESTS+=test/test-cases/regression/variable-WEBAPPID.json
TESTS+=test/test-cases/regression/variable-WEBSERVER_ERROR_LOG.json
TESTS+=test/test-cases/regression/noauditlog-relevant.json
TESTS+=test/test-cases/secrules-language-tests/operators/beginsWith.json
TESTS+=test/test-cases/secrules-language-tests/operators/contains.json
TESTS+=test/test-cases/secrules-language-tests/operators/containsWord.json
Expand Down
4 changes: 2 additions & 2 deletions src/audit_log/audit_log.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,11 @@ bool AuditLog::saveIfRelevant(Transaction *transaction, int parts) {

if ((m_status == RelevantOnlyAuditLogStatus
&& this->isRelevant(transaction->m_httpCodeReturned) == false)
&& saveAnyway == false) {
|| saveAnyway == false) {
ms_dbg_a(transaction, 9, "Return code `" +
std::to_string(transaction->m_httpCodeReturned) + "'" \
" is not interesting to audit logs, relevant code(s): `" +
m_relevant + "'.");
m_relevant + "', saveAnyway: `" + std::to_string(saveAnyway) + "'.");

return false;
}
Expand Down
164 changes: 164 additions & 0 deletions test/test-cases/regression/noauditlog-relevant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
[
{
"enabled":1,
"version_min":300000,
"title":"Case 1. Rule matches the request but the return status code '403' is not relevant. The 'noauditlog' action is not specified.",
"client":{
"ip":"127.0.0.1",
"port":1234
},
"server":{
"ip":"127.0.0.1",
"port":80
},
"request":{
"headers":{
"Host":"localhost",
"User-Agent":"curl/7.38.0",
"Accept":"*/*"
},
"uri":"index.php?foo=bar",
"method":"GET",
"body": ""
},
"expected": {
"http_code": 403,
"error_log": "Access denied with code 403",
"audit_log": "^$",
"debug_log": "Return code `403' is not interesting to audit logs"
},
"rules":[
"SecRuleEngine On",
"SecAuditEngine RelevantOnly",
"SecAuditLogParts ABIJDEFHZ",
"SecAuditLog /tmp/test/modsec_audit.log",
"SecAuditLogDirMode 0766",
"SecAuditLogFileMode 0666",
"SecAuditLogType Serial",
"SecAuditLogRelevantStatus \"^500\"",
"SecRule ARGS:foo \"@rx ^bar$\" \"id:1234,phase:request,deny,status:403\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Case 2. Rule matches the request but the return status code '403' is not relevant. The 'noauditlog' action is specified.",
"client":{
"ip":"127.0.0.1",
"port":1234
},
"server":{
"ip":"127.0.0.1",
"port":80
},
"request":{
"headers":{
"Host":"localhost",
"User-Agent":"curl/7.38.0",
"Accept":"*/*"
},
"uri":"index.php?foo=bar",
"method":"GET",
"body": ""
},
"expected": {
"http_code": 403,
"error_log": "Access denied with code 403",
"audit_log": "^$",
"debug_log": "Return code `403' is not interesting to audit logs"
},
"rules":[
"SecRuleEngine On",
"SecAuditEngine RelevantOnly",
"SecAuditLogParts ABIJDEFHZ",
"SecAuditLog /tmp/test/modsec_audit.log",
"SecAuditLogDirMode 0766",
"SecAuditLogFileMode 0666",
"SecAuditLogType Serial",
"SecAuditLogRelevantStatus \"^500\"",
"SecRule ARGS:foo \"@rx ^bar$\" \"id:1234,phase:request,noauditlog,deny,status:403\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Case 3. Rule matches the request and the return status code '403' is relevant. The 'noauditlog' action is not specified.",
"client":{
"ip":"127.0.0.1",
"port":1234
},
"server":{
"ip":"127.0.0.1",
"port":80
},
"request":{
"headers":{
"Host":"localhost",
"User-Agent":"curl/7.38.0",
"Accept":"*/*"
},
"uri":"index.php?foo=bar",
"method":"GET",
"body": ""
},
"expected": {
"http_code": 403,
"error_log": "Access denied with code 403",
"audit_log": "Access denied with code 403",
"debug_log": "Request was relevant to be saved"
},
"rules":[
"SecRuleEngine On",
"SecAuditEngine RelevantOnly",
"SecAuditLogParts ABIJDEFHZ",
"SecAuditLog /tmp/test/modsec_audit.log",
"SecAuditLogDirMode 0766",
"SecAuditLogFileMode 0666",
"SecAuditLogType Serial",
"SecAuditLogRelevantStatus \"^403\"",
"SecRule ARGS:foo \"@rx ^bar$\" \"id:1234,phase:request,deny,status:403\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Case 4. Rule matches the request and the return status code '403' is relevant. The 'noauditlog' action is specified.",
"client":{
"ip":"127.0.0.1",
"port":1234
},
"server":{
"ip":"127.0.0.1",
"port":80
},
"request":{
"headers":{
"Host":"localhost",
"User-Agent":"curl/7.38.0",
"Accept":"*/*"
},
"uri":"index.php?foo=bar",
"method":"GET",
"body": ""
},
"expected": {
"http_code": 403,
"error_log": "Access denied with code 403",
"audit_log": "^$",
"debug_log": "Return code `403' is not interesting to audit logs"
},
"rules":[
"SecRuleEngine On",
"SecAuditEngine RelevantOnly",
"SecAuditLogParts ABIJDEFHZ",
"SecAuditLog /tmp/test/modsec_audit.log",
"SecAuditLogDirMode 0766",
"SecAuditLogFileMode 0666",
"SecAuditLogType Serial",
"SecAuditLogRelevantStatus \"^403\"",
"SecRule ARGS:foo \"@rx ^bar$\" \"id:1234,phase:request,noauditlog,deny,status:403\""
]
}

]