Skip to content
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

Miscellaneous fixes for LDAP SDK v6 upgrade #79891

Merged
merged 1 commit into from
Oct 28, 2021
Merged

Miscellaneous fixes for LDAP SDK v6 upgrade #79891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions ...in/security/src/test/java/org/elasticsearch/xpack/security/authc/ldap/LdapRealmTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,11 @@ public void testLdapRealmMapsUserDNToRole() throws Exception {
PlainActionFuture<AuthenticationResult<User>> future = new PlainActionFuture<>();
ldap.authenticate(new UsernamePasswordToken("Horatio Hornblower", new SecureString(PASSWORD)), future);
final AuthenticationResult<User> result = future.actionGet();
assertThat(result.getStatus(), is(AuthenticationResult.Status.SUCCESS));
assertThat(result, notNullValue());
assertThat(result.toString(), result.getStatus(), is(AuthenticationResult.Status.SUCCESS));
User user = result.getValue();
assertThat(user, notNullValue());
assertThat(user.roles(), arrayContaining("avenger"));
assertThat(user.toString(), user.roles(), arrayContaining("avenger"));
}

/**
Expand Down Expand Up @@ -488,7 +489,8 @@ protected void loadMappings(ActionListener<List<ExpressionRoleMapping>> listener
PlainActionFuture<AuthenticationResult<User>> future = new PlainActionFuture<>();
ldap.authenticate(new UsernamePasswordToken("Horatio Hornblower", new SecureString(PASSWORD)), future);
final AuthenticationResult<User> result = future.actionGet();
assertThat(result.getStatus(), is(AuthenticationResult.Status.SUCCESS));
assertThat(result, notNullValue());
assertThat(result.toString(), result.getStatus(), is(AuthenticationResult.Status.SUCCESS));
User user = result.getValue();
assertThat(user, notNullValue());
assertThat(user.roles(), arrayContainingInAnyOrder("_user_hhornblo", "sales_admin"));
Expand Down Expand Up @@ -519,7 +521,8 @@ public void testLdapConnectionFailureIsTreatedAsAuthenticationFailure() throws E
PlainActionFuture<AuthenticationResult<User>> future = new PlainActionFuture<>();
ldap.authenticate(new UsernamePasswordToken(VALID_USERNAME, new SecureString(PASSWORD)), future);
final AuthenticationResult<User> result = future.actionGet();
assertThat(result.getStatus(), is(AuthenticationResult.Status.CONTINUE));
assertThat(result, notNullValue());
assertThat(result.toString(), result.getStatus(), is(AuthenticationResult.Status.CONTINUE));
assertThat(result.getValue(), nullValue());
assertThat(result.getMessage(), is("authenticate failed"));
assertThat(result.getException(), notNullValue());
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolverInMemoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class SearchGroupsResolverInMemoryTests extends LdapTestCase {
@After
public void closeConnection() {
if (connection != null) {
connection.close();
connection.closeWithoutUnbind();
}
}

Expand Down
1 change: 1 addition & 0 deletions ...test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapServerDebugLogging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ protected void failed(Throwable e, Description description) {
}

public void configure(InMemoryDirectoryServerConfig config) {
targetLogger.info("Configuring debug logging for LDAP server [{}]", config);
config.setLDAPDebugLogHandler(logHandler);
}

Expand Down
2 changes: 1 addition & 1 deletion ...urity/src/test/java/org/elasticsearch/xpack/security/authc/ldap/support/LdapTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ void tryConnect(InMemoryDirectoryServer ds) {
AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
try (var c = ds.getConnection()) {
assertThat("Failed to connect to " + ds + " - ", c.isConnected(), is(true));
logger.info("Test connection to [{}] was successful ({})", ds, c);
logger.info("Test connection to [{}](port {}) was successful ({})", ds, ds.getListenPort(), c);
} catch (LDAPException e) {
throw new AssertionError("Failed to connect to " + ds, e);
}
Expand Down