This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 146e7f2fda Code clean-up - formatting. No functional change.
146e7f2fda is described below
commit 146e7f2fda19a0633ae8b10be910893ec615990e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 4 12:31:25 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/filters/Constants.java | 3 +-
java/org/apache/catalina/filters/CorsFilter.java | 12 ++++----
.../catalina/filters/CsrfPreventionFilter.java | 8 ++---
.../catalina/filters/CsrfPreventionFilterBase.java | 4 +--
.../org/apache/catalina/filters/ExpiresFilter.java | 34 +++++++++++++---------
.../catalina/filters/HttpHeaderSecurityFilter.java | 4 ++-
.../apache/catalina/filters/RateLimitFilter.java | 4 +--
.../apache/catalina/filters/RemoteIpFilter.java | 22 +++++++-------
.../catalina/filters/RestCsrfPreventionFilter.java | 15 +++++-----
9 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/java/org/apache/catalina/filters/Constants.java
b/java/org/apache/catalina/filters/Constants.java
index 25693aef56..dbec2a72cc 100644
--- a/java/org/apache/catalina/filters/Constants.java
+++ b/java/org/apache/catalina/filters/Constants.java
@@ -60,5 +60,6 @@ public final class Constants {
/**
* The servlet context attribute key under which the CSRF REST header name
can be found.
*/
- public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
+ public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
+ "org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
}
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index 74314ba6b8..2760635f04 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -276,8 +276,8 @@ public class CorsFilter extends GenericFilter {
}
// Section 6.2.4
- String accessControlRequestHeadersHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
+ String accessControlRequestHeadersHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
List<String> accessControlRequestHeaders = new ArrayList<>();
if (accessControlRequestHeadersHeader != null &&
!accessControlRequestHeadersHeader.trim().isEmpty()) {
String[] headers =
accessControlRequestHeadersHeader.trim().split(",");
@@ -563,8 +563,8 @@ public class CorsFilter extends GenericFilter {
String method = request.getMethod();
if (method != null) {
if ("OPTIONS".equals(method)) {
- String accessControlRequestMethodHeader = request
-
.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+ String accessControlRequestMethodHeader =
+
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
requestType = CORSRequestType.PRE_FLIGHT;
} else if (accessControlRequestMethodHeader != null &&
@@ -894,8 +894,8 @@ public class CorsFilter extends GenericFilter {
/**
* Request headers sent as 'Access-Control-Request-Headers' header, for
pre-flight request.
*/
- public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
HTTP_REQUEST_ATTRIBUTE_PREFIX +
- "request.headers";
+ public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
+ HTTP_REQUEST_ATTRIBUTE_PREFIX + "request.headers";
// -------------------------------------------------------------- Constants
/**
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 28769a0b59..d33fdb8d08 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -258,8 +258,8 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
return null;
}
@SuppressWarnings("unchecked")
- NonceCache<String> nonceCache = (NonceCache<String>) session
- .getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
+ NonceCache<String> nonceCache =
+ (NonceCache<String>)
session.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
return nonceCache;
}
@@ -343,14 +343,14 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
// Although the internal implementation uses a Map, this cache
// implementation is only concerned with the keys.
- private final Map<T, T> cache;
+ private final Map<T,T> cache;
public LruCache(final int cacheSize) {
cache = new LinkedHashMap<>() {
private static final long serialVersionUID = 1L;
@Override
- protected boolean removeEldestEntry(Map.Entry<T, T> eldest) {
+ protected boolean removeEldestEntry(Map.Entry<T,T> eldest) {
if (size() > cacheSize) {
return true;
}
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
b/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
index e88671263b..be4df114fe 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
@@ -79,8 +79,8 @@ public abstract class CsrfPreventionFilterBase extends
FilterBase {
Class<?> clazz = Class.forName(randomClass);
randomSource = (Random) clazz.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
- ServletException se = new
ServletException(sm.getString("csrfPrevention.invalidRandomClass", randomClass),
- e);
+ ServletException se =
+ new
ServletException(sm.getString("csrfPrevention.invalidRandomClass",
randomClass), e);
throw se;
}
}
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 130ee41724..7fbb6529aa 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -446,8 +446,13 @@ public class ExpiresFilter extends FilterBase {
* Duration unit
*/
protected enum DurationUnit {
- DAY(Calendar.DAY_OF_YEAR), HOUR(Calendar.HOUR),
MINUTE(Calendar.MINUTE), MONTH(Calendar.MONTH),
- SECOND(Calendar.SECOND), WEEK(Calendar.WEEK_OF_YEAR),
YEAR(Calendar.YEAR);
+ DAY(Calendar.DAY_OF_YEAR),
+ HOUR(Calendar.HOUR),
+ MINUTE(Calendar.MINUTE),
+ MONTH(Calendar.MONTH),
+ SECOND(Calendar.SECOND),
+ WEEK(Calendar.WEEK_OF_YEAR),
+ YEAR(Calendar.YEAR);
private final int calendarField;
@@ -506,7 +511,8 @@ public class ExpiresFilter extends FilterBase {
* {@link StartingPoint#LAST_MODIFICATION_TIME}).
*/
protected enum StartingPoint {
- ACCESS_TIME, LAST_MODIFICATION_TIME
+ ACCESS_TIME,
+ LAST_MODIFICATION_TIME
}
/**
@@ -1055,8 +1061,8 @@ public class ExpiresFilter extends FilterBase {
* @return array of patterns (non {@code null})
*/
protected static String[] commaDelimitedListToStringArray(String
commaDelimitedStrings) {
- return (commaDelimitedStrings == null ||
commaDelimitedStrings.length() == 0) ? new String[0]
- : commaSeparatedValuesPattern.split(commaDelimitedStrings);
+ return (commaDelimitedStrings == null ||
commaDelimitedStrings.length() == 0) ? new String[0] :
+ commaSeparatedValuesPattern.split(commaDelimitedStrings);
}
/**
@@ -1167,7 +1173,7 @@ public class ExpiresFilter extends FilterBase {
/**
* Expires configuration by content type. Visible for test.
*/
- private Map<String, ExpiresConfiguration>
expiresConfigurationByContentType = new LinkedHashMap<>();
+ private Map<String,ExpiresConfiguration> expiresConfigurationByContentType
= new LinkedHashMap<>();
@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain)
@@ -1343,7 +1349,7 @@ public class ExpiresFilter extends FilterBase {
return calendar.getTime();
}
- public Map<String, ExpiresConfiguration>
getExpiresConfigurationByContentType() {
+ public Map<String,ExpiresConfiguration>
getExpiresConfigurationByContentType() {
return expiresConfigurationByContentType;
}
@@ -1360,8 +1366,8 @@ public class ExpiresFilter extends FilterBase {
try {
if (name.startsWith(PARAMETER_EXPIRES_BY_TYPE)) {
- String contentType =
name.substring(PARAMETER_EXPIRES_BY_TYPE.length()).trim()
- .toLowerCase(Locale.ENGLISH);
+ String contentType =
+
name.substring(PARAMETER_EXPIRES_BY_TYPE.length()).trim().toLowerCase(Locale.ENGLISH);
ExpiresConfiguration expiresConfiguration =
parseExpiresConfiguration(value);
this.expiresConfigurationByContentType.put(contentType,
expiresConfiguration);
} else if (name.equalsIgnoreCase(PARAMETER_EXPIRES_DEFAULT)) {
@@ -1392,8 +1398,8 @@ public class ExpiresFilter extends FilterBase {
*/
protected boolean
isEligibleToExpirationHeaderGeneration(HttpServletRequest request,
XHttpServletResponse response) {
- boolean expirationHeaderHasBeenSet =
response.containsHeader(HEADER_EXPIRES) ||
- contains(response.getCacheControlHeader(), "max-age");
+ boolean expirationHeaderHasBeenSet =
+ response.containsHeader(HEADER_EXPIRES) ||
contains(response.getCacheControlHeader(), "max-age");
if (expirationHeaderHasBeenSet) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("expiresFilter.expirationHeaderAlreadyDefined",
request.getRequestURI(),
@@ -1454,8 +1460,8 @@ public class ExpiresFilter extends FilterBase {
String maxAgeDirective = "max-age=" + ((expirationDate.getTime() -
System.currentTimeMillis()) / 1000);
String cacheControlHeader = response.getCacheControlHeader();
- String newCacheControlHeader = (cacheControlHeader == null) ?
maxAgeDirective
- : cacheControlHeader + ", " + maxAgeDirective;
+ String newCacheControlHeader =
+ (cacheControlHeader == null) ? maxAgeDirective :
cacheControlHeader + ", " + maxAgeDirective;
response.setHeader(HEADER_CACHE_CONTROL, newCacheControlHeader);
response.setDateHeader(HEADER_EXPIRES, expirationDate.getTime());
}
@@ -1573,7 +1579,7 @@ public class ExpiresFilter extends FilterBase {
}
public void setExpiresConfigurationByContentType(
- Map<String, ExpiresConfiguration>
expiresConfigurationByContentType) {
+ Map<String,ExpiresConfiguration>
expiresConfigurationByContentType) {
this.expiresConfigurationByContentType =
expiresConfigurationByContentType;
}
diff --git a/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
b/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
index 711ea500cf..e81d3875b3 100644
--- a/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
+++ b/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
@@ -254,7 +254,9 @@ public class HttpHeaderSecurityFilter extends FilterBase {
private enum XFrameOption {
- DENY("DENY"), SAME_ORIGIN("SAMEORIGIN"), ALLOW_FROM("ALLOW-FROM");
+ DENY("DENY"),
+ SAME_ORIGIN("SAMEORIGIN"),
+ ALLOW_FROM("ALLOW-FROM");
private final String headerValue;
diff --git a/java/org/apache/catalina/filters/RateLimitFilter.java
b/java/org/apache/catalina/filters/RateLimitFilter.java
index 0d53891a67..fe4674ccb7 100644
--- a/java/org/apache/catalina/filters/RateLimitFilter.java
+++ b/java/org/apache/catalina/filters/RateLimitFilter.java
@@ -193,8 +193,8 @@ public class RateLimitFilter extends GenericFilter {
statusMessage = param;
}
- ScheduledExecutorService executorService =
- (ScheduledExecutorService)
getServletContext().getAttribute(ScheduledThreadPoolExecutor.class.getName());
+ ScheduledExecutorService executorService = (ScheduledExecutorService)
getServletContext()
+ .getAttribute(ScheduledThreadPoolExecutor.class.getName());
if (executorService == null) {
executorService = new
java.util.concurrent.ScheduledThreadPoolExecutor(1);
}
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index ac9491ffa2..61bf58ed31 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -462,7 +462,7 @@ public class RemoteIpFilter extends GenericFilter {
public static class XForwardedRequest extends HttpServletRequestWrapper {
- protected final Map<String, List<String>> headers;
+ protected final Map<String,List<String>> headers;
protected String localName;
@@ -513,15 +513,15 @@ public class RemoteIpFilter extends GenericFilter {
@Override
public String getHeader(String name) {
- Map.Entry<String, List<String>> header = getHeaderEntry(name);
+ Map.Entry<String,List<String>> header = getHeaderEntry(name);
if (header == null || header.getValue() == null ||
header.getValue().isEmpty()) {
return null;
}
return header.getValue().get(0);
}
- protected Map.Entry<String, List<String>> getHeaderEntry(String name) {
- for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+ protected Map.Entry<String,List<String>> getHeaderEntry(String name) {
+ for (Map.Entry<String,List<String>> entry : headers.entrySet()) {
if (entry.getKey().equalsIgnoreCase(name)) {
return entry;
}
@@ -536,7 +536,7 @@ public class RemoteIpFilter extends GenericFilter {
@Override
public Enumeration<String> getHeaders(String name) {
- Map.Entry<String, List<String>> header = getHeaderEntry(name);
+ Map.Entry<String,List<String>> header = getHeaderEntry(name);
if (header == null || header.getValue() == null) {
return
Collections.enumeration(Collections.<String>emptyList());
}
@@ -588,7 +588,7 @@ public class RemoteIpFilter extends GenericFilter {
}
public void removeHeader(String name) {
- Map.Entry<String, List<String>> header = getHeaderEntry(name);
+ Map.Entry<String,List<String>> header = getHeaderEntry(name);
if (header != null) {
headers.remove(header.getKey());
}
@@ -596,7 +596,7 @@ public class RemoteIpFilter extends GenericFilter {
public void setHeader(String name, String value) {
List<String> values = Collections.singletonList(value);
- Map.Entry<String, List<String>> header = getHeaderEntry(name);
+ Map.Entry<String,List<String>> header = getHeaderEntry(name);
if (header == null) {
headers.put(name, values);
} else {
@@ -701,8 +701,8 @@ public class RemoteIpFilter extends GenericFilter {
* @return array of patterns (non <code>null</code>)
*/
protected static String[] commaDelimitedListToStringArray(String
commaDelimitedStrings) {
- return (commaDelimitedStrings == null ||
commaDelimitedStrings.length() == 0) ? new String[0]
- : commaSeparatedValuesPattern.split(commaDelimitedStrings);
+ return (commaDelimitedStrings == null ||
commaDelimitedStrings.length() == 0) ? new String[0] :
+ commaSeparatedValuesPattern.split(commaDelimitedStrings);
}
/**
@@ -745,8 +745,8 @@ public class RemoteIpFilter extends GenericFilter {
/**
* @see #setInternalProxies(String)
*/
- private Pattern internalProxies = Pattern
- .compile("10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" +
"192\\.168\\.\\d{1,3}\\.\\d{1,3}|" +
+ private Pattern internalProxies =
+ Pattern.compile("10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" +
"192\\.168\\.\\d{1,3}\\.\\d{1,3}|" +
"169\\.254\\.\\d{1,3}\\.\\d{1,3}|" +
"127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" +
"100\\.6[4-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
"100\\.[7-9]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" +
"100\\.1[0-1]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" +
"100\\.12[0-7]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
diff --git a/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
b/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
index d21ffd3495..5e543da690 100644
--- a/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java
@@ -77,12 +77,13 @@ import jakarta.servlet.http.HttpSession;
*/
public class RestCsrfPreventionFilter extends CsrfPreventionFilterBase {
private enum MethodType {
- NON_MODIFYING_METHOD, MODIFYING_METHOD
+ NON_MODIFYING_METHOD,
+ MODIFYING_METHOD
}
private static final Pattern NON_MODIFYING_METHODS_PATTERN =
Pattern.compile("GET|HEAD|OPTIONS");
- private static final Predicate<String> nonModifyingMethods = m ->
Objects.nonNull(m) &&
- NON_MODIFYING_METHODS_PATTERN.matcher(m).matches();
+ private static final Predicate<String> nonModifyingMethods =
+ m -> Objects.nonNull(m) &&
NON_MODIFYING_METHODS_PATTERN.matcher(m).matches();
private Set<String> pathsAcceptingParams = new HashSet<>();
@@ -126,10 +127,10 @@ public class RestCsrfPreventionFilter extends
CsrfPreventionFilterBase {
}
private interface RestCsrfPreventionStrategy {
- NonceSupplier<HttpServletRequest, String> nonceFromRequestHeader =
HttpServletRequest::getHeader;
- NonceSupplier<HttpServletRequest, String[]> nonceFromRequestParams =
ServletRequest::getParameterValues;
- NonceSupplier<HttpSession, String> nonceFromSession = (s, k) ->
Objects.isNull(s) ? null
- : (String) s.getAttribute(k);
+ NonceSupplier<HttpServletRequest,String> nonceFromRequestHeader =
HttpServletRequest::getHeader;
+ NonceSupplier<HttpServletRequest,String[]> nonceFromRequestParams =
ServletRequest::getParameterValues;
+ NonceSupplier<HttpSession,String> nonceFromSession =
+ (s, k) -> Objects.isNull(s) ? null : (String)
s.getAttribute(k);
NonceConsumer<HttpServletResponse> nonceToResponse =
HttpServletResponse::setHeader;
NonceConsumer<HttpSession> nonceToSession = HttpSession::setAttribute;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
