You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/03/22 15:11:10 UTC
svn commit: r1459785 -
/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
Author: jbonofre
Date: Fri Mar 22 14:11:10 2013
New Revision: 1459785
URL: http://svn.apache.org/r1459785
Log:
[KARAF-2237] SSL timeout is now configurable in the LDAPLoginModule
Modified:
karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
Modified: karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java?rev=1459785&r1=1459784&r2=1459785&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java (original)
+++ karaf/trunk/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPLoginModule.java Fri Mar 22 14:11:10 2013
@@ -62,6 +62,7 @@ public class LDAPLoginModule extends Abs
public final static String SSL_KEYSTORE = "ssl.keystore";
public final static String SSL_KEYALIAS = "ssl.keyalias";
public final static String SSL_TRUSTSTORE = "ssl.truststore";
+ public final static String SSL_TIMEOUT = "ssl.timeout";
public final static String DEFAULT_INITIAL_CONTEXT_FACTORY = "com.sun.jndi.ldap.LdapCtxFactory";
@@ -84,6 +85,7 @@ public class LDAPLoginModule extends Abs
private String sslKeystore;
private String sslKeyAlias;
private String sslTrustStore;
+ private int sslTimeout = 10;
public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, Map<String, ?> options) {
super.initialize(subject, callbackHandler, options);
@@ -118,6 +120,7 @@ public class LDAPLoginModule extends Abs
sslKeystore = (String) options.get(SSL_KEYSTORE);
sslKeyAlias = (String) options.get(SSL_KEYALIAS);
sslTrustStore = (String) options.get(SSL_TRUSTSTORE);
+ sslTimeout = (Integer) options.get(SSL_TIMEOUT);
}
public boolean login() throws LoginException {
@@ -277,7 +280,7 @@ public class LDAPLoginModule extends Abs
env.put("java.naming.ldap.factory.socket", ManagedSSLSocketFactory.class.getName());
ref = bundleContext.getServiceReference(KeystoreManager.class.getName());
KeystoreManager manager = (KeystoreManager) bundleContext.getService(ref);
- SSLSocketFactory factory = manager.createSSLFactory(sslProvider, sslProtocol, sslAlgorithm, sslKeystore, sslKeyAlias, sslTrustStore);
+ SSLSocketFactory factory = manager.createSSLFactory(sslProvider, sslProtocol, sslAlgorithm, sslKeystore, sslKeyAlias, sslTrustStore, sslTimeout);
ManagedSSLSocketFactory.setSocketFactory(factory);
Thread.currentThread().setContextClassLoader(ManagedSSLSocketFactory.class.getClassLoader());
} catch (Exception e) {