[java-identity-provider COMMIT] in /trunk/idp-conf: .project src/main/resources/conf/global-user.xml src/main/resourc...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Apr 21 22:10:57 2014
New Revision: 5757

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5757&view=rev
Log:
Wire error handling into SSO flows, plus some missing SAML2 material.

Modified:
    trunk/idp-conf/.project
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml

Modified: trunk/idp-conf/.project
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/.project?rev=5757&r1=5756&r2=5757&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5757&r1=5756&r2=5757&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Mon Apr 21 22:10:57 2014
@@ -15,6 +15,14 @@
 	<import resource="general-authn-config.xml" />
     <import resource="subject-config.xml" />
 	<import resource="attribute-params-config.xml" />
+
+    <!-- List of event/error codes during SSO to trap and handle without returning to SPs. -->
+
+    <util:list id="shibboleth.LocalEvents">
+        <!--
+        <value>NoPotentialFlow</value>
+        -->
+    </util:list>
 
     <!-- Mappings of error events during requests to SAML status codes. -->
 

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=5757&r1=5756&r2=5757&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Apr 21 22:10:57 2014
@@ -103,5 +103,6 @@
 idp.attribute.resolver.myLDAP.principal           = uid=myservice,ou=system
 idp.attribute.resolver.myLDAP.principalCredential = myServicePassword
 
+# Message freshness and replay cache tuning
 idp.policy.messageLifetime = PT3M
-idp.policy.clockSkew = PT3M
+idp.policy.clockSkew = PT3M

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?rev=5757&r1=5756&r2=5757&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Mon Apr 21 22:10:57 2014
@@ -77,6 +77,30 @@
         p:enabled="${idp.session.enabled}"
         p:sessionManager-ref="shibboleth.SessionManager"
         p:sessionLifetime="${idp.session.defaultSPlifetime}" />
+        
+    <bean id="CheckErrorHandlingStrategy"
+        class="org.opensaml.saml.common.profile.impl.CheckErrorHandlingStrategy" scope="prototype"
+        p:localEvents-ref="shibboleth.LocalEvents" />
+
+    <bean id="AddStatusToResponse"
+            class="org.opensaml.saml.saml1.profile.impl.AddStatusToResponse" scope="prototype"
+            p:statusMessage="An error occurred.">
+        <property name="detailedErrorsCondition">
+            <bean class="net.shibboleth.idp.profile.config.logic.DetailedErrorsPredicate" />
+        </property>
+        <property name="statusCodes">
+            <util:list>
+                <util:constant static-field="org.opensaml.saml.saml1.core.StatusCode.RESPONDER" />
+            </util:list>
+        </property>
+        <property name="statusCodesLookupStrategy">
+            <bean class="org.opensaml.saml.saml1.profile.impl.AddStatusToResponse.StatusCodeMappingFunction"
+                 c:mappings-ref="shibboleth.SAML1StatusMappings"/>
+        </property>
+        <property name="statusMessageLookupStrategy">
+            <bean class="net.shibboleth.idp.profile.context.navigate.SpringStatusMessageLookupFunction" />
+        </property>
+    </bean>
 
     <bean id="outboundMessageHandlerChain"
             class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain" scope="prototype">

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml?rev=5757&r1=5756&r2=5757&view=diff
==============================================================================

[... 187 lines stripped ...]