[java-identity-provider COMMIT] in /trunk: idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar 10 22:43:41 2016
New Revision: 8148

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8148&view=rev
Log:
IDP-948 - Dynamic determination of profile and relying party configuration settings

https://issues.shibboleth.net/jira/browse/IDP-948

First cut at adding this capability to RelyingPartyConfiguration.
Tighten up initialization contract inside RPC class.

Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java
    trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
    trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml
    trunk/idp-conf/src/test/resources/c14n/webflows/transformNameID-flow.xml
    trunk/idp-conf/src/test/resources/c14n/webflows/transformNameIdentifier-flow.xml
    trunk/idp-conf/src/test/resources/c14n/webflows/transientNameID-flow.xml
    trunk/idp-conf/src/test/resources/c14n/webflows/transientNameIdentifier-flow.xml
    trunk/idp-conf/src/test/resources/mapping/webflows/resolveAndFilter-flow.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/relyingparty/RelyingPartyConfigurationTest.java

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java?rev=8148&r1=8147&r2=8148&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java	(original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java	Thu Mar 10 22:43:41 2016
@@ -21,16 +21,18 @@
 
 import net.shibboleth.idp.authn.context.SubjectContext;
 import net.shibboleth.idp.profile.AbstractProfileAction;
+import net.shibboleth.idp.profile.IdPEventIds;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
+import org.opensaml.profile.action.ActionSupport;
 import org.opensaml.profile.context.ProfileRequestContext;
 
 public class SetupForResolver extends AbstractProfileAction {
     
     @Override
-    protected void doExecute(
-            @Nonnull final ProfileRequestContext profileRequestContext) {
+    protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
 
         SubjectContext sc = profileRequestContext.getSubcontext(SubjectContext.class, true);
         
@@ -41,10 +43,16 @@
         rpContext.setRelyingPartyId(AbstractFlowTest.SP_ENTITY_ID);
         
         RelyingPartyConfiguration config = new RelyingPartyConfiguration();
+        config.setId("test");
         config.setResponderId(AbstractFlowTest.IDP_ENTITY_ID);
+        try {
+            config.initialize();
+        } catch (final ComponentInitializationException e) {
+            ActionSupport.buildEvent(profileRequestContext, IdPEventIds.INVALID_RELYING_PARTY_CONFIG);
+            return;
+        }
         
         rpContext.setConfiguration(config);
-                
     }
     
-}
+}

Modified: trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml?rev=8148&r1=8147&r2=8148&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml	(original)
+++ trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameID-flow.xml	Thu Mar 10 22:43:41 2016
@@ -33,6 +33,10 @@
     </end-state>
     
     <end-state id="error" />
+
+    <global-transitions>
+        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="error" />
+    </global-transitions>
     
     <bean-import resource="beans.xml" />
     

Modified: trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml?rev=8148&r1=8147&r2=8148&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml	(original)
+++ trunk/idp-conf/src/test/resources/c14n/webflows/cryptoTransientNameIdentifier-flow.xml	Thu Mar 10 22:43:41 2016
@@ -33,6 +33,10 @@
     </end-state>
     
     <end-state id="error" />
+
+    <global-transitions>
+        <transition on="#{!'proceed'.equals(currentEvent.id)}" to="error" />
+    </global-transitions>
     
     <bean-import resource="beans.xml" />
     

Modified: trunk/idp-conf/src/test/resources/c14n/webflows/transformNameID-flow.xml

[... 536 lines stripped ...]