Skip to content

Option to disable logging of log producer (2nd try) #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Option to disable logging of log producer (2nd try) #1400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f586924
Option to disable logging of log producer in audit log when log level…
Apr 27, 2017
6139df8
Fixed CHANGES (PR# and text)
May 3, 2017
a5c3548
{dis|en}able-server-context-logging: Option to disable logging of ser…
May 5, 2017
cfacb87
Merge branch 'master' into v2/log/producer-try2
May 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
DD MMM YYYY - 2.9.2 - To be released
------------------------------------

* {dis|en}able-dechunk-logging: Option to disable logging of
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is about the producer, not the dechunking :P

dechunking in audit log when log level < 9.
[Issue #1068 - Marc Stern]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue number is not correct.

* {dis|en}able-handler-logging: Option to disable logging of Apache handler
in audit log
[Issue #1070, #1381 - Marc Stern]
Expand Down
6 changes: 6 additions & 0 deletions apache2/msc_logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,9 @@ void sec_audit_logger_json(modsec_rec *msr) {
yajl_kv_bool(g, "response_body_dechunked", 1);
}

#ifdef LOG_NO_PRODUCER
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not more than the single producer entry ?

if (msr->txcfg->debuglog_level >= 9) {
#endif
sec_auditlog_write_producer_header_json(msr, g);

/* Server */
Expand Down Expand Up @@ -1323,6 +1326,9 @@ void sec_audit_logger_json(modsec_rec *msr) {
}
}

#ifdef LOG_NO_PRODUCER
}
#endif
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey wait. This is only about JSON version?

yajl_gen_map_close(g); // audit_data top-level key is finished

/* AUDITLOG_PART_UPLOADS */
Expand Down
17 changes: 16 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,21 @@ 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]),
[
if test "$enableval" != "no"; then
log_producer=
else
log_producer="-DLOG_NO_PRODUCER"
fi
],
[
log_producer=''
])

# Ignore configure errors
AC_ARG_ENABLE(errors,
AS_HELP_STRING([--disable-errors],
Expand Down Expand Up @@ -737,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"
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"

APXS_WRAPPER=build/apxs-wrapper
APXS_EXTRA_CFLAGS=""
Expand Down