[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/global-system.xml idp-conf/src/mai...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Apr 12 17:20:04 2014
New Revision: 5714

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5714&view=rev
Log:
Checkpointing some error handling code.

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/logic/
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/logic/DetailedErrorsPredicate.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/config/logic/package-info.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/InitializeOutboundMessageContextForError.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/InitializeOutboundMessageContextForErrorTest.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/IdentifierGenerationStrategyLookupFunction.java

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5714&r1=5713&r2=5714&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Sat Apr 12 17:20:04 2014
@@ -139,15 +139,16 @@
     <bean id="shibboleth.SAMLArtifactMap" depends-on="shibboleth.StorageService"
         class="org.opensaml.saml.common.binding.artifact.StorageServiceSAMLArtifactMap"
         p:storageService-ref="shibboleth.StorageService" />
-        
+    
+    <bean id="shibboleth.DefaultIdentifierGenerationStrategy"
+        class="net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy" />    
+    
     <bean id="shibboleth.SignatureValidationParametersResolver"
         class="org.opensaml.xmlsec.impl.BasicSignatureValidationParametersResolver" />
     <bean id="shibboleth.SignatureSigningParametersResolver"
         class="org.opensaml.xmlsec.impl.BasicSignatureSigningParametersResolver" />
     <bean id="shibboleth.DecryptionParametersResolver" class="org.opensaml.xmlsec.impl.BasicDecryptionParametersResolver" />
-    <!--
     <bean id="shibboleth.EncryptionParametersResolver" class="org.opensaml.xmlsec.impl.BasicEncryptionParametersResolver" />
-    -->
 
     <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.idp.service.ReloadableSpringService" depends-on="shibboleth.VelocityEngine"
         c:claz="net.shibboleth.idp.attribute.filter.AttributeFilter"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=5714&r1=5713&r2=5714&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Sat Apr 12 17:20:04 2014
@@ -189,4 +189,6 @@
 
     <bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete" scope="prototype" />
 
+    <bean id="SavePreviousEventAsError" class="org.opensaml.profile.action.impl.SavePreviousEventAsError" scope="prototype" />
+    
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml?rev=5714&r1=5713&r2=5714&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml Sat Apr 12 17:20:04 2014
@@ -110,17 +110,22 @@
     <action-state id="HandleOutboundMessage">
         <evaluate expression="HandleOutboundMessage" />
         <transition on="proceed" to="EncodeMessage" />
+        <transition on="#{true}" to="error" />
     </action-state>
 
     <action-state id="EncodeMessage">
         <evaluate expression="EncodeMessage" />
         <transition on="proceed" to="RecordResponseComplete" />

[... 265 lines stripped ...]