[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/global-system.xml idp-conf/src/mai...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Aug 20 21:08:17 2014
New Revision: 6452

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6452&view=rev
Log:
OSJ-85: IdP wiring and flow additions.

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/ClientTLSValidationConfigurationLookupFunction.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=6452&r1=6451&r2=6452&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Wed Aug 20 21:08:17 2014
@@ -172,6 +172,8 @@
     <bean id="shibboleth.EncryptionParametersResolver"
         class="org.opensaml.saml.security.impl.SAMLMetadataEncryptionParametersResolver"
         c:resolver-ref="shibboleth.MetadataCredentialResolver" />
+    <bean id="shibboleth.ClientTLSValidationParametersResolver"
+        class="org.opensaml.security.x509.tls.impl.BasicClientTLSValidationParametersResolver" />
 
     <bean id="shibboleth.RoleDescriptorResolver" class="org.opensaml.saml.metadata.resolver.impl.BasicRoleDescriptorResolver"
         c:mdResolver-ref="shibboleth.MetadataResolver" />

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=6452&r1=6451&r2=6452&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml Wed Aug 20 21:08:17 2014
@@ -128,6 +128,11 @@
                 p:encryptedKeyResolver-ref="defaultEncryptedKeyResolver" />
         </property>
 
+        <property name="clientTLSValidationConfiguration">
+            <bean class="org.opensaml.security.x509.tls.impl.BasicClientTLSCredentialValidationConfiguration"
+                p:x509TrustEngine-ref="shibboleth.X509TrustEngine" />
+        </property>
+
     </bean>
 
     <bean id="shibboleth.SigningConfiguration.SHA256" class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=6452&r1=6451&r2=6452&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Wed Aug 20 21:08:17 2014
@@ -97,6 +97,9 @@
     <bean id="shibboleth.EncryptionConfigurationLookup"
         class="net.shibboleth.idp.profile.config.navigate.EncryptionConfigurationLookupFunction"
         p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
+    <bean id="shibboleth.ClientTLSValidationConfigurationLookup"
+        class="net.shibboleth.idp.profile.config.navigate.ClientTLSValidationConfigurationLookupFunction"
+        p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
 
     <util:list id="shibboleth.SAML1Status.VersionMismatch">
         <util:constant static-field="org.opensaml.saml.saml1.core.StatusCode.VERSION_MISMATCH" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=6452&r1=6451&r2=6452&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Wed Aug 20 21:08:17 2014
@@ -99,6 +99,11 @@
         class="org.opensaml.profile.action.impl.PopulateSignatureValidationParameters" scope="prototype"
         p:configurationLookupStrategy-ref="shibboleth.SignatureValidationConfigurationLookup"
         p:signatureValidationParametersResolver-ref="shibboleth.SignatureValidationParametersResolver" />
+
+    <bean id="PopulateClientTLSValidationParameters"
+        class="org.opensaml.profile.action.impl.PopulateClientTLSValidationParameters" scope="prototype"
+        p:configurationLookupStrategy-ref="shibboleth.ClientTLSValidationConfigurationLookup"

[... 19 lines stripped ...]