{dis|en}able-server-context-logging: Option to disable logging of server info (log producer, sanitized objects, ...) in audit log.

[Issue #1069 - Marc Stern]

Author: Marc Stern

CHANGES

@@ -1,8 +1,8 @@
 DD MMM YYYY - 2.9.2 - To be released
 ------------------------------------
 
- * {dis|en}able-log-producer-logging: Option to disable logging of
-   log producer in audit log.
+ * {dis|en}able-server-context-logging: Option to disable logging of
+   server info (log producer, sanitized objects, ...) in audit log.
    [Issue #1069 - Marc Stern]
  * {dis|en}able-handler-logging: Option to disable logging of Apache handler
    in audit log

apache2/msc_logging.c

@@ -1174,7 +1174,7 @@ void sec_audit_logger_json(modsec_rec *msr) {
             yajl_kv_bool(g, "response_body_dechunked", 1);
         }
 
-#ifdef LOG_NO_PRODUCER
+#ifdef LOG_NO_SERVER_CONTEXT
         if (msr->txcfg->debuglog_level >= 9) {
 #endif
         sec_auditlog_write_producer_header_json(msr, g);
@@ -1271,7 +1271,7 @@ void sec_audit_logger_json(modsec_rec *msr) {
         if (been_opened == 1) {
             yajl_gen_map_close(g); // sanitized args map is finished
         }
-#ifdef LOG_NO_PRODUCER
+#ifdef LOG_NO_SERVER_CONTEXT
 		}
 #endif
 
@@ -2013,7 +2013,7 @@ void sec_audit_logger_native(modsec_rec *msr) {
             sec_auditlog_write(msr, text, strlen(text));
         }
 
-#ifdef LOG_NO_PRODUCER
+#ifdef LOG_NO_SERVER_CONTEXT
         if (msr->txcfg->debuglog_level >= 9) {
 #endif
         sec_auditlog_write_producer_header(msr);
@@ -2084,10 +2084,10 @@ void sec_audit_logger_native(modsec_rec *msr) {
                 sec_auditlog_write(msr, text, strlen(text));
             }
         }
-
-#ifdef LOG_NO_PRODUCER
-	    }
+#ifdef LOG_NO_SERVER_CONTEXT
+		}
 #endif
+
 		/* Web application info. */
         if ( ((msr->txcfg->webappid != NULL)&&(strcmp(msr->txcfg->webappid, "default") != 0))
             || (msr->sessionid != NULL) || (msr->userid != NULL))

configure.ac

@@ -487,19 +487,19 @@ AC_ARG_ENABLE(handler-logging,
   log_handler=''
 ])
 
-# Disable logging of log producer
-AC_ARG_ENABLE(log-producer-logging,
-              AS_HELP_STRING([--enable-log-producer-logging],
-                             [Enable logging of log producer in audit log when log level < 9. This is the default]),
+# Disable logging of server context
+AC_ARG_ENABLE(server-context-logging,
+              AS_HELP_STRING([--enable-server-context-logging],
+                             [Enable logging of server info (log producer, sanitized objects, ...) in audit log when log level < 9. This is the default]),
 [
   if test "$enableval" != "no"; then
-    log_producer=
+    log_server_context=
   else
-    log_producer="-DLOG_NO_PRODUCER"
+    log_server_context="-DLOG_NO_SERVER_CONTEXT"
   fi
 ],
 [
-  log_producer=''
+  log_server_context=''
 ])
 
 # Ignore configure errors
@@ -752,7 +752,7 @@ else
   fi
 fi
 
-MODSEC_EXTRA_CFLAGS="$pcre_study $pcre_match_limit $pcre_match_limit_recursion $pcre_jit $request_early $htaccess_config $lua_cache $debug_conf $debug_cache $debug_acmp $debug_mem $perf_meas $modsec_api $cpu_type $unique_id $log_filename $log_server $log_collection_delete_problem $log_producer"
+MODSEC_EXTRA_CFLAGS="$pcre_study $pcre_match_limit $pcre_match_limit_recursion $pcre_jit $request_early $htaccess_config $lua_cache $debug_conf $debug_cache $debug_acmp $debug_mem $perf_meas $modsec_api $cpu_type $unique_id $log_filename $log_server $log_collection_delete_problem $log_server_context"
 
 APXS_WRAPPER=build/apxs-wrapper
 APXS_EXTRA_CFLAGS=""