This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 9e8b4a2f83 Code clean-up - formatting. No functional change. 9e8b4a2f83 is described below commit 9e8b4a2f832487020c26df390bffd23beb2c20e6 Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jul 4 12:32:11 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 | 10 +++---- .../catalina/filters/CsrfPreventionFilterBase.java | 4 +-- .../org/apache/catalina/filters/ExpiresFilter.java | 34 +++++++++++++--------- .../catalina/filters/HttpHeaderSecurityFilter.java | 4 ++- .../apache/catalina/filters/RemoteIpFilter.java | 22 +++++++------- .../catalina/filters/RestCsrfPreventionFilter.java | 7 +++-- 8 files changed, 53 insertions(+), 43 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 c211ea66cc..ca29c554a9 100644 --- a/java/org/apache/catalina/filters/CorsFilter.java +++ b/java/org/apache/catalina/filters/CorsFilter.java @@ -278,8 +278,8 @@ public class CorsFilter implements Filter { } // 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(","); @@ -571,8 +571,8 @@ public class CorsFilter implements Filter { 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 && @@ -922,8 +922,8 @@ public class CorsFilter implements Filter { /** * 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 9bb2660a33..ef5e979126 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; } @@ -355,14 +355,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<T, T>() { + cache = new LinkedHashMap<T,T>() { 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 f4aebc8d32..2e63d6b4a5 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 26deb4409e..98e0799cb3 100644 --- a/java/org/apache/catalina/filters/ExpiresFilter.java +++ b/java/org/apache/catalina/filters/ExpiresFilter.java @@ -449,8 +449,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; @@ -509,7 +514,8 @@ public class ExpiresFilter extends FilterBase { * {@link StartingPoint#LAST_MODIFICATION_TIME}). */ protected enum StartingPoint { - ACCESS_TIME, LAST_MODIFICATION_TIME + ACCESS_TIME, + LAST_MODIFICATION_TIME } /** @@ -1058,8 +1064,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); } /** @@ -1170,7 +1176,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) @@ -1374,7 +1380,7 @@ public class ExpiresFilter extends FilterBase { return calendar.getTime(); } - public Map<String, ExpiresConfiguration> getExpiresConfigurationByContentType() { + public Map<String,ExpiresConfiguration> getExpiresConfigurationByContentType() { return expiresConfigurationByContentType; } @@ -1391,8 +1397,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)) { @@ -1423,8 +1429,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(), @@ -1485,8 +1491,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()); } @@ -1604,7 +1610,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 668ce3b444..81125441fa 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/RemoteIpFilter.java b/java/org/apache/catalina/filters/RemoteIpFilter.java index ea0541db9a..1bb5f58e89 100644 --- a/java/org/apache/catalina/filters/RemoteIpFilter.java +++ b/java/org/apache/catalina/filters/RemoteIpFilter.java @@ -456,7 +456,7 @@ public class RemoteIpFilter implements Filter { public static class XForwardedRequest extends HttpServletRequestWrapper { - protected final Map<String, List<String>> headers; + protected final Map<String,List<String>> headers; protected String localName; @@ -507,15 +507,15 @@ public class RemoteIpFilter implements Filter { @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; } @@ -530,7 +530,7 @@ public class RemoteIpFilter implements Filter { @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()); } @@ -582,7 +582,7 @@ public class RemoteIpFilter implements Filter { } 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()); } @@ -590,7 +590,7 @@ public class RemoteIpFilter implements Filter { 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 { @@ -697,8 +697,8 @@ public class RemoteIpFilter implements Filter { * @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); } /** @@ -741,8 +741,8 @@ public class RemoteIpFilter implements Filter { /** * @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 79419bd39b..9f10442816 100644 --- a/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java +++ b/java/org/apache/catalina/filters/RestCsrfPreventionFilter.java @@ -75,7 +75,8 @@ import javax.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"); @@ -211,8 +212,8 @@ public class RestCsrfPreventionFilter extends CsrfPreventionFilterBase { public boolean apply(HttpServletRequest request, HttpServletResponse response) { if (Constants.CSRF_REST_NONCE_HEADER_FETCH_VALUE .equalsIgnoreCase(extractNonceFromRequestHeader(request, Constants.CSRF_REST_NONCE_HEADER_NAME))) { - String nonceFromSessionStr = extractNonceFromSession(request.getSession(false), - Constants.CSRF_REST_NONCE_SESSION_ATTR_NAME); + String nonceFromSessionStr = + extractNonceFromSession(request.getSession(false), Constants.CSRF_REST_NONCE_SESSION_ATTR_NAME); if (nonceFromSessionStr == null) { nonceFromSessionStr = generateNonce(request); storeNonceToSession(Objects.requireNonNull(request.getSession(true)), --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org