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

add realm name to connection pool log message 

See elastic/elasticsearch#325

Original commit: elastic/x-pack-elasticsearch@c25019cbb9
This commit is contained in:
jaymode 2015-08-04 07:34:39 -04:00
parent a7645ed4f0
commit 571c04dd79
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shield/src/main/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactory.java
View File

@ -41,13 +41,12 @@ public class LdapUserSearchSessionFactory extends SessionFactory {
private final LdapSearchScope scope; private final LdapSearchScope scope;
private final String userAttribute; private final String userAttribute;
private final ServerSet serverSet; private final ServerSet serverSet;
private final Settings settings;
private LDAPConnectionPool connectionPool; private LDAPConnectionPool connectionPool;
public LdapUserSearchSessionFactory(RealmConfig config, ClientSSLService sslService) { public LdapUserSearchSessionFactory(RealmConfig config, ClientSSLService sslService) {
super(config); super(config);
settings = config.settings(); Settings settings = config.settings();
userSearchBaseDn = settings.get("user_search.base_dn"); userSearchBaseDn = settings.get("user_search.base_dn");
if (userSearchBaseDn == null) { if (userSearchBaseDn == null) {
throw new IllegalArgumentException("user_search base_dn must be specified"); throw new IllegalArgumentException("user_search base_dn must be specified");
@ -55,16 +54,16 @@ public class LdapUserSearchSessionFactory extends SessionFactory {
scope = LdapSearchScope.resolve(settings.get("user_search.scope"), LdapSearchScope.SUB_TREE); scope = LdapSearchScope.resolve(settings.get("user_search.scope"), LdapSearchScope.SUB_TREE);
userAttribute = settings.get("user_search.attribute", DEFAULT_USERNAME_ATTRIBUTE); userAttribute = settings.get("user_search.attribute", DEFAULT_USERNAME_ATTRIBUTE);
serverSet = serverSet(settings, sslService); serverSet = serverSet(settings, sslService);
connectionPool = createConnectionPool(settings, serverSet, timeout, logger); connectionPool = createConnectionPool(config, serverSet, timeout, logger);
groupResolver = groupResolver(settings); groupResolver = groupResolver(settings);
} }
private synchronized LDAPConnectionPool connectionPool() throws IOException { private synchronized LDAPConnectionPool connectionPool() throws IOException {
if (connectionPool == null) { if (connectionPool == null) {
connectionPool = createConnectionPool(settings, serverSet, timeout, logger); connectionPool = createConnectionPool(config, serverSet, timeout, logger);
// if it is still null throw an exception // if it is still null throw an exception
if (connectionPool == null) { if (connectionPool == null) {
throw new IOException("failed to create a connection pool as no LDAP servers are available"); throw new IOException("failed to create a connection pool for realm [" + config.name() + "] as no LDAP servers are available");
} }
} }
@ -77,7 +76,8 @@ public class LdapUserSearchSessionFactory extends SessionFactory {
filter.filterOut("shield.authc.realms." + realmName + "." + HOSTNAME_VERIFICATION_SETTING); filter.filterOut("shield.authc.realms." + realmName + "." + HOSTNAME_VERIFICATION_SETTING);
} }
static LDAPConnectionPool createConnectionPool(Settings settings, ServerSet serverSet, TimeValue timeout, ESLogger logger) { static LDAPConnectionPool createConnectionPool(RealmConfig config, ServerSet serverSet, TimeValue timeout, ESLogger logger) {
Settings settings = config.settings();
SimpleBindRequest bindRequest = bindRequest(settings); SimpleBindRequest bindRequest = bindRequest(settings);
int initialSize = settings.getAsInt("user_search.pool.initial_size", DEFAULT_CONNECTION_POOL_INITIAL_SIZE); int initialSize = settings.getAsInt("user_search.pool.initial_size", DEFAULT_CONNECTION_POOL_INITIAL_SIZE);
int size = settings.getAsInt("user_search.pool.size", DEFAULT_CONNECTION_POOL_SIZE); int size = settings.getAsInt("user_search.pool.size", DEFAULT_CONNECTION_POOL_SIZE);
@ -101,9 +101,9 @@ public class LdapUserSearchSessionFactory extends SessionFactory {
return pool; return pool;
} catch (LDAPException e) { } catch (LDAPException e) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("unable to create connection pool", e); logger.debug("unable to create connection pool for realm [{}]", e, config.name());
} else { } else {
logger.error("unable to create connection pool: {}", e.getMessage()); logger.error("unable to create connection pool for realm [{}]: {}", config.name(), e.getMessage());
} }
} }
return null; return null;

4
shield/src/test/java/org/elasticsearch/shield/authc/ldap/LdapUserSearchSessionFactoryTests.java
View File

@ -319,7 +319,7 @@ public class LdapUserSearchSessionFactoryTests extends LdapTestCase {
.put("bind_password", "pass") .put("bind_password", "pass")
.build(), globalSettings); .build(), globalSettings);
LDAPConnectionPool connectionPool = LdapUserSearchSessionFactory.createConnectionPool(config.settings(), new SingleServerSet("localhost", ldapServer.getListenPort()), TimeValue.timeValueSeconds(5), NoOpLogger.INSTANCE); LDAPConnectionPool connectionPool = LdapUserSearchSessionFactory.createConnectionPool(config, new SingleServerSet("localhost", ldapServer.getListenPort()), TimeValue.timeValueSeconds(5), NoOpLogger.INSTANCE);
try { try {
assertThat(connectionPool.getCurrentAvailableConnections(), is(LdapUserSearchSessionFactory.DEFAULT_CONNECTION_POOL_INITIAL_SIZE)); assertThat(connectionPool.getCurrentAvailableConnections(), is(LdapUserSearchSessionFactory.DEFAULT_CONNECTION_POOL_INITIAL_SIZE));
assertThat(connectionPool.getMaximumAvailableConnections(), is(LdapUserSearchSessionFactory.DEFAULT_CONNECTION_POOL_SIZE)); assertThat(connectionPool.getMaximumAvailableConnections(), is(LdapUserSearchSessionFactory.DEFAULT_CONNECTION_POOL_SIZE));
@ -346,7 +346,7 @@ public class LdapUserSearchSessionFactoryTests extends LdapTestCase {
.put("user_search.pool.health_check.enabled", false) .put("user_search.pool.health_check.enabled", false)
.build(), globalSettings); .build(), globalSettings);
LDAPConnectionPool connectionPool = LdapUserSearchSessionFactory.createConnectionPool(config.settings(), new SingleServerSet("localhost", ldapServer.getListenPort()), TimeValue.timeValueSeconds(5), NoOpLogger.INSTANCE); LDAPConnectionPool connectionPool = LdapUserSearchSessionFactory.createConnectionPool(config, new SingleServerSet("localhost", ldapServer.getListenPort()), TimeValue.timeValueSeconds(5), NoOpLogger.INSTANCE);
try { try {
assertThat(connectionPool.getCurrentAvailableConnections(), is(10)); assertThat(connectionPool.getCurrentAvailableConnections(), is(10));
assertThat(connectionPool.getMaximumAvailableConnections(), is(12)); assertThat(connectionPool.getMaximumAvailableConnections(), is(12));