Author: markt
Date: Thu Jun 16 12:52:37 2016
New Revision: 1748716
URL: http://svn.apache.org/viewvc?rev=1748716&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57705
Add debug logging for requests denied by the remote host and remote address
valves and filters. Based on a patch by Graham Leggett.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RequestFilter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 12:52:37 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747980,1747
993,1748001,1748253,1748452,1748547,1748676
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747980,1747
993,1748001,1748253,1748452,1748547,1748676,1748715
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties?rev=1748716&r1=1748715&r2=1748716&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties
Thu Jun 16 12:52:37 2016
@@ -47,4 +47,6 @@ expiresFilter.invalidDurationUnit=Invali
httpHeaderSecurityFilter.committed=Unable to add HTTP headers since response
is already committed on entry to the HTTP header security Filter
httpHeaderSecurityFilter.clickjack.invalid=An invalid value [{0}] was
specified for the anti click-jacking header
+requestFilter.deny=Denied request for [{0}] based on property [{1}]
+
restCsrfPreventionFilter.invalidNonce=CSRF nonce validation failed
\ No newline at end of file
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RequestFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RequestFilter.java?rev=1748716&r1=1748715&r2=1748716&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RequestFilter.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RequestFilter.java
Thu Jun 16 12:52:37 2016
@@ -24,6 +24,7 @@ import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
@@ -204,6 +205,10 @@ public abstract class RequestFilter exte
chain.doFilter(request, response);
} else {
if (response instanceof HttpServletResponse) {
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug(sm.getString("requestFilter.deny",
+ ((HttpServletRequest) request).getRequestURI(),
property));
+ }
((HttpServletResponse) response).sendError(denyStatus);
} else {
sendErrorWhenNotHttp(response);
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1748716&r1=1748715&r2=1748716&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties
Thu Jun 16 12:52:37 2016
@@ -46,6 +46,7 @@ remoteIpValve.invalidPortHeader=Invalid
# Request filter valve - RemoteAddrValve, RemoteHostValve
requestFilterValve.configInvalid=One or more invalid configuration settings
were provided for the Remote[Addr|Host]Valve which prevented the Valve and its
parent containers from starting
+requestFilterValve.deny=Denied request for [{0}] based on property [{1}]
sslValve.certError=Failed to process certificate string [{0}] to create a
java.security.cert.X509Certificate object
sslValve.invalidProvider=The SSL provider specified on the connector
associated with this request of [{0}] is invalid. The certificate data could
not be processed.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java?rev=1748716&r1=1748715&r2=1748716&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java
Thu Jun 16 12:52:37 2016
@@ -23,6 +23,8 @@ import javax.servlet.ServletException;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
@@ -34,6 +36,9 @@ import org.apache.catalina.connector.Res
*/
public final class RemoteAddrValve extends RequestFilterValve {
+ private static final Log log = LogFactory.getLog(RemoteAddrValve.class);
+
+
// ----------------------------------------------------- Instance Variables
/**
@@ -72,22 +77,8 @@ public final class RemoteAddrValve exten
// --------------------------------------------------------- Public Methods
- /**
- * Extract the desired request property, and pass it (along with the
- * specified request and response objects) to the protected
- * <code>process()</code> method to perform the actual filtering.
- * This method must be implemented by a concrete subclass.
- *
- * @param request The servlet request to be processed
- * @param response The servlet response to be created
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet error occurs
- */
@Override
- public void invoke(Request request, Response response)
- throws IOException, ServletException {
-
+ public void invoke(Request request, Response response) throws IOException,
ServletException {
String property;
if (addConnectorPort) {
property = request.getRequest().getRemoteAddr() + ";" +
request.getConnector().getPort();
@@ -95,6 +86,12 @@ public final class RemoteAddrValve exten
property = request.getRequest().getRemoteAddr();
}
process(property, request, response);
+ }
+
+
+ @Override
+ protected Log getLog() {
+ return log;
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java?rev=1748716&r1=1748715&r2=1748716&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteHostValve.java
Thu Jun 16 12:52:37 2016
@@ -16,14 +16,14 @@
*/
package org.apache.catalina.valves;
-
import java.io.IOException;
import javax.servlet.ServletException;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Concrete implementation of <code>RequestFilterValve</code> that filters
@@ -34,6 +34,9 @@ import org.apache.catalina.connector.Res
*/
public final class RemoteHostValve extends RequestFilterValve {
+ private static final Log log = LogFactory.getLog(RemoteHostValve.class);
+
+
// ----------------------------------------------------- Instance Variables
/**
@@ -71,22 +74,8 @@ public final class RemoteHostValve exten
// --------------------------------------------------------- Public Methods
- /**
- * Extract the desired request property, and pass it (along with the
- * specified request and response objects) to the protected
- * <code>process()</code> method to perform the actual filtering.
- * This method must be implemented by a concrete subclass.
- *
- * @param request The servlet request to be processed
- * @param response The servlet response to be created
- *
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet error occurs
- */
@Override
- public void invoke(Request request, Response response)
- throws IOException, ServletException {
-
+ public void invoke(Request request, Response response) throws IOException,
ServletException {
String property;
if (addConnectorPort) {
property = request.getRequest().getRemoteHost() + ";" +
request.getConnector().getPort();
@@ -94,6 +83,11 @@ public final class RemoteHostValve exten
property = request.getRequest().getRemoteHost();
}
process(property, request, response);
+ }
+
+ @Override
+ protected Log getLog() {
+ return log;
}
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=1748716&r1=1748715&r2=1748716&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
Thu Jun 16 12:52:37 2016
@@ -27,6 +27,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
+import org.apache.juli.logging.Log;
/**
* Implementation of a Valve that performs filtering based on comparing the
@@ -319,12 +320,19 @@ public abstract class RequestFilterValve
return;
}
+ if (getLog().isDebugEnabled()) {
+ getLog().debug(sm.getString("requestFilterValve.deny",
+ request.getRequestURI(), property));
+ }
+
// Deny this request
denyRequest(request, response);
-
}
+ protected abstract Log getLog();
+
+
/**
* Reject the request that was denied by this valve.
* <p>If <code>invalidAuthenticationWhenDeny</code> is true
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1748716&r1=1748715&r2=1748716&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Jun 16 12:52:37 2016
@@ -48,6 +48,11 @@
<subsection name="Catalina">
<changelog>
<fix>
+ <bug>57705</bug>: Add debug logging for requests denied by the remote
+ host and remote address valves and filters. Based on a patch by Graham
+ Leggett. (markt)
+ </fix>
+ <fix>
Correct a regression in the fix for <bug>58588</bug> that removed the
entire <code>org.apache.juli</code> package from the embedded JARs
rendering them unusable. (markt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
