SONAR-19107 Fix SSF-385

diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatErrorHandling.java b/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatErrorHandling.java
index 6653db0bf5d4cb1f6cad11053d6e4a2c7ac8d621..156e90dc48b524d68fa24f0d53fefa001a50fa5d 100644 (file)
--- a/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatErrorHandling.java
+++ b/server/sonar-webserver/src/main/java/org/sonar/server/app/TomcatErrorHandling.java
@@ -24,7 +24,9 @@ import org.apache.catalina.valves.ErrorReportValve;
 
 public class TomcatErrorHandling {
   void configure(Tomcat tomcat) {
-    ErrorReportValve valve = new SecureErrorReportValve();
+    // This needs to be an instance of ErrrorReportValue, otherwise
+    // Tomcat 9's StandardHost will add another ErrorReportValve with the default values
+    ErrorReportValve valve = new ErrorReportValve();
     valve.setShowServerInfo(false);
     valve.setShowReport(false);
     tomcat.getHost().getPipeline().addValve(valve);

diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/app/TomcatErrorHandlingTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/app/TomcatErrorHandlingTest.java
index e9e9c0f1f46675fd47d844fb642dfd31aad7496a..de56a2c383e13f6592281d2d96427c3c14bdf5bd 100644 (file)
--- a/server/sonar-webserver/src/test/java/org/sonar/server/app/TomcatErrorHandlingTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/app/TomcatErrorHandlingTest.java
@@ -20,6 +20,7 @@
 package org.sonar.server.app;
 
 import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.valves.ErrorReportValve;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -28,12 +29,12 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 public class TomcatErrorHandlingTest {
-  private TomcatErrorHandling underTest = new TomcatErrorHandling();
+  private final TomcatErrorHandling underTest = new TomcatErrorHandling();
 
   @Test
-  public void enable_access_logs_by_Default() {
+  public void configure_shouldAddErrorValve() {
     Tomcat tomcat = mock(Tomcat.class, Mockito.RETURNS_DEEP_STUBS);
     underTest.configure(tomcat);
-    verify(tomcat.getHost().getPipeline()).addValve(any(SecureErrorReportValve.class));
+    verify(tomcat.getHost().getPipeline()).addValve(any(ErrorReportValve.class));
   }
 }