[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/error-mappings.xml idp-conf/src/main/reso...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jun  5 16:00:25 2014
New Revision: 6050

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6050&view=rev
Log:
IDP-230 - Rework ECP error handling to generate SOAP faults and encode them, also move code mappings into dedicated file.

Added:
    trunk/idp-conf/src/main/resources/conf/error-mappings.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-flow.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-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/artifact-resolution-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-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
    trunk/idp-conf/src/main/resources/views/error.vm
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/error.jsp

Modified: trunk/idp-conf/src/main/resources/conf/global.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global.xml?rev=6050&r1=6049&r2=6050&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global.xml Thu Jun  5 16:00:25 2014
@@ -15,66 +15,6 @@
     <import resource="subject-c14n.xml" />
 	<import resource="authn/authn-comparison.xml" />
 	<import resource="authn/general-authn-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. -->
-
-    <util:map id="shibboleth.SAML1StatusMappings">
-        <entry key="InvalidMessageVersion" value-ref="Shibboleth.SAML1Status.VersionMismatch" />
-        
-        <entry key="UnableToDecode" value-ref="Shibboleth.SAML1Status.Requester" />
-        
-        <entry key="UnableToEncode" value-ref="Shibboleth.SAML1Status.Requester" />
-
-        <entry key="MessageReplay" value-ref="Shibboleth.SAML1Status.Requester" />
-        <entry key="MessageExpired" value-ref="Shibboleth.SAML1Status.Requester" />
-        <entry key="MessageAuthenticationError" value-ref="Shibboleth.SAML1Status.Requester" />
-
-        <entry key="RequestUnsupported" value-ref="Shibboleth.SAML1Status.Requester" />
-        
-        <entry key="NoPassive" value-ref="Shibboleth.SAML1Status.Requester" />
-        <entry key="NoPotentialFlow" value-ref="Shibboleth.SAML1Status.Requester" />
-        <entry key="NoCredentials" value-ref="Shibboleth.SAML1Status.Requester" />
-        <entry key="InvalidCredentials" value-ref="Shibboleth.SAML1Status.Requester" />
-        <entry key="AccountError" value-ref="Shibboleth.SAML1Status.Requester" />
-        <entry key="AuthenticationException" value-ref="Shibboleth.SAML1Status.Requester" />
-        
-        <entry key="InvalidSubject" value-ref="Shibboleth.SAML1Status.Requester" />
-        <entry key="SubjectCanonicalizationError" value-ref="Shibboleth.SAML1Status.Requester" />
-    </util:map>
-    
-    <util:map id="shibboleth.SAML2StatusMappings">
-        <entry key="InvalidMessageVersion" value-ref="Shibboleth.SAML2Status.VersionMismatch" />
-        
-        <entry key="UnableToDecode" value-ref="Shibboleth.SAML2Status.RequestUnsupported" />
-        
-        <entry key="UnableToEncode" value-ref="Shibboleth.SAML2Status.UnsupportedBinding" />
-
-        <entry key="MessageReplay" value-ref="Shibboleth.SAML2Status.RequestDenied" />
-        <entry key="MessageExpired" value-ref="Shibboleth.SAML2Status.RequestDenied" />
-        <entry key="MessageAuthenticationError" value-ref="Shibboleth.SAML2Status.RequestDenied" />
-        
-        <entry key="RequestUnsupported" value-ref="Shibboleth.SAML2Status.NoAuthnContext" />
-        
-        <entry key="NoPassive" value-ref="Shibboleth.SAML2Status.NoPassive" />
-        
-        <entry key="NoPotentialFlow" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
-        <entry key="NoCredentials" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
-        <entry key="InvalidCredentials" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
-        <entry key="AccountError" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
-        <entry key="AuthenticationException" value-ref="Shibboleth.SAML2Status.AuthnFailed" />
-        
-        <entry key="InvalidSubject" value-ref="Shibboleth.SAML2Status.UnknownPrincipal" />

[... 410 lines stripped ...]