Added audit log header

Author: szedenik-adam

headers/modsecurity/audit_log.h

@@ -157,6 +157,7 @@ class AuditLog {
     bool setFilePath1(const std::basic_string<char>& path);
     bool setFilePath2(const std::basic_string<char>& path);
     bool setStorageDir(const std::basic_string<char>& path);
+    bool setHeader(const std::basic_string<char>& header);
     bool setFormat(AuditLogFormat fmt);
 
     int getDirectoryPermission() const;
@@ -185,6 +186,7 @@ class AuditLog {
     std::string m_path1;
     std::string m_path2;
     std::string m_storage_dir;
+    std::string m_header;
 
     AuditLogFormat m_format;
 

headers/modsecurity/transaction.h

@@ -411,7 +411,7 @@ class Transaction : public TransactionAnchoredVariables, public TransactionSecMa
     int getRuleEngineState() const;
 
     std::string toJSON(int parts);
-    std::string toOldAuditLogFormat(int parts, const std::string &trailer);
+    std::string toOldAuditLogFormat(int parts, const std::string &trailer, const std::string &header);
     std::string toOldAuditLogFormatIndex(const std::string &filename,
         double size, const std::string &md5);
 

src/audit_log/audit_log.cc

@@ -55,6 +55,7 @@ AuditLog::AuditLog()
     : m_path1(""),
     m_path2(""),
     m_storage_dir(""),
+    m_header(""),
     m_format(NotSetAuditLogFormat),
     m_parts(-1),
     m_filePermission(-1),
@@ -131,6 +132,13 @@ bool AuditLog::setFilePath2(const std::basic_string<char>& path) {
     return true;
 }
 
+
+bool AuditLog::setHeader(const std::basic_string<char>& header) {
+    this->m_header = header;
+    return true;
+}
+
+
 bool AuditLog::setFormat(AuditLogFormat fmt) {
     this->m_format = fmt;
     return true;
@@ -208,7 +216,6 @@ bool AuditLog::setType(AuditLogType audit_type) {
 }
 
 
-
 bool AuditLog::init(std::string *error) {
     audit_log::writer::Writer *tmp_writer;
 
@@ -337,6 +344,7 @@ bool AuditLog::merge(AuditLog *from, std::string *error) {
     AL_MERGE_STRING_CONF(from->m_path2, m_path2);
     AL_MERGE_STRING_CONF(from->m_storage_dir, m_storage_dir);
     AL_MERGE_STRING_CONF(from->m_relevant, m_relevant);
+    AL_MERGE_STRING_CONF(from->m_header, m_header);
 
     if (from->m_filePermission != -1) {
         m_filePermission = from->m_filePermission;

src/audit_log/writer/parallel.cc

@@ -119,7 +119,7 @@ bool Parallel::write(Transaction *transaction, int parts, std::string *error) {
     } else {
         std::string boundary;
         generateBoundary(&boundary);
-        log = transaction->toOldAuditLogFormat(parts, "-" + boundary + "--");
+        log = transaction->toOldAuditLogFormat(parts, "-" + boundary + "--", m_audit->m_header);
     }
 
     const auto &logPath = m_audit->m_storage_dir;

src/audit_log/writer/serial.cc

@@ -42,7 +42,7 @@ bool Serial::write(Transaction *transaction, int parts, std::string *error) {
     } else {
         std::string boundary;
         generateBoundary(&boundary);
-        msg = transaction->toOldAuditLogFormat(parts, "-" + boundary + "--");
+        msg = transaction->toOldAuditLogFormat(parts, "-" + boundary + "--", m_audit->m_header);
     }
 
     return utils::SharedFiles::getInstance().write(m_audit->m_path1, msg,