root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Configure ErrorReportValve not to report stack traces 

See gh-11790
This commit is contained in:
Alex Panchenko 2018-01-29 23:31:54 +07:00 committed by Andy Wilkinson
parent 4c001e8d56
commit 29736e340e
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
View File

@ -36,7 +36,9 @@ import io.undertow.UndertowOptions;
import org.apache.catalina.Context;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.valves.AccessLogValve;
import org.apache.catalina.valves.ErrorReportValve;
import org.apache.catalina.valves.RemoteIpValve;
import org.apache.commons.logging.LogFactory;
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.ProtocolHandler;
import org.apache.coyote.http11.AbstractHttp11Protocol;
@ -859,6 +861,25 @@ public class ServerProperties
if (!ObjectUtils.isEmpty(this.additionalTldSkipPatterns)) {
factory.getTldSkipPatterns().addAll(this.additionalTldSkipPatterns);
}
if (serverProperties.getError().getIncludeStacktrace() == ErrorProperties.IncludeStacktrace.NEVER) {
factory.addContextCustomizers(new TomcatContextCustomizer() {
@Override
public void customize(Context context) {
// org.apache.catalina.core.StandardHost() adds ErrorReportValve
// with default options if not there yet, so adding a properly
// configured one.
ErrorReportValve valve = new ErrorReportValve();
valve.setShowServerInfo(false); // disable server name and version
valve.setShowReport(false); // disable exception
if (context.getParent() != null) {
context.getParent().getPipeline().addValve(valve);
} else {
LogFactory.getLog(context.getClass()).warn("Parent of " + context
+ " is not set, skip ErrorReportValve configuration");
}
}
});
}
}
private void customizeAcceptCount(TomcatEmbeddedServletContainerFactory factory) {

2
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
View File

@ -231,8 +231,8 @@ public class TomcatEmbeddedServletContainerFactory
});
ServletContextInitializer[] initializersToUse = mergeInitializers(initializers);
configureContext(context, initializersToUse);
host.addChild(context);
configureContext(context, initializersToUse);
postProcessContext(context);
}