[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/profile-defaults.xml idp-profile-api/src/...

[noreply at shibboleth.net]

Author: scantor
Date: Thu May  8 20:36:32 2014
New Revision: 5889

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5889&view=rev
Log:
Add a global default security configuration for all profiles.

Modified:
    trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
    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-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-conf/src/main/resources/conf/profile-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/profile-defaults.xml?rev=5889&r1=5888&r2=5889&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/profile-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/profile-defaults.xml Thu May  8 20:36:32 2014
@@ -67,38 +67,10 @@
     <bean id="shibboleth.SAML1.BrowserSSO.InboundFlowId" class="java.lang.String"
         c:_0="security-policy/shibboleth-sso" />
         
-	<!-- And the default security Policy -->
+	<!-- And the global default security configuration. -->
 
-	<util:map id="shibboleth.default.security.configuration.map">
-		<!-- SAML1 -->
-		<entry key="http://shibboleth.net/ns/profiles/saml1/query/artifact">
-			<bean class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
-		</entry>
-		<entry key="http://shibboleth.net/ns/profiles/saml1/query/attribute">
-			<bean class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
-		</entry>
-		<entry key="http://shibboleth.net/ns/profiles/saml1/sso/browser">
-			<bean class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
-		</entry>
-
-		<!-- SAML2 -->
-		<entry key="http://shibboleth.net/ns/profiles/saml2/query/artifact">
-			<bean class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
-		</entry>
-		<entry key="http://shibboleth.net/ns/profiles/saml2/query/attribute">
-			<bean class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
-		</entry>
-		<entry key="http://shibboleth.net/ns/profiles/saml2/sso/browser">
-			<bean class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
-		</entry>
-		<entry key="http://shibboleth.net/ns/profiles/saml2/sso/ecp">
-			<bean class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
-		</entry>
-
-		<entry key="http://shibboleth.net/ns/profiles/liberty/ssos">
-			<bean class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
-		</entry>
-
-	</util:map>
-
-</beans>
+	<bean id="shibboleth.DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
+    
+    <util:map id="shibboleth.DefaultSecurityConfigurationMap"/>
+    
+</beans>

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=5889&r1=5888&r2=5889&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 Thu May  8 20:36:32 2014
@@ -17,7 +17,11 @@
 
 package net.shibboleth.idp.relyingparty;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.shibboleth.idp.profile.config.SecurityConfiguration;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.IdentifiedComponent;
 import net.shibboleth.utilities.java.support.component.InitializableComponent;
 import net.shibboleth.utilities.java.support.resolver.Resolver;
@@ -25,15 +29,15 @@
 import org.opensaml.profile.context.ProfileRequestContext;
 
 /** Resolves a {@link RelyingPartyConfiguration} for a given profile request context. */
-public interface RelyingPartyConfigurationResolver extends Resolver<RelyingPartyConfiguration, ProfileRequestContext>,
+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()}

[... 232 lines stripped ...]