[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/utilities.xml idp-profile-impl/src...

[noreply at shibboleth.net]

Author: scantor
Date: Fri May  9 23:20:05 2014
New Revision: 5899

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5899&view=rev
Log:
Refactor security configuration handling to allow for IdP default configs.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/EncryptionConfigurationLookupFunction.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureSigningConfigurationLookupFunction.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/SignatureValidationConfigurationLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/PopulateEncryptionParameters.java

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=5899&r1=5898&r2=5899&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Fri May  9 23:20:05 2014
@@ -39,13 +39,17 @@
         class="net.shibboleth.idp.profile.context.navigate.RelyingPartyIdLookupFunction" />
 
     <bean id="shibboleth.SignatureValidationConfigurationLookup"
-        class="net.shibboleth.idp.profile.config.navigate.SignatureValidationConfigurationLookupFunction" />
+        class="net.shibboleth.idp.profile.config.navigate.SignatureValidationConfigurationLookupFunction"
+        p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
     <bean id="shibboleth.SignatureSigningConfigurationLookup"
-        class="net.shibboleth.idp.profile.config.navigate.SignatureSigningConfigurationLookupFunction" />
+        class="net.shibboleth.idp.profile.config.navigate.SignatureSigningConfigurationLookupFunction"
+        p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
     <bean id="shibboleth.DecryptionConfigurationLookup"
-        class="net.shibboleth.idp.profile.config.navigate.DecryptionConfigurationLookupFunction" />
+        class="net.shibboleth.idp.profile.config.navigate.DecryptionConfigurationLookupFunction"
+        p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
     <bean id="shibboleth.EncryptionConfigurationLookup"
-        class="net.shibboleth.idp.profile.config.navigate.EncryptionConfigurationLookupFunction" />
+        class="net.shibboleth.idp.profile.config.navigate.EncryptionConfigurationLookupFunction"
+        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-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java?rev=5899&r1=5898&r2=5899&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/navigate/DecryptionConfigurationLookupFunction.java Fri May  9 23:20:05 2014
@@ -17,32 +17,38 @@
 
 package net.shibboleth.idp.profile.config.navigate;
 
-import javax.annotation.Nonnull;
+import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.profile.config.ProfileConfiguration;
+import net.shibboleth.idp.profile.config.SecurityConfiguration;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
 
 import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.opensaml.xmlsec.DecryptionConfiguration;
+import org.opensaml.xmlsec.SecurityConfigurationSupport;
 
 import com.google.common.base.Function;
+import com.google.common.collect.Lists;
 
 /**
- * A function that returns a {@link DecryptionConfiguration} by way of a {@link RelyingPartyContext}
- * obtained via a lookup function, by default a child of the {@link ProfileRequestContext}.
+ * A function that returns a {@link DecryptionConfiguration} list by way of various lookup strategies.
  * 
  * <p>If a specific setting is unavailable, a null value is returned.</p>
  */

[... 633 lines stripped ...]