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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Nov 19 13:06:30 2014
New Revision: 6953

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6953&view=rev
Log:
- Rename error config file
- Simplify display of runtime errors in template via message tokens
- Handle runtime exceptions in subflows

Added:
    trunk/idp-conf/src/main/resources/conf/errors.xml
      - copied, changed from r6949, trunk/idp-conf/src/main/resources/conf/error-mappings.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/error-mappings.xml
    trunk/idp-conf/src/main/resources/conf/messages.properties
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/error.vm

Copied: trunk/idp-conf/src/main/resources/conf/errors.xml (from r6949, trunk/idp-conf/src/main/resources/conf/error-mappings.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/errors.xml?p2=trunk/idp-conf/src/main/resources/conf/errors.xml&p1=trunk/idp-conf/src/main/resources/conf/error-mappings.xml&r1=6949&r2=6953&rev=6953&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/error-mappings.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/errors.xml Wed Nov 19 13:06:30 2014
@@ -25,6 +25,7 @@
     <!-- List of events to trap and handle with local views, without returning to SPs. -->
     <util:list id="shibboleth.LocalEvents">
         <value>ContextCheckDenied</value>
+        <value>RuntimeException</value>
         <!--
         <value>IdentitySwitch</value>
         <value>NoPotentialFlow</value>

Modified: trunk/idp-conf/src/main/resources/conf/messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/messages.properties?rev=6953&r1=6952&r2=6953&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/messages.properties Wed Nov 19 13:06:30 2014
@@ -37,6 +37,8 @@
 UnableToEncode = unexpected
 UnableToSign = unexpected
 UnableToEncrypt = unexpected
+
+RuntimeException = runtime-error
 
 # Exception to error key mappings
 
@@ -80,5 +82,11 @@
 unexpected.title = Unexpected Error
 unexpected.message = An unexpected error was encountered, usually reflecting a configuration or software error.
 
+runtime-error.title = Uncaught Exception
+runtime-error.message = <p>A software error was encountered that prevents normal operation:</p><br/> \
+                <p><strong>$encoder.encodeForHTML($rootCauseException.toString())</strong></p><br/> \
+                <p>Please report this problem to your Help Desk or administrative staff. It has \
+                also been logged for an administrator to review.</p>
+
 error.title = Error
 error.message = An error occurred: $eventId

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=6953&r1=6952&r2=6953&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 Wed Nov 19 13:06:30 2014
@@ -35,7 +35,7 @@
             p:cacheSeconds="%{idp.message.cacheSeconds:300}"
             p:basenames-ref="%{idp.message.resources:shibboleth.MessageSourceResources}" />
 
-    <import resource="../../conf/error-mappings.xml" />
+    <import resource="../../conf/errors.xml" />
     <import resource="general-authn-system.xml" />
     <import resource="session-manager-system.xml" />
     <import resource="services-system.xml" />

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml?rev=6953&r1=6952&r2=6953&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml Wed Nov 19 13:06:30 2014
@@ -23,10 +23,17 @@
     <end-state id="NoPotentialFlow" />
     <end-state id="RequestUnsupported" />
     <end-state id="ReselectFlow" />
+    <end-state id="RuntimeException" />

[... 141 lines stripped ...]