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 30, 2024
1 parent c8842fe commit 19fe01a
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 15 deletions.
2 changes: 1 addition & 1 deletion ...in/java/org/elasticsearch/xpack/security/authc/support/mapper/ClusterStateRoleMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* A role mapper the reads the role mapping rules (i.e. {@link ExpressionRoleMapping}s) from the cluster state
* (i.e. {@link RoleMappingMetadata}). This is not enabled by default.
*/
public final class ClusterStateRoleMapper extends AbstractRoleMapperClearRealmCache implements ClusterStateListener {
public class ClusterStateRoleMapper extends AbstractRoleMapperClearRealmCache implements ClusterStateListener {

/**
* This setting is never registered by the xpack security plugin - in order to enable the
Expand Down
4 changes: 0 additions & 4 deletions ...in/java/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,6 @@ public class NativeRoleMappingStore extends AbstractRoleMapperClearRealmCache {
private final boolean enabled;
private final ReservedRoleMappings reservedRoleMappings;

public NativeRoleMappingStore(Settings settings, Client client, SecurityIndexManager securityIndex, ScriptService scriptService) {
this(settings, client, securityIndex, scriptService, new ReservedRoleMappings(null));
}

public NativeRoleMappingStore(
Settings settings,
Client client,
Expand Down
4 changes: 3 additions & 1 deletion .../src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosRealmTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.elasticsearch.xpack.core.security.user.User;
import org.elasticsearch.xpack.security.Security;
import org.elasticsearch.xpack.security.authc.support.mapper.NativeRoleMappingStore;
import org.elasticsearch.xpack.security.authc.support.mapper.ReservedRoleMappings;
import org.elasticsearch.xpack.security.support.SecurityIndexManager;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -182,7 +183,8 @@ protected NativeRoleMappingStore roleMappingStore(final List<String> userNames)
Settings.EMPTY,
mockClient,
mock(SecurityIndexManager.class),
mock(ScriptService.class)
mock(ScriptService.class),
mock(ReservedRoleMappings.class)
);
final NativeRoleMappingStore roleMapper = spy(store);

Expand Down
15 changes: 14 additions & 1 deletion .../src/test/java/org/elasticsearch/xpack/security/authc/ldap/ActiveDirectoryRealmTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@
import org.elasticsearch.xpack.security.authc.ldap.ActiveDirectorySessionFactory.UpnADAuthenticator;
import org.elasticsearch.xpack.security.authc.ldap.support.LdapServerDebugLogging;
import org.elasticsearch.xpack.security.authc.support.DnRoleMapper;
import org.elasticsearch.xpack.security.authc.support.mapper.ClusterStateRoleMapper;
import org.elasticsearch.xpack.security.authc.support.mapper.NativeRoleMappingStore;
import org.elasticsearch.xpack.security.authc.support.mapper.ReservedRoleMappings;
import org.elasticsearch.xpack.security.support.SecurityIndexManager;
import org.junit.After;
import org.junit.Before;
Expand All @@ -74,6 +76,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;

import static org.elasticsearch.test.ActionListenerUtils.anyActionListener;
import static org.elasticsearch.xpack.core.security.authc.RealmSettings.getFullSettingKey;
Expand Down Expand Up @@ -118,6 +121,7 @@ public class ActiveDirectoryRealmTests extends ESTestCase {
private Settings globalSettings;
private SSLService sslService;
private XPackLicenseState licenseState;
private ReservedRoleMappings reservedRoleMappings;
private LdapServerDebugLogging debugLogging = new LdapServerDebugLogging(logger);

@BeforeClass
Expand Down Expand Up @@ -163,6 +167,9 @@ public void start() throws Exception {
globalSettings = Settings.builder().put("path.home", createTempDir()).build();
sslService = new SSLService(TestEnvironment.newEnvironment(globalSettings));
licenseState = new TestUtils.UpdatableLicenseState();
final ClusterStateRoleMapper mock = mock(ClusterStateRoleMapper.class);
when(mock.getMappings()).thenReturn(Set.of());
reservedRoleMappings = new ReservedRoleMappings(mock);

// Verify we can connect to each server. Tests will fail in strange ways if this isn't true
Arrays.stream(directoryServers).forEachOrdered(ds -> tryConnect(ds));
Expand Down Expand Up @@ -438,7 +445,13 @@ public void testRealmWithTemplatedRoleMapping() throws Exception {
ScriptModule.CORE_CONTEXTS,
() -> 1L
);
NativeRoleMappingStore roleMapper = new NativeRoleMappingStore(settings, mockClient, mockSecurityIndex, scriptService) {
NativeRoleMappingStore roleMapper = new NativeRoleMappingStore(
settings,
mockClient,
mockSecurityIndex,
scriptService,
reservedRoleMappings
) {
@Override
protected void loadMappings(ActionListener<List<ExpressionRoleMapping>> listener) {
listener.onResponse(Arrays.asList(NativeRoleMappingStore.buildMapping("m1", new BytesArray("""
Expand Down
9 changes: 8 additions & 1 deletion ...in/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
import org.elasticsearch.xpack.security.authc.ldap.support.SessionFactory;
import org.elasticsearch.xpack.security.authc.support.DnRoleMapper;
import org.elasticsearch.xpack.security.authc.support.MockLookupRealm;
import org.elasticsearch.xpack.security.authc.support.mapper.ClusterStateRoleMapper;
import org.elasticsearch.xpack.security.authc.support.mapper.NativeRoleMappingStore;
import org.elasticsearch.xpack.security.authc.support.mapper.ReservedRoleMappings;
import org.elasticsearch.xpack.security.support.SecurityIndexManager;
import org.junit.After;
import org.junit.Before;
Expand All @@ -61,6 +63,7 @@
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -537,11 +540,15 @@ public void testLdapRealmWithTemplatedRoleMapping() throws Exception {
ScriptModule.CORE_CONTEXTS,
() -> 1L
);
final ClusterStateRoleMapper mock = mock(ClusterStateRoleMapper.class);
when(mock.getMappings()).thenReturn(Set.of());
final ReservedRoleMappings reservedRoleMappings = new ReservedRoleMappings(mock);
NativeRoleMappingStore roleMapper = new NativeRoleMappingStore(
defaultGlobalSettings,
mockClient,
mockSecurityIndex,
scriptService
scriptService,
reservedRoleMappings
) {
@Override
protected void loadMappings(ActionListener<List<ExpressionRoleMapping>> listener) {
Expand Down
28 changes: 21 additions & 7 deletions ...va/org/elasticsearch/xpack/security/authc/support/mapper/NativeRoleMappingStoreTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public class NativeRoleMappingStoreTests extends ESTestCase {

private ScriptService scriptService;
private SecurityIndexManager securityIndex;
private ReservedRoleMappings reservedRoleMappings;

@Before
public void setup() {
Expand All @@ -92,6 +93,9 @@ public void setup() {
() -> 1L
);
securityIndex = mockHealthySecurityIndex();
final ClusterStateRoleMapper mock = mock(ClusterStateRoleMapper.class);
when(mock.getMappings()).thenReturn(Set.of());
reservedRoleMappings = new ReservedRoleMappings(mock);
}

public void testResolveRoles() throws Exception {
Expand Down Expand Up @@ -148,8 +152,13 @@ public void testResolveRoles() throws Exception {
);

final Client client = mock(Client.class);

final NativeRoleMappingStore store = new NativeRoleMappingStore(Settings.EMPTY, client, securityIndex, scriptService) {
final NativeRoleMappingStore store = new NativeRoleMappingStore(
Settings.EMPTY,
client,
securityIndex,
scriptService,
reservedRoleMappings
) {
@Override
protected void loadMappings(ActionListener<List<ExpressionRoleMapping>> listener) {
final List<ExpressionRoleMapping> mappings = Arrays.asList(mapping1, mapping2, mapping3, mapping4);
Expand Down Expand Up @@ -203,7 +212,8 @@ public void testResolveRolesDoesNotUseLastLoadCacheWhenSecurityIndexAvailable()
Settings.builder().put("xpack.security.authz.store.role_mappings.last_load_cache.enabled", "true").build(),
client,
securityIndex,
scriptService
scriptService,
reservedRoleMappings
);

final UserRoleMapper.UserData user = new UserRoleMapper.UserData(
Expand Down Expand Up @@ -245,7 +255,8 @@ public void testResolveRolesUsesLastLoadCacheWhenSecurityIndexUnavailable() thro
Settings.builder().put("xpack.security.authz.store.role_mappings.last_load_cache.enabled", "true").build(),
client,
securityIndex,
scriptService
scriptService,
reservedRoleMappings
);

final UserRoleMapper.UserData user = new UserRoleMapper.UserData(
Expand Down Expand Up @@ -307,7 +318,8 @@ public void testResolveRolesDoesNotUseLastLoadCacheWhenSecurityIndexDoesNotExist
Settings.builder().put("xpack.security.authz.store.role_mappings.last_load_cache.enabled", "true").build(),
client,
securityIndex,
scriptService
scriptService,
reservedRoleMappings
);

final UserRoleMapper.UserData user = new UserRoleMapper.UserData(
Expand Down Expand Up @@ -508,7 +520,8 @@ public void testPutRoleMappingWillValidateTemplateRoleNamesBeforeSave() {
Settings.EMPTY,
mock(Client.class),
mock(SecurityIndexManager.class),
scriptService
scriptService,
reservedRoleMappings
);
expectThrows(IllegalArgumentException.class, () -> nativeRoleMappingStore.putRoleMapping(putRoleMappingRequest, null));
}
Expand Down Expand Up @@ -545,7 +558,8 @@ private NativeRoleMappingStore buildRoleMappingStoreForInvalidationTesting(
Settings.EMPTY,
client,
mock(SecurityIndexManager.class),
mock(ScriptService.class)
mock(ScriptService.class),
reservedRoleMappings
);

if (attachRealm) {
Expand Down

0 comments on commit 19fe01a

Please sign in to comment.