[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: attribute-resolver-full.xml attribute-res...

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Nov 21 01:51:30 2014
New Revision: 6986

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6986&view=rev
Log:
Wire a default SslConfig in the authn config which uses trust certificates.
Add property for fail fast pool init.
Add startTLS property to attribute resolver examples.

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml?rev=6986&r1=6985&r2=6986&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml Fri Nov 21 01:51:30 2014
@@ -311,12 +311,16 @@
         ldapURL="%{idp.attribute.resolver.LDAP.ldapURL}"
         baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
         principal="%{idp.attribute.resolver.LDAP.bindDN}"
-        principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}">
+        principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}"
+        useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS}">
         <dc:FilterTemplate>
             <![CDATA[
                 (uid=${requestContext.principalName})
             ]]>
         </dc:FilterTemplate>
+        <dc:StartTLSTrustCredential id="LDAPtoIdPCredential" xsi:type="security:X509Filesystem" xmlns:security="urn:mace:shibboleth:2.0:security">
+          <security:Certificate>%{idp.attribute.resolver.LDAP.trustCertificates}</security:Certificate>
+        </dc:StartTLSTrustCredential>
     </resolver:DataConnector>
     -->
     

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml?rev=6986&r1=6985&r2=6986&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml Fri Nov 21 01:51:30 2014
@@ -78,12 +78,16 @@
         ldapURL="%{idp.attribute.resolver.LDAP.ldapURL}"
         baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
         principal="%{idp.attribute.resolver.LDAP.bindDN}"
-        principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}">
+        principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}"
+        useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS}">
         <dc:FilterTemplate>
             <![CDATA[
                 (uid=${requestContext.principalName})
             ]]>
         </dc:FilterTemplate>
+        <dc:StartTLSTrustCredential id="LDAPtoIdPCredential" xsi:type="security:X509Filesystem" xmlns:security="urn:mace:shibboleth:2.0:security">
+          <security:Certificate>%{idp.attribute.resolver.LDAP.trustCertificates}</security:Certificate>
+        </dc:StartTLSTrustCredential>
     </resolver:DataConnector>
     -->
 

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=6986&r1=6985&r2=6986&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml Fri Nov 21 01:51:30 2014
@@ -17,10 +17,22 @@
 
     <!-- Connection Configuration -->
     <bean id="connectionConfig" class="org.ldaptive.ConnectionConfig" abstract="true" p:ldapUrl="%{idp.authn.LDAP.ldapURL}"
-        p:useStartTLS="%{idp.authn.LDAP.useStartTLS}" p:useSSL="%{idp.authn.LDAP.useSSL}" p:connectTimeout="%{idp.authn.LDAP.connectTimeout}" />
-    <!-- Having SSL trust issues? Configure trust by adding <bean id="sslConfig" class="org.ldaptive.ssl.SslConfig"> <property 
-        name="credentialConfig"> <bean class="org.ldaptive.ssl.X509CredentialConfig" p:trustCertificates="file:/path/to/CA.pem" /> 
-        </property> </bean> add p:sslConfig-ref="sslConfig" to each connectionConfig -->
+        p:useStartTLS="%{idp.authn.LDAP.useStartTLS}" p:useSSL="%{idp.authn.LDAP.useSSL}" p:connectTimeout="%{idp.authn.LDAP.connectTimeout}"
+        p:sslConfig-ref="sslConfig" />
+
+    <alias name="%{idp.authn.LDAP.sslConfig}" alias="sslConfig" />
+
+    <bean id="defaultTrust" class="org.ldaptive.ssl.SslConfig" />
+    <bean id="certificateTrust" class="org.ldaptive.ssl.SslConfig">
+      <property name="credentialConfig">

[... 57 lines stripped ...]