[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring: pom.xml src/main/java/net/shibboleth/idp/att...

[noreply at shibboleth.net]

Author: rdw
Date: Mon May  5 08:52:58 2014
New Revision: 5836

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5836&view=rev
Log:
IDP-390 Use the Credential parsers from idp-profile-impl when looking for parameters to plug into the LDAP SSL connection

Added:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/CredentialConfigFactoryBean.java   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/pom.xml
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/X509CredentialSupport.java

Modified: trunk/idp-attribute-resolver-spring/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/pom.xml?rev=5836&r1=5835&r2=5836&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/pom.xml (original)
+++ trunk/idp-attribute-resolver-spring/pom.xml Mon May  5 08:52:58 2014
@@ -86,6 +86,13 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-profile-spring</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        
 
         <!-- Test Dependencies -->
         <dependency>

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java?rev=5836&r1=5835&r2=5836&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java Mon May  5 08:52:58 2014
@@ -17,8 +17,6 @@
 
 package net.shibboleth.idp.attribute.resolver.spring.dc.ldap;
 
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
 import java.util.List;
 
 import javax.annotation.Nonnull;
@@ -30,6 +28,7 @@
 import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.CacheConfigParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.DataConnectorNamespaceHandler;
+import net.shibboleth.idp.spring.SpringSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.AttributeSupport;
@@ -56,9 +55,7 @@
 import org.ldaptive.provider.ConnectionStrategy;
 import org.ldaptive.sasl.Mechanism;
 import org.ldaptive.sasl.SaslConfig;
-import org.ldaptive.ssl.CredentialConfigFactory;
 import org.ldaptive.ssl.SslConfig;
-import org.opensaml.security.x509.X509Credential;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
@@ -197,6 +194,9 @@
         /** LDAPDirectory XML element. */
         private final Element configElement;
 
+        /** Class logger. */
+        private final Logger log = LoggerFactory.getLogger(V2Parser.class);
+
         /**
          * Creates a new V2Parser with the supplied LDAPDirectory element.
          * 
@@ -228,8 +228,7 @@
             if (useStartTLS != null) {
                 connectionConfig.addPropertyValue("useStartTLS", useStartTLS);
             }
-            final BeanDefinitionBuilder sslConfig =
-                    BeanDefinitionBuilder.genericBeanDefinition(SslConfig.class);
+            final BeanDefinitionBuilder sslConfig = BeanDefinitionBuilder.genericBeanDefinition(SslConfig.class);
             sslConfig.addPropertyValue("credentialConfig", createCredentialConfig(parserContext));
             connectionConfig.addPropertyValue("sslConfig", sslConfig.getBeanDefinition());
             final BeanDefinitionBuilder connectionInitializer =
@@ -263,31 +262,35 @@
          * @return credential config
          */
         @Nonnull protected BeanDefinition createCredentialConfig(@Nonnull final ParserContext parserContext) {
-            X509Certificate[] trustCerts = null;
-                      
-            final X509Credential trustCredential =
-                    X509CredentialSupport.parseX509Credential(ElementSupport.getFirstChildElement(configElement,
-                            new QName(DataConnectorNamespaceHandler.NAMESPACE, "StartTLSTrustCredential")));
-            if (trustCredential != null) {
-                trustCerts =

[... 51 lines stripped ...]