Commit7246998

Marc Stern

authored and

Felipe Zimmerle

committed

Adds option to disable logging of stopwatches in audit log.

1 parent41ae8db commit7246998Copy full SHA for 7246998

File tree

+28

-1

lines changed

+28

-1

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`DD MMM YYYY - 2.9.2 - To be released`
`2`	`2`	`------------------------------------`
`3`	`3`
	`4`	`+ * {dis\|en}able-stopwatch-logging: Option to disable logging of stopwatches`
	`5`	`+ in audit log.`
	`6`	`+ [Issue #1067 - Marc Stern]`
`4`	`7`	`* {dis\|en}able-dechunk-logging: Option to disable logging of`
`5`	`8`	`dechunking in audit log when log level < 9.`
`6`	`9`	`* Updates libinjection to: da027ab52f9cf14401dd92e34e6683d183bdb3b4`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1165,6 +1165,9 @@ void sec_audit_logger_json(modsec_rec *msr) {`
`1165`	`1165`
`1166`	`1166`
`1167`	`1167`	`/* Stopwatch2 */`
	`1168`	`+#ifdefDLOG_NO_STOPWATCH`
	`1169`	`+if (msr->txcfg->debuglog_level >=9)`
	`1170`	`+#endif`
`1168`	`1171`	`format_performance_variables_json(msr,g);`
`1169`	`1172`
`1170`	`1173`	`/* Our response body does not contain chunks */`
`@@ -1989,6 +1992,9 @@ void sec_audit_logger_native(modsec_rec *msr) {`
`1989`	`1992`	`}`
`1990`	`1993`
`1991`	`1994`	`/* Stopwatch; left in for compatibility reasons */`
	`1995`	`+#ifdefDLOG_NO_STOPWATCH`
	`1996`	`+if (msr->txcfg->debuglog_level >=9) {`
	`1997`	`+#endif`
`1992`	`1998`	`text=apr_psprintf(msr->mp,"Stopwatch: %"APR_TIME_T_FMT" %"APR_TIME_T_FMT" (- - -)\n",`
`1993`	`1999`	`msr->request_time, (now-msr->request_time));`
`1994`	`2000`	`sec_auditlog_write(msr,text,strlen(text));`
`@@ -2001,6 +2007,9 @@ void sec_audit_logger_native(modsec_rec *msr) {`
`2001`	`2007`	`"; %s\n",msr->request_time, (now-msr->request_time),perf_all);`
`2002`	`2008`	`sec_auditlog_write(msr,text,strlen(text));`
`2003`	`2009`	`}`
	`2010`	`+#ifdefDLOG_NO_STOPWATCH`
	`2011`	`+}`
	`2012`	`+#endif`
`2004`	`2013`
`2005`	`2014`	`/* Our response body does not contain chunks */`
`2006`	`2015`	`/* ENH Only write this when the output was chunked. */`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -502,6 +502,21 @@ AC_ARG_ENABLE(dechunk-logging,`
`502`	`502`	`log_dechunk=''`
`503`	`503`	`])`
`504`	`504`
	`505`	`+# Disable logging of stopwatches`
	`506`	`+AC_ARG_ENABLE(stopwatch-logging,`
	`507`	`+AS_HELP_STRING([--enable-stopwatch-logging],`
	`508`	`+[Enable logging of stopwatches in audit log when log level < 9. This is the default]),`
	`509`	`+[`
	`510`	`+ if test "$enableval" != "no"; then`
	`511`	`+ log_stopwatch=`
	`512`	`+ else`
	`513`	`+ log_stopwatch="-DLOG_NO_STOPWATCH"`
	`514`	`+ fi`
	`515`	`+],`
	`516`	`+[`
	`517`	`+ log_stopwatch=''`
	`518`	`+])`
	`519`	`+`
`505`	`520`	`# Ignore configure errors`
`506`	`521`	`AC_ARG_ENABLE(errors,`
`507`	`522`	`AS_HELP_STRING([--disable-errors],`
`@@ -752,7 +767,7 @@ else`
`752`	`767`	`fi`
`753`	`768`	`fi`
`754`	`769`
`755`		`-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_dechunk"`
	`770`	`+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_dechunk $log_stopwatch"`
`756`	`771`
`757`	`772`	`APXS_WRAPPER=build/apxs-wrapper`
`758`	`773`	`APXS_EXTRA_CFLAGS=""`

Comments

(0)