Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@n1v0lg
n1v0lg committed Sep 16, 2024
1 parent 28866fb commit cc55ea4
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions ...urity/src/test/java/org/elasticsearch/xpack/security/authz/AuthorizationServiceTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,13 +286,13 @@ public void setup() {

final NativePrivilegeStore privilegesStore = mock(NativePrivilegeStore.class);
doAnswer(i -> {
assertThat(i.getArguments().length, equalTo(3));
final Object arg2 = i.getArguments()[2];
assertThat(i.getArguments().length, equalTo(4));
final Object arg2 = i.getArguments()[3];
assertThat(arg2, instanceOf(ActionListener.class));
ActionListener<Collection<ApplicationPrivilege>> listener = (ActionListener<Collection<ApplicationPrivilege>>) arg2;
listener.onResponse(Collections.emptyList());
return null;
}).when(privilegesStore).getPrivileges(any(Collection.class), any(Collection.class), anyActionListener());
}).when(privilegesStore).getPrivileges(any(Collection.class), any(Collection.class), eq(false), anyActionListener());

final Map<Set<String>, Role> roleCache = new HashMap<>();
final AnonymousUser anonymousUser = mock(AnonymousUser.class);
Expand Down
48 changes: 24 additions & 24 deletions .../src/test/java/org/elasticsearch/xpack/security/authz/store/CompositeRolesStoreTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,10 +494,10 @@ private CompositeRolesStore setupRolesStore(
doAnswer((invocationOnMock) -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> callback = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
privilegesHandler.accept(callback);
return null;
}).when(nativePrivilegeStore).getPrivileges(anySet(), anySet(), anyActionListener());
}).when(nativePrivilegeStore).getPrivileges(anySet(), anySet(), eq(false), anyActionListener());

final CompositeRolesStore compositeRolesStore = buildCompositeRolesStore(
SECURITY_ENABLED_SETTINGS,
Expand Down Expand Up @@ -576,10 +576,10 @@ public void testNegativeLookupsAreCached() {
doAnswer((invocationOnMock) -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> callback = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
callback.onResponse(Collections.emptyList());
return null;
}).when(nativePrivilegeStore).getPrivileges(anySet(), anySet(), anyActionListener());
}).when(nativePrivilegeStore).getPrivileges(anySet(), anySet(), eq(false), anyActionListener());

final AtomicReference<Collection<RoleDescriptor>> effectiveRoleDescriptors = new AtomicReference<Collection<RoleDescriptor>>();
final CompositeRolesStore compositeRolesStore = buildCompositeRolesStore(
Expand Down Expand Up @@ -629,7 +629,7 @@ public void testNegativeLookupsAreCached() {
}
}
if (numberOfTimesToCall > 0 && getSuperuserRole) {
verify(nativePrivilegeStore).getPrivileges(eq(Set.of("*")), eq(Set.of("*")), anyActionListener());
verify(nativePrivilegeStore).getPrivileges(eq(Set.of("*")), eq(Set.of("*")), eq(false), anyActionListener());
// We can't verify the contents of the Set here because the set is mutated inside the method
verify(reservedRolesStore, times(2)).accept(anySet(), anyActionListener());
}
Expand Down Expand Up @@ -997,10 +997,10 @@ public ClusterPermission.Builder buildPermission(ClusterPermission.Builder build
PlainActionFuture<Role> future = new PlainActionFuture<>();
final NativePrivilegeStore privilegeStore = mock(NativePrivilegeStore.class);
doAnswer(inv -> {
assertEquals(3, inv.getArguments().length);
assertEquals(4, inv.getArguments().length);
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> listener = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) inv.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) inv.getArguments()[3];
Set<ApplicationPrivilegeDescriptor> set = new HashSet<>();
Arrays.asList("app1", "app2a", "app2b")
.forEach(
Expand All @@ -1011,7 +1011,7 @@ public ClusterPermission.Builder buildPermission(ClusterPermission.Builder build
);
listener.onResponse(set);
return null;
}).when(privilegeStore).getPrivileges(anyCollection(), anyCollection(), anyActionListener());
}).when(privilegeStore).getPrivileges(anyCollection(), anyCollection(), eq(false), anyActionListener());
CompositeRolesStore.buildRoleFromDescriptors(
Sets.newHashSet(role1, role2),
cache,
Expand Down Expand Up @@ -1958,10 +1958,10 @@ public void testApiKeyAuthUsesApiKeyService() throws Exception {
doAnswer(invocationOnMock -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> listener = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
listener.onResponse(Collections.emptyList());
return Void.TYPE;
}).when(nativePrivStore).getPrivileges(anyCollection(), anyCollection(), anyActionListener());
}).when(nativePrivStore).getPrivileges(anyCollection(), anyCollection(), eq(false), anyActionListener());

final AtomicReference<Collection<RoleDescriptor>> effectiveRoleDescriptors = new AtomicReference<Collection<RoleDescriptor>>();
final CompositeRolesStore compositeRolesStore = buildCompositeRolesStore(
Expand Down Expand Up @@ -2042,10 +2042,10 @@ public void testApiKeyAuthUsesApiKeyServiceWithScopedRole() throws Exception {
doAnswer(invocationOnMock -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> listener = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
listener.onResponse(Collections.emptyList());
return Void.TYPE;
}).when(nativePrivStore).getPrivileges(anyCollection(), anyCollection(), anyActionListener());
}).when(nativePrivStore).getPrivileges(anyCollection(), anyCollection(), eq(false), anyActionListener());

final AtomicReference<Collection<RoleDescriptor>> effectiveRoleDescriptors = new AtomicReference<Collection<RoleDescriptor>>();
final CompositeRolesStore compositeRolesStore = buildCompositeRolesStore(
Expand Down Expand Up @@ -2143,10 +2143,10 @@ public void testGetRoleForCrossClusterAccessAuthentication() throws Exception {
doAnswer(invocationOnMock -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> listener = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
listener.onResponse(Collections.emptyList());
return Void.TYPE;
}).when(nativePrivStore).getPrivileges(anyCollection(), anyCollection(), anyActionListener());
}).when(nativePrivStore).getPrivileges(anyCollection(), anyCollection(), eq(false), anyActionListener());

final AtomicReference<Collection<RoleDescriptor>> effectiveRoleDescriptors = new AtomicReference<Collection<RoleDescriptor>>();
final CompositeRolesStore compositeRolesStore = buildCompositeRolesStore(
Expand Down Expand Up @@ -2301,10 +2301,10 @@ public void testGetRoleForWorkflowWithRestriction() {
doAnswer((invocationOnMock) -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> callback = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
callback.onResponse(Collections.emptyList());
return null;
}).when(privilegeStore).getPrivileges(isASet(), isASet(), anyActionListener());
}).when(privilegeStore).getPrivileges(isASet(), isASet(), eq(false), anyActionListener());
final ThreadContext threadContext = new ThreadContext(settings);
final XPackLicenseState licenseState = new XPackLicenseState(() -> 0);
final CompositeRolesStore compositeRolesStore = new CompositeRolesStore(
Expand Down Expand Up @@ -2414,10 +2414,10 @@ public void testGetRoleForWorkflowWithoutRestriction() {
doAnswer((invocationOnMock) -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> callback = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
callback.onResponse(Collections.emptyList());
return null;
}).when(privilegeStore).getPrivileges(isASet(), isASet(), anyActionListener());
}).when(privilegeStore).getPrivileges(isASet(), isASet(), eq(false), anyActionListener());
final ThreadContext threadContext = new ThreadContext(settings);
final XPackLicenseState licenseState = new XPackLicenseState(() -> 0);
final CompositeRolesStore compositeRolesStore = new CompositeRolesStore(
Expand Down Expand Up @@ -2624,10 +2624,10 @@ public void testCacheEntryIsReusedForIdenticalApiKeyRoles() {
doAnswer(invocationOnMock -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> listener = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
listener.onResponse(Collections.emptyList());
return Void.TYPE;
}).when(nativePrivStore).getPrivileges(anyCollection(), anyCollection(), anyActionListener());
}).when(nativePrivStore).getPrivileges(anyCollection(), anyCollection(), eq(false), anyActionListener());

final AtomicReference<Collection<RoleDescriptor>> effectiveRoleDescriptors = new AtomicReference<Collection<RoleDescriptor>>();
final CompositeRolesStore compositeRolesStore = buildCompositeRolesStore(
Expand Down Expand Up @@ -2992,10 +2992,10 @@ private CompositeRolesStore buildCompositeRolesStore(
doAnswer((invocationOnMock) -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> callback = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
callback.onResponse(Collections.emptyList());
return null;
}).when(privilegeStore).getPrivileges(isASet(), isASet(), anyActionListener());
}).when(privilegeStore).getPrivileges(isASet(), isASet(), eq(false), anyActionListener());
}
if (apiKeyService == null) {
apiKeyService = mock(ApiKeyService.class);
Expand Down Expand Up @@ -3162,10 +3162,10 @@ private Role buildRole(final RoleDescriptor... roleDescriptors) {
doAnswer((invocationOnMock) -> {
@SuppressWarnings("unchecked")
ActionListener<Collection<ApplicationPrivilegeDescriptor>> callback = (ActionListener<
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[2];
Collection<ApplicationPrivilegeDescriptor>>) invocationOnMock.getArguments()[3];
callback.onResponse(Collections.emptyList());
return null;
}).when(privilegeStore).getPrivileges(isASet(), isASet(), anyActionListener());
}).when(privilegeStore).getPrivileges(isASet(), isASet(), eq(false), anyActionListener());
CompositeRolesStore.buildRoleFromDescriptors(
Sets.newHashSet(roleDescriptors),
cache,
Expand Down

0 comments on commit cc55ea4

Please sign in to comment.