[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/mvc-beans.xml idp-war/src/main/web...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jan  8 17:51:43 2016
New Revision: 8071

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8071&view=rev
Log:
IDP-889 - Handle 500 errors inside IDP
    
https://issues.shibboleth.net/jira/browse/IDP-889
    
Add an MVC controller that just raises errors propagated by a servlet container.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=8071&r1=8070&r2=8071&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml	Fri Jan  8 17:51:43 2016
@@ -26,6 +26,7 @@
         <property name="mappings">
             <props>
                 <prop key="%{idp.authn.spnego.externalAuthnPath:/Authn/SPNEGO}/**">shibboleth.SPNEGOAuthnController</prop>
+                <prop key="/RaiseError">shibboleth.RaiseErrorController</prop>
             </props>
         </property>
     </bean>
@@ -44,6 +45,7 @@
     <!-- Additional MVC controllers -->
     
     <bean id="shibboleth.SPNEGOAuthnController" class="net.shibboleth.idp.authn.spnego.impl.SPNEGOAuthnController" />
+    <bean id="shibboleth.RaiseErrorController" class="net.shibboleth.ext.spring.error.ErrorRaisingController" />
 
     <!-- Exception handling -->
     

Modified: trunk/idp-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/web.xml?rev=8071&r1=8070&r2=8071&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/web.xml	(original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/web.xml	Fri Jan  8 17:51:43 2016
@@ -137,6 +137,16 @@
         <url-pattern>/shibboleth</url-pattern>
     </servlet-mapping>
     
+    <!-- Send servlet errors through the IdP's MVC error handling. -->
+    <error-page>
+        <exception-type>javax.servlet.ServletException</exception-type>
+        <location>/profile/RaiseError</location>
+    </error-page>
+    <error-page>
+        <exception-type>java.io.IOException</exception-type>
+        <location>/profile/RaiseError</location>
+    </error-page>
+
     <!--
     Uncomment to use container managed authentication. The new servlet spec (3.1)
     supports "**" as a wildcard syntax to avoid role usage, which is normally desirable.