From 2b99ec5eee8daf142179f6225ec0e8f41bc9c87b Mon Sep 17 00:00:00 2001 From: Albert Zaharovits Date: Sun, 9 Dec 2018 20:11:55 +0200 Subject: [PATCH 1/2] Done --- .../audit/logfile/DeprecatedLoggingAuditTrail.java | 8 ++++---- .../logfile/DeprecatedLoggingAuditTrailTests.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrail.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrail.java index 1f4d13bad9a2d..2e2424c78db6e 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrail.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrail.java @@ -138,12 +138,12 @@ public void authenticationSuccess(String requestId, String realm, User user, Res if (events.contains(AUTHENTICATION_SUCCESS) && (eventFilterPolicyRegistry.ignorePredicate() .test(new AuditEventMetaInfo(Optional.of(user), Optional.of(realm), Optional.empty(), Optional.empty())) == false)) { if (includeRequestBody) { - logger.info("{}[rest] [authentication_success]\t{}, realm=[{}], uri=[{}], params=[{}]{}, request_body=[{}]", - localNodeInfo.prefix, principal(user), realm, request.uri(), request.params(), opaqueId(), + logger.info("{}[rest] [authentication_success]\t{}, {}, realm=[{}], uri=[{}], params=[{}]{}, request_body=[{}]", + localNodeInfo.prefix, hostAttributes(request), principal(user), realm, request.uri(), request.params(), opaqueId(), restRequestContent(request)); } else { - logger.info("{}[rest] [authentication_success]\t{}, realm=[{}], uri=[{}], params=[{}]{}", localNodeInfo.prefix, - principal(user), realm, request.uri(), request.params(), opaqueId()); + logger.info("{}[rest] [authentication_success]\t{}, {}, realm=[{}], uri=[{}], params=[{}]{}", localNodeInfo.prefix, + hostAttributes(request), principal(user), realm, request.uri(), request.params(), opaqueId()); } } } diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrailTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrailTests.java index 087718888982e..58caf8d075c92 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrailTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrailTests.java @@ -676,12 +676,12 @@ public void testAuthenticationSuccessRest() throws Exception { auditTrail.authenticationSuccess(randomAlphaOfLength(12), realm, user, request); if (includeRequestBody) { assertMsg(logger, Level.INFO, - prefix + "[rest] [authentication_success]\t" + userInfo + ", realm=[_realm], uri=[_uri], params=[" + params - + "]" + opaqueId + ", request_body=[" + expectedMessage + "]"); + prefix + "[rest] [authentication_success]\torigin_address=[" + NetworkAddress.format(address) + "], " + userInfo + + ", realm=[_realm], uri=[_uri], params=[" + params + "]" + opaqueId + ", request_body=[" + expectedMessage + + "]"); } else { - assertMsg(logger, Level.INFO, - prefix + "[rest] [authentication_success]\t" + userInfo + ", realm=[_realm], uri=[_uri], params=[" + params - + "]" + opaqueId); + assertMsg(logger, Level.INFO, prefix + "[rest] [authentication_success]\torigin_address=[" + NetworkAddress.format(address) + "], " + + userInfo + ", realm=[_realm], uri=[_uri], params=[" + params + "]" + opaqueId); } // test disabled From 7ef0dcc49e620f8566c67e709920cdb930dae452 Mon Sep 17 00:00:00 2001 From: Albert Zaharovits Date: Mon, 10 Dec 2018 00:40:03 +0200 Subject: [PATCH 2/2] Checkstyle --- .../audit/logfile/DeprecatedLoggingAuditTrailTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrailTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrailTests.java index 58caf8d075c92..5ab4a8797a856 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrailTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrailTests.java @@ -680,8 +680,8 @@ public void testAuthenticationSuccessRest() throws Exception { + ", realm=[_realm], uri=[_uri], params=[" + params + "]" + opaqueId + ", request_body=[" + expectedMessage + "]"); } else { - assertMsg(logger, Level.INFO, prefix + "[rest] [authentication_success]\torigin_address=[" + NetworkAddress.format(address) + "], " - + userInfo + ", realm=[_realm], uri=[_uri], params=[" + params + "]" + opaqueId); + assertMsg(logger, Level.INFO, prefix + "[rest] [authentication_success]\torigin_address=[" + NetworkAddress.format(address) + + "], " + userInfo + ", realm=[_realm], uri=[_uri], params=[" + params + "]" + opaqueId); } // test disabled