You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2014/11/12 12:00:43 UTC

svn commit: r1638757 - in /sling/trunk: bundles/engine/src/main/java/org/apache/sling/engine/impl/ bundles/servlets/resolver/ bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/ launchpad/builder/src/main/bundles/ launc...

Author: bdelacretaz
Date: Wed Nov 12 11:00:42 2014
New Revision: 1638757

URL: http://svn.apache.org/r1638757
Log:
SLING-4143 - SlingServletResolver and SlingRequestProcessorImpl now cause HTTP status 500 if error handling script/servlet throws Exception or Error

Modified:
    sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/DefaultErrorHandler.java
    sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java
    sling/trunk/bundles/servlets/resolver/pom.xml
    sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
    sling/trunk/launchpad/builder/src/main/bundles/list.xml
    sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java

Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/DefaultErrorHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/DefaultErrorHandler.java?rev=1638757&r1=1638756&r2=1638757&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/DefaultErrorHandler.java (original)
+++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/DefaultErrorHandler.java Wed Nov 12 11:00:42 2014
@@ -46,12 +46,30 @@ public class DefaultErrorHandler impleme
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     private String serverInfo = SlingMainServlet.PRODUCT_NAME;
+    
+    /** Use this if not null, and if that fails output a report about that failure */
+    private ErrorHandler delegate;
 
     void setServerInfo(final String serverInfo) {
         this.serverInfo = (serverInfo != null)
                 ? serverInfo
                 : SlingMainServlet.PRODUCT_NAME;
     }
+    
+    public void setDelegate(ErrorHandler eh) {
+        delegate = eh;
+    }
+    
+    public ErrorHandler getDelegate() {
+        return delegate;
+    }
+    
+    private void delegateFailed(Throwable t, HttpServletRequest request, HttpServletResponse response) throws IOException {
+        final String m = t.getClass().getSimpleName() + " in ErrorHandler";
+        // don't include Throwable in the response, gives too much information
+        log.error(m, t);
+        sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, m, null, request, response);
+    }
 
     // ---------- ErrorHandler interface (default implementation) --------------
 
@@ -71,7 +89,19 @@ public class DefaultErrorHandler impleme
             final SlingHttpServletRequest request,
             final SlingHttpServletResponse response)
     throws IOException {
-
+        
+        // If we have a delegate let it handle the error 
+        if(delegate != null) {
+            try {
+                delegate.handleError(status, message, request, response);
+            } catch(Exception e) {
+                delegateFailed(e, request, response);
+            } catch(Error r) {
+                delegateFailed(r, request, response);
+            }
+            return;
+        }
+        
         if (message == null) {
             message = "HTTP ERROR:" + String.valueOf(status);
         } else {
@@ -96,6 +126,18 @@ public class DefaultErrorHandler impleme
             final SlingHttpServletRequest request,
             final SlingHttpServletResponse response)
     throws IOException {
+        // If we have a delegate let it handle the error 
+        if(delegate != null) {
+            try {
+                delegate.handleError(throwable, request, response);
+            } catch(Exception e) {
+                delegateFailed(e, request, response);
+            } catch(Error r) {
+                delegateFailed(r, request, response);
+            }
+            return;
+        }
+        
         sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
             throwable.getMessage(), throwable, request, response);
     }

Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java?rev=1638757&r1=1638756&r2=1638757&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java (original)
+++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java Wed Nov 12 11:00:42 2014
@@ -68,9 +68,7 @@ public class SlingRequestProcessorImpl i
 
     // used fields ....
 
-    private final DefaultErrorHandler defaultErrorHandler = new DefaultErrorHandler();
-
-    private ErrorHandler errorHandler = defaultErrorHandler;
+    private final DefaultErrorHandler errorHandler = new DefaultErrorHandler();
 
     private ServletResolver servletResolver;
 
@@ -81,16 +79,16 @@ public class SlingRequestProcessorImpl i
     // ---------- helper setters
 
     void setServerInfo(final String serverInfo) {
-        defaultErrorHandler.setServerInfo(serverInfo);
+        errorHandler.setServerInfo(serverInfo);
     }
 
-    void setErrorHandler(final ErrorHandler errorHandler) {
-        this.errorHandler = errorHandler;
+    void setErrorHandler(final ErrorHandler eh) {
+        errorHandler.setDelegate(eh);
     }
 
-    void unsetErrorHandler(final ErrorHandler errorHandler) {
-        if (this.errorHandler == errorHandler) {
-            this.errorHandler = defaultErrorHandler;
+    void unsetErrorHandler(final ErrorHandler eh) {
+        if (errorHandler.getDelegate() == eh) {
+            errorHandler.setDelegate(null);
         }
     }
 

Modified: sling/trunk/bundles/servlets/resolver/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/pom.xml?rev=1638757&r1=1638756&r2=1638757&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/resolver/pom.xml (original)
+++ sling/trunk/bundles/servlets/resolver/pom.xml Wed Nov 12 11:00:42 2014
@@ -44,6 +44,7 @@
 
     <properties>
         <site.jira.version.id>12314292</site.jira.version.id>
+        <sling.java.version>6</sling.java.version>
     </properties>
 
     <build>

Modified: sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java?rev=1638757&r1=1638756&r2=1638757&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java (original)
+++ sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java Wed Nov 12 11:00:42 2014
@@ -755,6 +755,9 @@ public class SlingServletResolver
             request.setAttribute(SlingConstants.ERROR_SERVLET_NAME, errorHandler.getServletConfig().getServletName());
         }
 
+        // Let the error handler servlet process the request and
+        // forward exceptions (but not throwable) if it fails.
+        // Before SLING-4143 we only forwarded IOExceptions.
         try {
             errorHandler.service(request, response);
             // commit the response
@@ -762,8 +765,11 @@ public class SlingServletResolver
             // close the response (SLING-2724)
             response.getWriter().close();
         } catch (final IOException ioe) {
-            // forward the IOException
             throw ioe;
+        } catch (final Exception e) {
+            throw new IOException("Error handling servlet failed", e);
+        } catch (final Error r) {
+            throw r;
         } catch (final Throwable t) {
             LOGGER.error("Calling the error handler resulted in an error", t);
             LOGGER.error("Original error " + request.getAttribute(SlingConstants.ERROR_EXCEPTION_TYPE),

Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=1638757&r1=1638756&r2=1638757&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original)
+++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Nov 12 11:00:42 2014
@@ -205,7 +205,7 @@
         <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.engine</artifactId>
-            <version>2.3.6</version>
+            <version>2.3.9-SNAPSHOT</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>
@@ -220,7 +220,7 @@
         <bundle>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.servlets.resolver</artifactId>
-            <version>2.3.2</version>
+            <version>2.3.3-SNAPSHOT</version>
         </bundle>
         <bundle>
             <groupId>org.apache.sling</groupId>

Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java?rev=1638757&r1=1638756&r2=1638757&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java Wed Nov 12 11:00:42 2014
@@ -136,17 +136,15 @@ public class ErrorHandlingTest extends R
     }
 
     public void test_421_exception() throws Throwable{
-        // we get a blank page in this case
-        final String expected = "";
+        final String expected = "IOException in ErrorHandler";
         final String url =  testNodePath + SELECTOR_421 + ".errorScriptException.html"; 
-        assertWithRetries(url, 421, expected);
+        assertWithRetries(url, 500, expected);
     }
 
     public void test_421_error() throws Throwable{
-        // we get a blank page in this case
-        final String expected = "";
+        final String expected = "IOException in ErrorHandler";
         final String url =  testNodePath + SELECTOR_421 + ".errorScriptError.html"; 
-        assertWithRetries(url, 421, expected);
+        assertWithRetries(url, 500, expected);
     }
 
 	public void test_throwable_errorhandling() throws Throwable{