You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/05/01 14:15:54 UTC

svn commit: r1477967 - /archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java

Author: olamy
Date: Wed May  1 12:15:54 2013
New Revision: 1477967

URL: http://svn.apache.org/r1477967
Log:
ensure we use ssl and ldaps is deprecated

Modified:
    archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java

Modified: archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java?rev=1477967&r1=1477966&r2=1477967&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java (original)
+++ archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java Wed May  1 12:15:54 2013
@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 import java.util.Collections;
@@ -153,7 +154,7 @@ public class LdapConnection
 
         if ( config.getHostname() != null )
         {
-            String protocol = config.isSsl() ? "ldaps" : "ldap";
+            String protocol = "ldap";// config.isSsl() ? "ldaps" : "ldap";
             if ( config.getPort() != 0 )
             {
                 env.put( Context.PROVIDER_URL, protocol + "://" + config.getHostname() + ":" + config.getPort() + "/" );
@@ -164,6 +165,11 @@ public class LdapConnection
             }
         }
 
+        if ( config.isSsl() )
+        {
+            env.put( Context.SECURITY_PROTOCOL, "ssl" );
+        }
+
         if ( config.getAuthenticationMethod() != null )
         {
             env.put( Context.SECURITY_AUTHENTICATION, config.getAuthenticationMethod() );