Skip to content

Add origin_address to authentication_success #36409

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

Merged
albertzaharovits merged 2 commits into from
Dec 10, 2018
Merged

Add origin_address to authentication_success #36409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b99ec5
Done
albertzaharovits Dec 9, 2018
7ef0dcc
Checkstyle
albertzaharovits Dec 9, 2018
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
8 changes: 4 additions & 4 deletions ...main/java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...java/org/elasticsearch/xpack/security/audit/logfile/DeprecatedLoggingAuditTrailTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down