From 1218d8c845cc36787b1bed90150f99045a71cd09 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Thu, 15 Dec 2016 14:39:24 -0300 Subject: [PATCH] Fix the audit log engine status selection SecAuditEngine was not being respected by the auditlog generation --- src/audit_log/audit_log.cc | 7 +++++++ test/test-cases/regression/config-secdefaultaction.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/audit_log/audit_log.cc b/src/audit_log/audit_log.cc index c26f7280..258497af 100644 --- a/src/audit_log/audit_log.cc +++ b/src/audit_log/audit_log.cc @@ -216,6 +216,9 @@ bool AuditLog::init(std::string *error) { m_writer = new audit_log::writer::Parallel(this); } + if (m_status == OffAuditLogStatus || m_status == NotSetLogStatus) { + return true; + } if (m_writer == NULL || m_writer->init(error) == false) { return false; @@ -256,6 +259,10 @@ bool AuditLog::saveIfRelevant(Transaction *transaction) { bool AuditLog::saveIfRelevant(Transaction *transaction, int parts) { + if (m_status == OffAuditLogStatus || m_status == NotSetLogStatus) { + return true; + } + if (this->isRelevant(transaction->m_httpCodeReturned) == false && transaction->m_toBeSavedInAuditlogs == false) { transaction->debug(5, "Return code `" + diff --git a/test/test-cases/regression/config-secdefaultaction.json b/test/test-cases/regression/config-secdefaultaction.json index 45bbdec6..fa11c456 100644 --- a/test/test-cases/regression/config-secdefaultaction.json +++ b/test/test-cases/regression/config-secdefaultaction.json @@ -272,7 +272,7 @@ }, "expected":{ "audit_log":"", - "debug_log":"Saving this request as part of the audit log.", + "debug_log":"Request was relevant to be saved.", "http_code": 302 }, "rules":[