This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 11.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit eb2514ded7dc1e02810b348d4939bd824d711223 Author: Mark Thomas <[email protected]> AuthorDate: Thu Oct 2 10:01:39 2025 +0100 Back-port clean-up --- .../apache/catalina/filters/RemoteIpFilter.java | 32 +-------------------- java/org/apache/catalina/valves/RemoteIpValve.java | 33 ---------------------- 2 files changed, 1 insertion(+), 64 deletions(-) diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java b/java/org/apache/catalina/filters/RemoteIpFilter.java index 984892d7b7..a618daa9e6 100644 --- a/java/org/apache/catalina/filters/RemoteIpFilter.java +++ b/java/org/apache/catalina/filters/RemoteIpFilter.java @@ -670,31 +670,16 @@ public class RemoteIpFilter extends GenericFilter { protected static final String ENABLE_LOOKUPS_PARAMETER = "enableLookups"; - /** - * @see #setHttpServerPort(int) - */ private int httpServerPort = 80; - /** - * @see #setHttpsServerPort(int) - */ private int httpsServerPort = 443; - /** - * Regular expression pattern for internal proxies. - */ private Pattern internalProxiesRegex = null; - /** - * CIDR notation for internal proxies. - */ private NetMaskSet internalProxiesCidr = NetMaskSet.parse("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,169.254.0.0/16,100.64.0.0/10,127.0.0.0/8," + "::1/128,fe80::/10,fc00::/7"); - /** - * @see #setProtocolHeader(String) - */ private String protocolHeader = "X-Forwarded-Proto"; private String protocolHeaderHttpsValue = "https"; @@ -707,34 +692,19 @@ public class RemoteIpFilter extends GenericFilter { private boolean changeLocalPort = false; - /** - * @see #setProxiesHeader(String) - */ private String proxiesHeader = "X-Forwarded-By"; - /** - * @see #setRemoteIpHeader(String) - */ private String remoteIpHeader = "X-Forwarded-For"; - /** - * @see #setRequestAttributesEnabled(boolean) - */ private boolean requestAttributesEnabled = true; - /** - * Regular expression notation for trusted proxies. - */ private Pattern trustedProxiesRegex = null; - /** - * CIDR notation for trusted proxies. - */ private NetMaskSet trustedProxiesCidr = null; - private boolean enableLookups; + public void doFilter(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException { diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java index f54879070d..a58c97a39e 100644 --- a/java/org/apache/catalina/valves/RemoteIpValve.java +++ b/java/org/apache/catalina/valves/RemoteIpValve.java @@ -352,65 +352,32 @@ public class RemoteIpValve extends ValveBase { private boolean changeLocalName = false; - /** - * @see #setHttpServerPort(int) - */ private int httpServerPort = 80; - /** - * @see #setHttpsServerPort(int) - */ private int httpsServerPort = 443; private String portHeader = null; private boolean changeLocalPort = false; - /** - * Regular expression pattern for internal proxies. - */ private Pattern internalProxiesRegex = null; - /** - * CIDR notation for internal proxies. - */ private NetMaskSet internalProxiesCidr = NetMaskSet.parse("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,169.254.0.0/16,100.64.0.0/10,127.0.0.0/8," + "::1/128,fe80::/10,fc00::/7"); - /** - * @see #setProtocolHeader(String) - */ private String protocolHeader = "X-Forwarded-Proto"; - /** - * @see #setProtocolHeaderHttpsValue(String) - */ private String protocolHeaderHttpsValue = "https"; - /** - * @see #setProxiesHeader(String) - */ private String proxiesHeader = "X-Forwarded-By"; - /** - * @see #setRemoteIpHeader(String) - */ private String remoteIpHeader = "X-Forwarded-For"; - /** - * @see #setRequestAttributesEnabled(boolean) - */ private boolean requestAttributesEnabled = true; - /** - * Regular expression notation for trusted proxies. - */ private Pattern trustedProxiesRegex = null; - /** - * CIDR notation for trusted proxies. - */ private NetMaskSet trustedProxiesCidr = null; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
