From 70e0a27949097b4d14f32d2eb5151fa22b346ca5 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 7 Jun 2020 10:21:22 -0700 Subject: [PATCH] Drop the use of the term "white list" Closes gh-21737 --- .../template/AbstractViewResolverProperties.java | 2 +- .../web/embedded/TomcatWebServerFactoryCustomizer.java | 3 +-- .../src/main/asciidoc/appendix-application-properties.adoc | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java index cd8da441bd..ccdc2af253 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java @@ -60,7 +60,7 @@ public abstract class AbstractViewResolverProperties { private Charset charset = DEFAULT_CHARSET; /** - * White list of view names that can be resolved. + * The view names that can be resolved. */ private String[] viewNames; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java index cb97a99f71..2a57eea9f5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java @@ -158,8 +158,7 @@ public class TomcatWebServerFactoryCustomizer if (StringUtils.hasLength(remoteIpHeader)) { valve.setRemoteIpHeader(remoteIpHeader); } - // The internal proxies default to a white list of "safe" internal IP - // addresses + // The internal proxies default to a list of "safe" internal IP addresses valve.setInternalProxies(tomcatProperties.getInternalProxies()); valve.setPortHeader(tomcatProperties.getPortHeader()); valve.setProtocolHeaderHttpsValue(tomcatProperties.getProtocolHeaderHttpsValue()); diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 4488ba74c1..c8dc8c6335 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -316,7 +316,7 @@ Rather, pick only the properties that you need. spring.freemarker.settings.*= # Well-known FreeMarker keys which are passed to FreeMarker's Configuration. spring.freemarker.suffix=.ftl # Suffix that gets appended to view names when building a URL. spring.freemarker.template-loader-path=classpath:/templates/ # Comma-separated list of template paths. - spring.freemarker.view-names= # White list of view names that can be resolved. + spring.freemarker.view-names= # The view names that can be resolved. # GROOVY TEMPLATES ({spring-boot-autoconfigure-module-code}/groovy/template/GroovyTemplateProperties.java[GroovyTemplateProperties]) spring.groovy.template.allow-request-override=false # Whether HttpServletRequest attributes are allowed to override (hide) controller generated model attributes of the same name. @@ -334,7 +334,7 @@ Rather, pick only the properties that you need. spring.groovy.template.request-context-attribute= # Name of the RequestContext attribute for all views. spring.groovy.template.resource-loader-path=classpath:/templates/ # Template path. spring.groovy.template.suffix=.tpl # Suffix that gets appended to view names when building a URL. - spring.groovy.template.view-names= # White list of view names that can be resolved. + spring.groovy.template.view-names= # The view names that can be resolved. # SPRING HATEOAS ({spring-boot-autoconfigure-module-code}/hateoas/HateoasProperties.java[HateoasProperties]) spring.hateoas.use-hal-as-default-json-media-type=true # Whether application/hal+json responses should be sent to requests that accept application/json. @@ -422,7 +422,7 @@ Rather, pick only the properties that you need. spring.mustache.prefix=classpath:/templates/ # Prefix to apply to template names. spring.mustache.request-context-attribute= # Name of the RequestContext attribute for all views. spring.mustache.suffix=.mustache # Suffix to apply to template names. - spring.mustache.view-names= # White list of view names that can be resolved. + spring.mustache.view-names= # The view names that can be resolved. # SPRING MVC ({spring-boot-autoconfigure-module-code}/web/servlet/WebMvcProperties.java[WebMvcProperties]) spring.mvc.async.request-timeout= # Amount of time before asynchronous request handling times out.