diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2018-12-13 13:53:08 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-12-14 10:27:18 +0100 |
| commit | edab1318f9138c0d87de7cc7cfa5da8e29c906f8 (patch) | |
| tree | febf6c3cb40f389129c168b92e1355cc9ef06b85 /auth | |
| parent | f183fd328314d90a92659720adebf034917962ec (diff) | |
| download | samba-edab1318f9138c0d87de7cc7cfa5da8e29c906f8.tar.gz | |
audit_logging: Remove debug log header and JSON Authentication: prefix
Feedback from real-world users is that they really want raw JSON
strings in the log.
We can not easily remove the leading " " but the other strings above
and before the JSON are really annoying to strip back off
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13714
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/auth_log.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/auth/auth_log.c b/auth/auth_log.c index 2d4e33f53bf..15a2c15c489 100644 --- a/auth/auth_log.c +++ b/auth/auth_log.c @@ -78,11 +78,10 @@ static const char* get_password_type(const struct auth_usersupplied_info *ui); static void log_json(struct imessaging_context *msg_ctx, struct loadparm_context *lp_ctx, struct json_object *object, - const char *type, int debug_class, int debug_level) { - audit_log_json(type, object, debug_class, debug_level); + audit_log_json(object, debug_class, debug_level); if (msg_ctx && lp_ctx && lpcfg_auth_event_notification(lp_ctx)) { audit_message_send(msg_ctx, AUTH_EVENT_NAME, @@ -102,9 +101,8 @@ static void log_json(struct imessaging_context *msg_ctx, * To process the resulting log lines from the commend line use jq to * parse the json. * - * grep "JSON Authentication" log file | - * sed 's;^[^{]*;;' | - * jq -rc '"\(.timestamp)\t\(.Authentication.status)\t + * grep "^ {" log file | + * jq -rc '"\(.timestamp)\t\(.Authentication.status)\t * \(.Authentication.clientDomain)\t * \(.Authentication.clientAccount) * \t\(.Authentication.workstation) @@ -272,7 +270,6 @@ static void log_authentication_event_json( log_json(msg_ctx, lp_ctx, &wrapper, - AUTH_JSON_TYPE, DBGC_AUTH_AUDIT, debug_level); json_free(&wrapper); @@ -300,8 +297,7 @@ failure: * To process the resulting log lines from the commend line use jq to * parse the json. * - * grep "JSON Authentication" log_file |\ - * sed "s;^[^{]*;;" |\ + * grep "^ {" log_file |\ * jq -rc '"\(.timestamp)\t * \(.Authorization.domain)\t * \(.Authorization.account)\t @@ -409,7 +405,6 @@ static void log_successful_authz_event_json( log_json(msg_ctx, lp_ctx, &wrapper, - AUTHZ_JSON_TYPE, DBGC_AUTH_AUDIT, debug_level); json_free(&wrapper); |