github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adds option to disable logging of stopwatches in audit log.

Browse Source
This commit is contained in:
Marc Stern 2017-05-02 17:11:11 -03:00 committed by Felipe Zimmerle
parent 41ae8db571
commit 7246998f09
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,6 +1,9 @@
DD MMM YYYY - 2.9.2 - To be released DD MMM YYYY - 2.9.2 - To be released
------------------------------------ ------------------------------------
* {dis|en}able-stopwatch-logging: Option to disable logging of stopwatches
in audit log.
[Issue #1067 - Marc Stern]
* {dis|en}able-dechunk-logging: Option to disable logging of * {dis|en}able-dechunk-logging: Option to disable logging of
dechunking in audit log when log level < 9. dechunking in audit log when log level < 9.
* Updates libinjection to: da027ab52f9cf14401dd92e34e6683d183bdb3b4 * Updates libinjection to: da027ab52f9cf14401dd92e34e6683d183bdb3b4

9
apache2/msc_logging.c
View File

@ -1165,6 +1165,9 @@ void sec_audit_logger_json(modsec_rec *msr) {
/* Stopwatch2 */ /* Stopwatch2 */
#ifdef DLOG_NO_STOPWATCH
if (msr->txcfg->debuglog_level >= 9)
#endif
format_performance_variables_json(msr, g); format_performance_variables_json(msr, g);
/* Our response body does not contain chunks */ /* Our response body does not contain chunks */
@ -1989,6 +1992,9 @@ void sec_audit_logger_native(modsec_rec *msr) {
} }
/* Stopwatch; left in for compatibility reasons */ /* Stopwatch; left in for compatibility reasons */
#ifdef DLOG_NO_STOPWATCH
if (msr->txcfg->debuglog_level >= 9) {
#endif
text = apr_psprintf(msr->mp, "Stopwatch: %" APR_TIME_T_FMT " %" APR_TIME_T_FMT " (- - -)\n", text = apr_psprintf(msr->mp, "Stopwatch: %" APR_TIME_T_FMT " %" APR_TIME_T_FMT " (- - -)\n",
msr->request_time, (now - msr->request_time)); msr->request_time, (now - msr->request_time));
sec_auditlog_write(msr, text, strlen(text)); sec_auditlog_write(msr, text, strlen(text));
@ -2001,6 +2007,9 @@ void sec_audit_logger_native(modsec_rec *msr) {
"; %s\n", msr->request_time, (now - msr->request_time), perf_all); "; %s\n", msr->request_time, (now - msr->request_time), perf_all);
sec_auditlog_write(msr, text, strlen(text)); sec_auditlog_write(msr, text, strlen(text));
} }
#ifdef DLOG_NO_STOPWATCH
}
#endif
/* Our response body does not contain chunks */ /* Our response body does not contain chunks */
/* ENH Only write this when the output was chunked. */ /* ENH Only write this when the output was chunked. */

17
configure.ac
View File

@ -502,6 +502,21 @@ AC_ARG_ENABLE(dechunk-logging,
log_dechunk='' log_dechunk=''
]) ])
# Disable logging of stopwatches
AC_ARG_ENABLE(stopwatch-logging,
AS_HELP_STRING([--enable-stopwatch-logging],
[Enable logging of stopwatches in audit log when log level < 9. This is the default]),
[
if test "$enableval" != "no"; then
log_stopwatch=
else
log_stopwatch="-DLOG_NO_STOPWATCH"
fi
],
[
log_stopwatch=''
])
# Ignore configure errors # Ignore configure errors
AC_ARG_ENABLE(errors, AC_ARG_ENABLE(errors,
AS_HELP_STRING([--disable-errors], AS_HELP_STRING([--disable-errors],
@ -752,7 +767,7 @@ else
fi fi
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_dechunk" 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"
APXS_WRAPPER=build/apxs-wrapper APXS_WRAPPER=build/apxs-wrapper
APXS_EXTRA_CFLAGS="" APXS_EXTRA_CFLAGS=""