[java-identity-provider COMMIT] in /trunk: idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KeystoreResourc...

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Dec 19 00:19:53 2014
New Revision: 7167

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7167&view=rev
Log:
IDP-522
Add X509 and Keystore CredentialConfig implementations.

Added:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfig.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfig.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/auth-cert.pem
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/keystore.jks   (with props)
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/private-key.pem
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/trust-certs.pem
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/truststore.jks   (with props)
Modified:
    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/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=7167&r1=7166&r2=7167&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 Dec 19 00:19:53 2014
@@ -29,12 +29,12 @@
     <bean id="defaultTrust" class="org.ldaptive.ssl.SslConfig" />
     <bean id="certificateTrust" class="org.ldaptive.ssl.SslConfig">
       <property name="credentialConfig">
-        <bean class="org.ldaptive.ssl.X509CredentialConfig" p:trustCertificates="%{idp.authn.LDAP.trustCertificates}" /> 
+        <bean class="net.shibboleth.idp.authn.impl.X509ResourceCredentialConfig" p:trustCertificates="%{idp.authn.LDAP.trustCertificates}" /> 
       </property>
     </bean>
     <bean id="keyStoreTrust" class="org.ldaptive.ssl.SslConfig">
       <property name="credentialConfig">
-        <bean class="org.ldaptive.ssl.KeyStoreCredentialConfig" p:trustStore="%{idp.authn.LDAP.trustStore}" /> 
+        <bean class="net.shibboleth.idp.authn.impl.KeystoreResourceCredentialConfig" p:trustStore="%{idp.authn.LDAP.trustStore}" /> 
       </property>
     </bean>
 

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=7167&r1=7166&r2=7167&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties Fri Dec 19 00:19:53 2014
@@ -12,9 +12,9 @@
 ## SSL configuration, either defaultTrust, certificateTrust, or keyStoreTrust ##
 #idp.authn.LDAP.sslConfig                       = defaultTrust
 ## If using certificateTrust above, set to the trusted certificate's path
-idp.authn.LDAP.trustCertificates                = file:%{idp.home}/credentials/ldap-server.crt
+idp.authn.LDAP.trustCertificates                = %{idp.home}/credentials/ldap-server.crt
 ## If using keyStoreTrust above, set to the truststore path
-idp.authn.LDAP.trustStore                       = file:%{idp.home}/credentials/ldap-server.truststore
+idp.authn.LDAP.trustStore                       = %{idp.home}/credentials/ldap-server.truststore
 
 ## Return attributes ##
 idp.authn.LDAP.returnAttributes                 = cn,businessCategory,mail