[java-identity-provider COMMIT] in /trunk: idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingParty...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 28 06:59:22 2014
New Revision: 5775

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5775&view=rev
Log:
IDP-390 Add explicit SecurityConfiguration defaults for each profile type.  Add a mechism to lookup same in to RelyingPartyConfigurationResvoler.

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/impl/SelectRelyingPartyConfigurationTest.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java?rev=5775&r1=5774&r2=5775&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationResolver.java Mon Apr 28 06:59:22 2014
@@ -17,14 +17,23 @@
 
 package net.shibboleth.idp.relyingparty;
 
-import org.opensaml.profile.context.ProfileRequestContext;
-
+import net.shibboleth.idp.profile.config.SecurityConfiguration;
 import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
 import net.shibboleth.utilities.java.support.component.InitializableComponent;
 import net.shibboleth.utilities.java.support.resolver.Resolver;
+
+import org.opensaml.profile.context.ProfileRequestContext;
 
 /** Resolves a {@link RelyingPartyConfiguration} for a given profile request context. */
 public interface RelyingPartyConfigurationResolver extends Resolver<RelyingPartyConfiguration, ProfileRequestContext>,
         IdentifiedComponent, InitializableComponent {
 
+    /**
+     * Return the default security configuration for the profile.
+     * 
+     * @param profileId The profile id (available from
+     *            {@link net.shibboleth.idp.profile.config.ProfileConfiguration#getId()}
+     * @return the configured default configuration.
+     */
+    SecurityConfiguration getDefaultSecurityConfiguration(String profileId);
 }

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java?rev=5775&r1=5774&r2=5775&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/DefaultRelyingPartyConfigurationResolver.java Mon Apr 28 06:59:22 2014
@@ -21,10 +21,12 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.idp.profile.config.SecurityConfiguration;
 import net.shibboleth.idp.profile.logic.AnonymousProfilePredicate;
 import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
 import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
@@ -76,6 +78,9 @@
     /** The predicate which decides if this context is "Anonymous". */
     @NonnullAfterInit private Predicate<ProfileRequestContext> isAnonymousPredicate;
 
+    /** The map from profile ID to {@link SecurtyConfiguration}. */
+    @Nonnull private Map<String, SecurityConfiguration> securityConfigurationMap = Collections.EMPTY_MAP;
+
     /** Constructor. */
     public DefaultRelyingPartyConfigurationResolver() {
         rpConfigurations = Collections.emptyList();
@@ -160,6 +165,24 @@
      */
     public void setIsAnonymousPredicate(Predicate<ProfileRequestContext> predicate) {
         isAnonymousPredicate = predicate;
+    }
+
+    /**
+     * Return the map we use to look up default configuration.
+     * 
+     * @return Returns the Map.
+     */
+    @Nonnull public Map<String, SecurityConfiguration> getSecurityConfigurationMap() {
+        return Collections.unmodifiableMap(securityConfigurationMap);
+    }
+
+    /**
+     * Set the map we use to look up default configuration.
+     * 

[... 483 lines stripped ...]