honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix line length 

Original commit: elastic/x-pack-elasticsearch@c2e67e68bd
This commit is contained in:
javanna 2017-12-05 22:17:35 +01:00 committed by Luca Cavanna
parent 626c74a437
commit 915d95bca1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/src/main/java/org/elasticsearch/xpack/security/audit/AuditTrailService.java
View File

@ -132,7 +132,8 @@ public class AuditTrailService extends AbstractComponent implements AuditTrail {
} }
@Override @Override
public void accessGranted(User user, String action, TransportMessage message, String[] roleNames, @Nullable Set<String> specificIndices) { public void accessGranted(User user, String action, TransportMessage message, String[] roleNames,
@Nullable Set<String> specificIndices) {
if (licenseState.isAuditingAllowed()) { if (licenseState.isAuditingAllowed()) {
for (AuditTrail auditTrail : auditTrails) { for (AuditTrail auditTrail : auditTrails) {
auditTrail.accessGranted(user, action, message, roleNames, specificIndices); auditTrail.accessGranted(user, action, message, roleNames, specificIndices);
@ -141,7 +142,8 @@ public class AuditTrailService extends AbstractComponent implements AuditTrail {
} }
@Override @Override
public void accessDenied(User user, String action, TransportMessage message, String[] roleNames, @Nullable Set<String> specificIndices) { public void accessDenied(User user, String action, TransportMessage message, String[] roleNames,
@Nullable Set<String> specificIndices) {
if (licenseState.isAuditingAllowed()) { if (licenseState.isAuditingAllowed()) {
for (AuditTrail auditTrail : auditTrails) { for (AuditTrail auditTrail : auditTrails) {
auditTrail.accessDenied(user, action, message, roleNames, specificIndices); auditTrail.accessDenied(user, action, message, roleNames, specificIndices);

3
plugin/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java
View File

@ -245,7 +245,8 @@ public class AuthorizationServiceTests extends ESTestCase {
assertThrowsAuthorizationException( assertThrowsAuthorizationException(
() -> authorize(createAuthentication(SystemUser.INSTANCE), "cluster:admin/whatever", request), () -> authorize(createAuthentication(SystemUser.INSTANCE), "cluster:admin/whatever", request),
"cluster:admin/whatever", SystemUser.INSTANCE.principal()); "cluster:admin/whatever", SystemUser.INSTANCE.principal());
verify(auditTrail).accessDenied(SystemUser.INSTANCE, "cluster:admin/whatever", request, new String[] { SystemUser.ROLE_NAME }, null); verify(auditTrail).accessDenied(SystemUser.INSTANCE, "cluster:admin/whatever", request, new String[] { SystemUser.ROLE_NAME },
null);
verifyNoMoreInteractions(auditTrail); verifyNoMoreInteractions(auditTrail);
} }