[JENKINS-60410] Add stack trace suppression into core as a standard behavior.

core/pom.xml

@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <staplerFork>true</staplerFork>
-    <stapler.version>1.258</stapler.version>
+    <stapler.version>1.259</stapler.version>
     <spring.version>2.5.6.SEC03</spring.version>
     <groovy.version>2.4.12</groovy.version>
   </properties>

core/src/main/java/hudson/init/impl/InstallUncaughtExceptionHandler.java

@@ -3,13 +3,23 @@
 import hudson.init.Initializer;
 import jenkins.model.Jenkins;
 import jenkins.telemetry.impl.java11.MissingClassTelemetry;
+import org.kohsuke.MetaInfServices;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.Stapler;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.WebApp;
 import org.kohsuke.stapler.compression.CompressionFilter;
 
+import javax.annotation.CheckForNull;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.EOFException;
 import java.io.IOException;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -23,22 +33,7 @@ public class InstallUncaughtExceptionHandler {
     @Initializer
     public static void init(final Jenkins j) throws IOException {
         CompressionFilter.setUncaughtExceptionHandler(j.servletContext, (e, context, req, rsp) -> {
-                if (rsp.isCommitted()) {
-                    LOGGER.log(isEOFException(e) ? Level.FINE : Level.WARNING, null, e);
-                    return;
-                }
-                req.setAttribute("javax.servlet.error.exception",e);
-                try {
-                    // If we have an exception, let's see if it's related with missing classes on Java 11. We reach
-                    // here with a ClassNotFoundException in an action, for example. Setting the report here is the only
-                    // way to catch the missing classes when the plugin uses Thread.currentThread().getContextClassLoader().loadClass
-                    MissingClassTelemetry.reportExceptionInside(e);
-                    WebApp.get(j.servletContext).getSomeStapler().invoke(req, rsp, j, "/oops");
-                } catch (ServletException | IOException x) {
-                    if (!Stapler.isSocketException(x)) {
-                        throw x;
-                    }
-                }
+            handleException(j, e, req, rsp, 500);
         });
         try {
             Thread.setDefaultUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler());
@@ -54,6 +49,46 @@ public static void init(final Jenkins j) throws IOException {
         }
     }
 
+    private static void handleException(Jenkins j, Throwable e, HttpServletRequest req, HttpServletResponse rsp, int code) throws IOException, ServletException {
+        if (rsp.isCommitted()) {
+            LOGGER.log(isEOFException(e) ? Level.FINE : Level.WARNING, null, e);
+            return;
+        }
+        String id = UUID.randomUUID().toString();
+        LOGGER.log(isEOFException(e) ? Level.FINE : Level.WARNING, "Caught unhandled exception with ID " + id, e);
+        req.setAttribute("jenkins.exception.id", id);
+        req.setAttribute("javax.servlet.error.exception",e);
+        rsp.setStatus(code);
+        try {
+            // If we have an exception, let's see if it's related with missing classes on Java 11. We reach
+            // here with a ClassNotFoundException in an action, for example. Setting the report here is the only
+            // way to catch the missing classes when the plugin uses Thread.currentThread().getContextClassLoader().loadClass
+            MissingClassTelemetry.reportExceptionInside(e);
+            WebApp.get(j.servletContext).getSomeStapler().invoke(req, rsp, j, "/oops");
+        } catch (ServletException | IOException x) {
+            if (!Stapler.isSocketException(x)) {
+                throw x;
+            }
+        }
+    }
+
+    @Restricted(NoExternalUse.class)
+    @MetaInfServices
+    public static class ErrorCustomizer implements HttpResponses.ErrorCustomizer {
+        @CheckForNull
+        @Override
+        public HttpResponses.HttpResponseException handleError(int code, Throwable cause) {
+            if (Jenkins.getInstanceOrNull() == null) {
+                return null;
+            }
+            return new HttpResponses.HttpResponseException(cause) {
+                public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
+                    handleException(Jenkins.get(), cause, req, rsp, code);
+                }
+            };
+        }
+    }
+
     private static boolean isEOFException(Throwable e) {
         if (e == null) {
             return false;

core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java

@@ -251,7 +251,7 @@ public User doCreateAccount(StaplerRequest req, StaplerResponse rsp) throws IOEx
 
     private User _doCreateAccount(StaplerRequest req, StaplerResponse rsp, String formView) throws ServletException, IOException {
         if(!allowsSignup())
-            throw HttpResponses.error(SC_UNAUTHORIZED,new Exception("User sign up is prohibited"));
+            throw HttpResponses.errorWithoutStack(SC_UNAUTHORIZED, "User sign up is prohibited");
 
         boolean firstUser = !hasSomeUser();
         User u = createAccount(req, rsp, enableCaptcha, formView);

core/src/main/java/jenkins/model/Jenkins.java

@@ -5147,6 +5147,12 @@ private static void computeVersion(ServletContext context) {
         }
     }
 
+    @Restricted(NoExternalUse.class)
+    public boolean shouldShowStackTrace() {
+        // Used by oops.jelly
+        return Boolean.getBoolean(Jenkins.class.getName() + ".SHOW_STACK_TRACE");
+    }
+
     /**
      * Hash of {@link #VERSION}.
      */
@@ -5233,6 +5239,7 @@ private static void computeVersion(ServletContext context) {
      */
     static final String WORKSPACES_DIR_PROP = Jenkins.class.getName() + ".workspacesDir";
 
+
     /**
      * Automatically try to launch an agent when Jenkins is initialized or a new agent computer is created.
      */

core/src/main/java/jenkins/security/ExceptionTranslationFilter.java

@@ -1,4 +1,5 @@
 /* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+ * Copyright (c) 2020 CloudBees, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +42,9 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -122,8 +126,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 		catch (AuthenticationException | AccessDeniedException ex) {
 			handleException(request, response, chain, ex);
 		} catch (ServletException ex) {
-			if (ex.getRootCause() instanceof AuthenticationException
-					|| ex.getRootCause() instanceof AccessDeniedException) {
+			if (ex.getRootCause() instanceof AuthenticationException || ex.getRootCause() instanceof AccessDeniedException) {
 				handleException(request, response, chain, (AcegiSecurityException) ex.getRootCause());
 			}
 			else {
@@ -235,4 +238,5 @@ public void init(FilterConfig filterConfig) throws ServletException {
 
     public void destroy() {
     }
-}
+
+}

core/src/main/resources/jenkins/model/Jenkins/oops.jelly

@@ -27,32 +27,22 @@ THE SOFTWARE.
   <!--
     This is the page designated by web.xml and UncaughtExceptionHandler to process an exception thrown by us.
   -->
-  <st:statusCode value="500" />
-  <l:layout title="Jenkins">
+  <st:statusCode value="${response.getStatus()}" />
+  <l:layout title="Jenkins" type="one-column">
     <l:header />
-    <l:side-panel>
-      <l:task href="https://jenkins.io/" icon="icon-next icon-md" title="${%Jenkins project}"/>
-      <l:task href="https://jenkins.io/redirect/report-an-issue" icon="icon-gear2 icon-md" title="${%Bug tracker}"/>
-      <l:task href="https://jenkins.io/redirect/mailing-lists" icon="icon-search icon-md" title="${%Mailing Lists}"/>
-      <l:task href="https://twitter.com/jenkinsci" icon="icon-user icon-md" title="${%Twitter: @jenkinsci}"/>
-
-    </l:side-panel>
     <l:main-panel>
-      <h1 style="text-align: center">
-        <img src="${imagesURL}/rage.png" height="179" width="154"/> <span style="font-size:50px"><st:nbsp/>${%Oops!}</span>
-      </h1>
-      <div id="error-description">
-      <p>
-        ${%problemHappened}
-        ${%checkJIRA}
-        ${%vote}
-        ${%pleaseReport}
-        ${%stackTracePlease}
-        ${%checkML}
-      </p>
-      <h2>${%Stack trace}</h2>
-      <pre style="margin:2em; clear:both">${h.printThrowable(request.getAttribute('javax.servlet.error.exception'))}</pre>
+        <h1 style="text-align: center">
+          <img src="${imagesURL}/rage.png" height="179" width="154"/> <span style="font-size:50px"><st:nbsp/>${%Oops!}</span>
+        </h1>
+        <div id="error-description">
+          <h2 style="text-align: center">${%problemHappened}</h2>
+        <p style="text-align: center">Logging ID=${request.getAttribute('jenkins.exception.id')}</p>
       </div>
+      <j:if test="${app.shouldShowStackTrace()}">
+        <p>${%checkJIRA} ${%vote} ${%pleaseReport} ${%stackTracePlease} ${%checkML}</p>
+        <h2>${%Stack trace}</h2>
+        <pre style="margin:2em; clear:both">${h.printThrowable(request.getAttribute('javax.servlet.error.exception'))}</pre>
+      </j:if>
     </l:main-panel>
   </l:layout>
-</j:jelly>
+</j:jelly>

core/src/main/resources/jenkins/security/Messages.properties

@@ -47,3 +47,4 @@ ResourceDomainConfiguration.IOException=Failed to connect: {0}
 ResourceDomainConfiguration.Invalid=Not a valid URL.
 ResourceDomainConfiguration.SameAsJenkinsRoot=Cannot use the same host name for both Jenkins root URL and resource root URL.
 ResourceDomainConfiguration.SameAsCurrent=You are currently accessing Jenkins through a URL similar to the proposed resource root URL. Saving this URL might remove your access to Jenkins.
+

core/src/main/resources/lib/form/apply/apply.js

@@ -40,10 +40,15 @@ Behaviour.specify("INPUT.apply-button", 'apply', 0, function (e) {
                     // otherwise this is possibly an error from the server, so we need to render the whole content.
                     var doc = target.contentDocument || target.contentWindow.document;
                     var error = doc.getElementById('error-description');
+                    var r = YAHOO.util.Dom.getClientRegion();
+                    var contentHeight = r.height/5;
+                    var contentWidth = r.width/2;
                     if (!error) {
                         // fallback if it's not a regular error dialog from oops.jelly: use the entire body
                         error = Element('div', {id: 'error-description'});
                         error.appendChild(doc.getElementsByTagName('body')[0]);
+                        contentHeight = r.height*3/4;
+                        contentWidth = r.width*3/4;
                     }
 
                     if (oldError = $('error-description')) {
@@ -52,11 +57,8 @@ Behaviour.specify("INPUT.apply-button", 'apply', 0, function (e) {
                     }
 
                     $(containerId).appendChild(error);
-                    var r = YAHOO.util.Dom.getClientRegion();
 
-                    var contentHeight = r.height*3/4;
                     var dialogStyleHeight = contentHeight+40;
-                    var contentWidth = r.width*3/4;
                     var dialogStyleWidth = contentWidth+20;
 
                     $(containerId).style.height = contentHeight+"px";

pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.52</version>
+    <version>1.54</version>
     <relativePath />
   </parent>
 

test/pom.xml

@@ -70,7 +70,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2.61</version>
+      <version>2.62</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>