Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1970 Clean up LDAP connection in JAAS login module

This commit is contained in:
gtully 2018-07-06 12:38:20 -05:00 committed by Justin Bertram
parent a63b0315c4
commit 2ff4faab05
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/LDAPLoginModule.java
View File

@ -220,6 +220,7 @@ public class LDAPLoginModule implements LoginModule {
private void clear() {
username = null;
userAuthenticated = false;
closeContext();
}
@Override

24
artemis-server/src/test/java/org/apache/activemq/artemis/core/security/jaas/LDAPLoginModuleTest.java
View File

@ -45,6 +45,7 @@ import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.jboss.logging.Logger;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@ -60,6 +61,8 @@ import static org.junit.Assert.fail;
@ApplyLdifFiles("test.ldif")
public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
private static final Logger logger = Logger.getLogger(LDAPLoginModuleTest.class);
private static final String PRINCIPAL = "uid=admin,ou=system";
private static final String CREDENTIALS = "secret";
@ -109,6 +112,8 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
@Test
public void testLogin() throws LoginException {
logger.info("num session: " + ldapServer.getLdapSessionManager().getSessions().length);
LoginContext context = new LoginContext("LDAPLogin", new CallbackHandler() {
@Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
@ -125,6 +130,24 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
});
context.login();
context.logout();
assertTrue("no sessions after logout", waitForSessions(0));
}
private boolean waitForSessions(int expected) {
final long expiry = System.currentTimeMillis() + 5000;
int numSession = ldapServer.getLdapSessionManager().getSessions().length;
while (numSession != expected && System.currentTimeMillis() < expiry) {
try {
TimeUnit.MILLISECONDS.sleep(100);
} catch (InterruptedException ok) {
break;
}
numSession = ldapServer.getLdapSessionManager().getSessions().length;
logger.info("num session " + numSession);
}
return numSession == expected;
}
@Test
@ -150,6 +173,7 @@ public class LDAPLoginModuleTest extends AbstractLdapTestUnit {
return;
}
fail("Should have failed authenticating");
assertTrue("no sessions after logout", waitForSessions(0));
}
@Test