Adds support to SecAuditLogParts

src/assay.cc

@@ -695,6 +695,7 @@ std::string Assay::to_json(int parts) {
     std::string ts = ascTime(&timeStamp).c_str();
     std::string uniqueId = UniqueId::uniqueId();
 
+    parts = 0;
     g = yajl_gen_alloc(NULL);
     if (g == NULL) {
       return "";
@@ -709,6 +710,7 @@ std::string Assay::to_json(int parts) {
         strlen("transaction"));
 
     yajl_gen_map_open(g);
+    /* Part: A (header mandatory) */
     LOGFY_ADD("client_ip", this->m_clientIpAddress);
     LOGFY_ADD("time_stamp", ts.c_str());
     LOGFY_ADD("server_id", uniqueId.c_str());
@@ -725,9 +727,13 @@ std::string Assay::to_json(int parts) {
     LOGFY_ADD("protocol", m_protocol);
     LOGFY_ADD_INT("http_version", m_httpVersion);
     LOGFY_ADD("uri", this->m_uri);
+
+    if (parts & AuditLog::CAuditLogPart) {
         LOGFY_ADD("body", this->m_requestBody.str().c_str());
+    }
 
     /* request headers */
+    if (parts & AuditLog::BAuditLogPart) {
         yajl_gen_string(g, reinterpret_cast<const unsigned char*>("headers"),
             strlen("headers"));
         yajl_gen_map_open(g);
@@ -746,6 +752,8 @@ std::string Assay::to_json(int parts) {
 
         /* end: request headers */
         yajl_gen_map_close(g);
+    }
+
     /* end: request */
     yajl_gen_map_close(g);
 
@@ -754,10 +762,13 @@ std::string Assay::to_json(int parts) {
         strlen("response"));
     yajl_gen_map_open(g);
 
+    if (parts & AuditLog::GAuditLogPart) {
         LOGFY_ADD("body", this->m_responseBody.str().c_str());
+    }
     LOGFY_ADD_NUM("http_code", httpCodeReturned);
 
     /* response headers */
+    if (parts & AuditLog::FAuditLogPart) {
         yajl_gen_string(g, reinterpret_cast<const unsigned char*>("headers"),
             strlen("headers"));
         yajl_gen_map_open(g);
@@ -775,10 +786,12 @@ std::string Assay::to_json(int parts) {
         }
         /* end: response headers */
         yajl_gen_map_close(g);
+    }
     /* end: response */
     yajl_gen_map_close(g);
 
     /* producer */
+    if (parts & AuditLog::HAuditLogPart) {
         yajl_gen_string(g, reinterpret_cast<const unsigned char*>("producer"),
             strlen("producer"));
         yajl_gen_map_open(g);
@@ -808,7 +821,7 @@ std::string Assay::to_json(int parts) {
 
         /* end: producer */
         yajl_gen_map_close(g);
-
+    }
     /* end: transaction */
     yajl_gen_map_close(g);
 

src/audit_log.cc

@@ -148,7 +148,7 @@ bool AuditLog::saveIfRelevant(Assay *assay) {
         return true;
     }
 
-    m_writer->write(assay);
+    m_writer->write(assay, m_parts);
 
     return true;
 }

src/audit_log_writer.cc

@@ -33,7 +33,7 @@ std::string AuditLogWriter::file_name(const std::string& unique_id) {
  * Temporary print the log into the std::cout to debug purposes.
  *
  */
-bool AuditLogWriter::write(Assay *assay) {
+bool AuditLogWriter::write(Assay *assay, int parts) {
     std::cout << assay->to_json(0) << std::endl;
     return true;
 }

src/audit_log_writer.h

@@ -36,7 +36,7 @@ class AuditLogWriter {
 
     virtual bool close() { return true; }
     virtual bool init() { return true; }
-    virtual bool write(Assay *assay);
+    virtual bool write(Assay *assay, int parts);
 
     std::string file_name(const std::string& unique_id);
 

src/audit_log_writer_parallel.cc

@@ -74,10 +74,10 @@ bool AuditLogWriterParallel::close() {
 }
 
 
-bool AuditLogWriterParallel::write(Assay *assay) {
+bool AuditLogWriterParallel::write(Assay *assay, int parts) {
     FILE *fp;
     int fd;
-    std::string log = assay->to_json(0);
+    std::string log = assay->to_json(parts);
     std::string fileName = logFilePath(&assay->timeStamp,
         YearMonthDayDirectory | YearMonthDayAndTimeDirectory
         | YearMonthDayAndTimeFileName);

src/audit_log_writer_parallel.h

@@ -33,7 +33,7 @@ class AuditLogWriterParallel : public AuditLogWriter {
 
     bool init() override;
     bool close() override;
-    bool write(Assay *assay) override;
+    bool write(Assay *assay, int parts) override;
 
     /**
      *

src/audit_log_writer_serial.cc

@@ -30,7 +30,7 @@ bool AuditLogWriterSerial::close() {
 }
 
 
-bool AuditLogWriterSerial::write(Assay *assay) {
+bool AuditLogWriterSerial::write(Assay *assay, int parts) {
     return true;
 }
 

src/audit_log_writer_serial.h

@@ -37,7 +37,7 @@ class AuditLogWriterSerial : public AuditLogWriter {
 
     bool init() override;
     bool close() override;
-    bool write(Assay *assay) override;
+    bool write(Assay *assay, int parts) override;
 };
 
 }  // namespace ModSecurity