[java-identity-provider] branch master updated: Add additional helper beans and some lazy-inits.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=2c3604874f44574a9b033679cebad20338d612b8

The following commit(s) were added to refs/heads/master by this push:
       new  2c36048   Add additional helper beans and some lazy-inits.
2c36048 is described below

commit 2c3604874f44574a9b033679cebad20338d612b8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Apr 4 19:42:28 2017 -0400

    Add additional helper beans and some lazy-inits.
---
 .../resources/system/conf/relying-party-system.xml | 34 ++++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/relying-party-system.xml b/idp-conf/src/main/resources/system/conf/relying-party-system.xml
index 26e1820..d8addd5 100644
--- a/idp-conf/src/main/resources/system/conf/relying-party-system.xml
+++ b/idp-conf/src/main/resources/system/conf/relying-party-system.xml
@@ -59,20 +59,20 @@
     a suite of metadata-driven lookup strategies pre-injected.
     -->
     
-    <bean id="Shibboleth.SSO" parent="AbstractProfileConfig"
+    <bean id="Shibboleth.SSO" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.saml.saml1.profile.config.BrowserSSOProfileConfiguration"
         p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
         p:inboundInterceptorFlows="security-policy/shibboleth-sso" />
         
-    <bean id="SAML1.AttributeQuery" parent="AbstractProfileConfig"
+    <bean id="SAML1.AttributeQuery" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.saml.saml1.profile.config.AttributeQueryProfileConfiguration"
         p:inboundInterceptorFlows="security-policy/saml-soap" />
 
-    <bean id="SAML1.ArtifactResolution" parent="AbstractProfileConfig"
+    <bean id="SAML1.ArtifactResolution" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.saml.saml1.profile.config.ArtifactResolutionProfileConfiguration"
         p:inboundInterceptorFlows="security-policy/saml-soap" />
 
-    <bean id="SAML2.SSO" parent="AbstractProfileConfig"
+    <bean id="SAML2.SSO" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration"
         p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
         p:inboundInterceptorFlows="security-policy/saml2-sso"
@@ -81,40 +81,40 @@
     <util:constant id="SAML2.SSO.FEATURE_AUTHNCONTEXT"
         static-field="net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration.FEATURE_AUTHNCONTEXT"/>
 
-    <bean id="SAML2.ECP" parent="AbstractProfileConfig"
+    <bean id="SAML2.ECP" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.saml.saml2.profile.config.ECPProfileConfiguration"
         p:inboundInterceptorFlows="security-policy/saml2-ecp"
         p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
-    <bean id="SAML2.Logout" parent="AbstractProfileConfig"
+    <bean id="SAML2.Logout" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.saml.saml2.profile.config.SingleLogoutProfileConfiguration"
         p:artifactConfiguration-ref="shibboleth.DefaultArtifactConfiguration"
         p:inboundInterceptorFlows="security-policy/saml2-slo"
         p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
-    <bean id="SAML2.AttributeQuery" parent="AbstractProfileConfig"
+    <bean id="SAML2.AttributeQuery" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.saml.saml2.profile.config.AttributeQueryProfileConfiguration"
         p:inboundInterceptorFlows="security-policy/saml-soap"
         p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
-    <bean id="SAML2.ArtifactResolution" parent="AbstractProfileConfig"
+    <bean id="SAML2.ArtifactResolution" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.saml.saml2.profile.config.ArtifactResolutionProfileConfiguration"
         p:inboundInterceptorFlows="security-policy/saml-soap"
         p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
-    <bean id="Liberty.SSOS" parent="AbstractProfileConfig"
+    <bean id="Liberty.SSOS" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.saml.idwsf.profile.config.SSOSProfileConfiguration"
         p:inboundInterceptorFlows="security-policy/saml2-idwsf-ssos"
         p:encryptionOptionalPredicate="%{idp.encryption.optional:false}" />
 
-    <bean id="CAS.LoginConfiguration" parent="AbstractProfileConfig"
+    <bean id="CAS.LoginConfiguration" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.cas.config.impl.LoginConfiguration" />
 
-    <bean id="CAS.ProxyConfiguration" parent="AbstractProfileConfig"
+    <bean id="CAS.ProxyConfiguration" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.cas.config.impl.ProxyConfiguration" />
 
     <!-- Ticket validity period applies to proxy-granting tickets created upon successful proxy callback validation -->
-    <bean id="CAS.ValidateConfiguration" parent="AbstractProfileConfig"
+    <bean id="CAS.ValidateConfiguration" parent="AbstractProfileConfig" lazy-init="true"
         class="net.shibboleth.idp.cas.config.impl.ValidateConfiguration"
         p:ticketValidityPeriod="PT12H" />
 
@@ -172,6 +172,16 @@
 
     </bean>
 
+    <!-- Convenience beans for directly injecting SHA-1 or SHA-256 usage.  -->
+    
+    <bean id="shibboleth.SecurityConfiguration.SHA256" parent="shibboleth.DefaultSecurityConfiguration" lazy-init="true"
+        p:signatureSigningConfiguration-ref="shibboleth.SigningConfiguration.SHA256" />
+
+    <bean id="shibboleth.SecurityConfiguration.SHA1" parent="shibboleth.DefaultSecurityConfiguration" lazy-init="true"
+        p:signatureSigningConfiguration-ref="shibboleth.SigningConfiguration.SHA1" />
+
+    <!-- Actual signing configurations for SHA-256 and SHA-1. -->
+    
     <bean id="shibboleth.SigningConfiguration.SHA256" parent="shibboleth.BasicSignatureSigningConfiguration"
             p:signingCredentials-ref="shibboleth.DefaultSigningCredential">
         <property name="signatureAlgorithms">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.