svn commit: r1832147 - /tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Author: kfujino Date: Thu May 24 08:37:54 2018 New Revision: 1832147 URL: http://svn.apache.org/viewvc?rev=1832147&view=rev Log: Fix javadoc. remove old description. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Modified: tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1832147&r1=1832146&r2=1832147&view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Thu May 24 08:37:54 2018 @@ -50,9 +50,7 @@ import org.apache.tomcat.util.res.String * restarted! * * - * Add this Valve to your host definition at conf/server.xml . - * - * Since 5.5.10 as direct cluster valve: + * Add this Valve to your cluster definition at conf/server.xml . * * *@@ -60,15 +58,6 @@ import org.apache.tomcat.util.res.String * * * - * - * Before 5.5.10 as Host element: - * - * - *- * - * - * * A Trick: * You can enable this mod_jk turnover mode via JMX before you drop a node to * all backup nodes! Set enable true on all JvmRouteBinderValve backups, disable - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org- *
svn commit: r1832148 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Author: kfujino Date: Thu May 24 08:38:42 2018 New Revision: 1832148 URL: http://svn.apache.org/viewvc?rev=1832148&view=rev Log: Fix javadoc. remove old description. Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1832148&r1=1832147&r2=1832148&view=diff == --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Thu May 24 08:38:42 2018 @@ -50,9 +50,7 @@ import org.apache.tomcat.util.res.String * restarted! * * - * Add this Valve to your host definition at conf/server.xml . - * - * Since 5.5.10 as direct cluster valve: + * Add this Valve to your cluster definition at conf/server.xml . * * *@@ -60,15 +58,6 @@ import org.apache.tomcat.util.res.String * * * - * - * Before 5.5.10 as Host element: - * - * - *- * - * - * * A Trick: * You can enable this mod_jk turnover mode via JMX before you drop a node to * all backup nodes! Set enable true on all JvmRouteBinderValve backups, disable - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org- *
svn commit: r1832149 - /tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Author: kfujino Date: Thu May 24 08:39:22 2018 New Revision: 1832149 URL: http://svn.apache.org/viewvc?rev=1832149&view=rev Log: Fix javadoc. remove old description. Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1832149&r1=1832148&r2=1832149&view=diff == --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Thu May 24 08:39:22 2018 @@ -48,9 +48,7 @@ import org.apache.tomcat.util.res.String * restarted! * * - * Add this Valve to your host definition at conf/server.xml . - * - * Since 5.5.10 as direct cluster valve: + * Add this Valve to your cluster definition at conf/server.xml . * * *@@ -58,15 +56,6 @@ import org.apache.tomcat.util.res.String * * * - * - * Before 5.5.10 as Host element: - * - * - *- * - * - * * A Trick: * You can enable this mod_jk turnover mode via JMX before you drop a node to * all backup nodes! Set enable true on all JvmRouteBinderValve backups, disable - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org- *
svn commit: r1832150 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Author: kfujino Date: Thu May 24 08:40:03 2018 New Revision: 1832150 URL: http://svn.apache.org/viewvc?rev=1832150&view=rev Log: Fix javadoc. remove old description. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1832150&r1=1832149&r2=1832150&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Thu May 24 08:40:03 2018 @@ -60,9 +60,7 @@ import org.apache.tomcat.util.res.String * for earlier versions of Tomcat. * * - * Add this Valve to your host definition at conf/server.xml . - * - * Since 5.5.10 as direct cluster valve: + * Add this Valve to your cluster definition at conf/server.xml . * * *@@ -70,15 +68,6 @@ import org.apache.tomcat.util.res.String * * * - * - * Before 5.5.10 as Host element: - * - * - *- * - * - * * A Trick: * You can enable this mod_jk turnover mode via JMX before you drop a node to * all backup nodes! Set enable true on all JvmRouteBinderValve backups, disable - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org- *
[Bug 62405] Add Rereadable Request Filter
https://bz.apache.org/bugzilla/show_bug.cgi?id=62405 --- Comment #3 from Mark Thomas --- This has come up before. A few of the past threads: http://tomcat.markmail.org/thread/fumpfuspt7a3nesz http://tomcat.markmail.org/thread/tqig7tldxjrra3bh It would be worth a more thorough search of the archives for other previous discussions. The short version is doing this generically is non-trivial. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62404] Visibility issue on field org.apache.catalina.util.LifecycleBase.throwOnFailure
https://bz.apache.org/bugzilla/show_bug.cgi?id=62404 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WONTFIX --- Comment #3 from Mark Thomas --- Technically you are correct. In practice, we have never had a real world issue reported. Normal start-up is thread-safe. It is dynamic changes that are not. I put together this test case to explore how unsafe the current code is: https://github.com/markt-asf/tomcat-bugs/commit/882c41fdfaa279f4a5170511f16a053d78d9472c Extracting the last few lines of 'logging': Watcher saw same at 7310137521471 Watcher saw same at 7310155333140 Watcher saw same at 7310155335820 Watcher saw same at 7310155337876 Watcher saw same at 7310155339813 Watcher saw same at 7310155341560 Watcher saw same at 7310155343307 Editor set value at 7310138468765 Watcher saw same at 7310155345102 Watcher saw same at 7310155380742 Watcher saw same at 7310155386530 Watcher saw same at 7310155388266 Watcher saw same at 7310155389965 Watcher saw same at 7310155391695 Watcher saw same at 7310155393384 Watcher saw same at 7310155395115 Watcher saw change at 7310155417083 We can see that it takes approximately 16948318ns or ~17ms for the change to become visible. In some cases that window where the threads see different values would cause all sorts of problems. In this case, that short delay isn't going to cause any problems. Even if that delay was an order of magnitude longer, I don't think there would be any problems. Arguably, we could make this field volatile. Making that change would have taken a lot less time than it took to write up this comment. However, the same argument could be made for pretty much all of the fields in Tomcat that hold configuration values. The WONTFIX is more a reflection that I don't think it is worth the effort to make them all volatile. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1832160 - /tomcat/trunk/java/org/apache/catalina/filters/
Author: markt
Date: Thu May 24 12:57:24 2018
New Revision: 1832160
URL: http://svn.apache.org/viewvc?rev=1832160&view=rev
Log:
Logs for Filters must be non-static as loggers are created per class-loader and
Filters may be used in multiple class loaders.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java
tomcat/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java
Modified:
tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java?rev=1832160&r1=1832159&r2=1832160&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java
Thu May 24 12:57:24 2018
@@ -47,8 +47,9 @@ import org.apache.juli.logging.LogFactor
*/
public class AddDefaultCharsetFilter extends FilterBase {
-private static final Log log =
-LogFactory.getLog(AddDefaultCharsetFilter.class);
+// Log must be non-static as loggers are created per class-loader and this
+// Filter may be used in multiple class loaders
+private final Log log = LogFactory.getLog(AddDefaultCharsetFilter.class);
private static final String DEFAULT_ENCODING = "ISO-8859-1";
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java?rev=1832160&r1=1832159&r2=1832160&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
Thu May 24 12:57:24 2018
@@ -29,7 +29,9 @@ import org.apache.juli.logging.LogFactor
public abstract class CsrfPreventionFilterBase extends FilterBase {
-private static final Log log =
LogFactory.getLog(CsrfPreventionFilterBase.class);
+// Log must be non-static as loggers are created per class-loader and this
+// Filter may be used in multiple class loaders
+private final Log log = LogFactory.getLog(CsrfPreventionFilterBase.class);
private String randomClass = SecureRandom.class.getName();
Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1832160&r1=1832159&r2=1832160&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Thu May 24
12:57:24 2018
@@ -1050,7 +1050,9 @@ public class ExpiresFilter extends Filte
private static final String HEADER_LAST_MODIFIED = "Last-Modified";
-private static final Log log = LogFactory.getLog(ExpiresFilter.class);
+// Log must be non-static as loggers are created per class-loader and this
+// Filter may be used in multiple class loaders
+private final Log log = LogFactory.getLog(ExpiresFilter.class);
private static final String PARAMETER_EXPIRES_BY_TYPE = "ExpiresByType";
Modified: tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java?rev=1832160&r1=1832159&r2=1832160&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java Thu
May 24 12:57:24 2018
@@ -43,7 +43,9 @@ import org.apache.tomcat.util.http.Param
*/
public class FailedRequestFilter extends FilterBase {
-private static final Log log =
LogFactory.getLog(FailedRequestFilter.class);
+// Log must be non-static as loggers are created per class-loader and this
+// Filter may be used in multiple class loaders
+private final Log log = LogFactory.getLog(FailedRequestFilter.class);
@Override
protected Log getLogger() {
Mo
svn commit: r1832163 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu May 24 13:02:59 2018 New Revision: 1832163 URL: http://svn.apache.org/viewvc?rev=1832163&view=rev Log: Update changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1832163&r1=1832162&r2=1832163&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Thu May 24 13:02:59 2018 @@ -112,6 +112,11 @@ session is invalidated because the file has not been created yet. (markt) + +Make all loggers associated with Tomcat provided Filters non-static to +ensure that log messages are not lost when a web application is +reloaded. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1832164 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/ webapps/docs/
Author: markt Date: Thu May 24 13:03:38 2018 New Revision: 1832164 URL: http://svn.apache.org/viewvc?rev=1832164&view=rev Log: Logs for Filters must be non-static as loggers are created per class-loader and Filters may be used in multiple class loaders. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 24 13:03:38 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,175
svn commit: r1832165 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/filters/ webapps/docs/
Author: markt Date: Thu May 24 13:04:23 2018 New Revision: 1832165 URL: http://svn.apache.org/viewvc?rev=1832165&view=rev Log: Logs for Filters must be non-static as loggers are created per class-loader and Filters may be used in multiple class loaders. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java tomcat/tc8.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 24 13:04:23 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1779898,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799,1807079-1807080,1808880,1809831,1812093,1812143,1812145,1812319,1814975,1815945,1815956,1820207,1822186,1823164,1823497,1824960,1826872-1826873,1827862,1829310,1829777,1829796,1829935,1830215,1830991,1831042,1831557,1831569 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,16
svn commit: r1832167 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/ webapps/docs/
Author: markt Date: Thu May 24 13:19:07 2018 New Revision: 1832167 URL: http://svn.apache.org/viewvc?rev=1832167&view=rev Log: (empty) Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/AddDefaultCharsetFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/ExpiresFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/FailedRequestFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/HttpHeaderSecurityFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/SetCharacterEncodingFilter.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 24 13:19:07 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3304 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1832163 Blamelist: markt BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62404] Visibility issue on field org.apache.catalina.util.LifecycleBase.throwOnFailure
https://bz.apache.org/bugzilla/show_bug.cgi?id=62404 Christopher Schultz changed: What|Removed |Added Resolution|WONTFIX |FIXED --- Comment #4 from Christopher Schultz --- Is a race-condition here actually a problem? Who cares if thread B sees a delay when thread A changes that setting? I agree with Mark, here: there are many fields in [most programs] that could be changed to volatile, but it's just not worth it. Marking a field as volatile requires that all accesses of that field cause a memory barrier to occur which necessarily slows down performance. If there is a particular reason that the field value MUST be up-to-date across all threads at runtime, then there is a good reason to make it volatile. In this case, I see no use at all of taking a (small) performance hit for this field. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62404] Visibility issue on field org.apache.catalina.util.LifecycleBase.throwOnFailure
https://bz.apache.org/bugzilla/show_bug.cgi?id=62404 Christopher Schultz changed: What|Removed |Added Resolution|FIXED |WONTFIX -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62408] New: (New feature) Make configurable the number of retries in case of upstream failures
https://bz.apache.org/bugzilla/show_bug.cgi?id=62408 Bug ID: 62408 Summary: (New feature) Make configurable the number of retries in case of upstream failures Product: Tomcat Connectors Version: unspecified Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: mod_jk Assignee: dev@tomcat.apache.org Reporter: frederik.n...@gmail.com Target Milestone: --- Created attachment 35947 --> https://bz.apache.org/bugzilla/attachment.cgi?id=35947&action=edit Patch implementing the desired funcionality This is a patch we're using in production from some years now. This adds a new configuration parameter to load balancer workers, named lb_retries. There can be set the number of retries when a request to upstream fails. Right now the behaviour we observe is that in case of failure the LB retries to all workers at least once. When all backends are busy this adds even more load in our experience. Please consider merging, and ask for any additional info needed. Thanks -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62405] Add Rereadable Request Filter
https://bz.apache.org/bugzilla/show_bug.cgi?id=62405 --- Comment #4 from Igal Sapir --- (In reply to Mark Thomas from comment #3) > This has come up before. A few of the past threads: > http://tomcat.markmail.org/thread/fumpfuspt7a3nesz > http://tomcat.markmail.org/thread/tqig7tldxjrra3bh Going over these threads I see that the main issue is if the Filter wraps getReader() and getInputStream() but not getParameter() and getParameterMap(). >From the 2nd link above: >> Consider the following: >> >> Tomcat provides request R. >> Filter reads request body using R.getInputStream(). >> Filter caches request body. >> Filter wraps request R to provide R', over-riding getInputStream() to >> provide the cached body. >> Filter passes R' to the application. >> Application calls R'.getParameter() >> R'.getParameter() calls R.getParameter() >> Keep in mind at this point R has zero knowledge of R'. >> >> R calls getInputStream() to read request body but that InputStream has >> already been read. >> >> The problem is the wrapper, R'. Over-riding getInputStream() is not >> enough. It needs to over-ride every method that may access that >> InputStream. Which is non-trivial because it means re-implementing a lot >> of functionality the container would normally provide for you out of the >> box. My implementation [1] does provide a wrapper for getParameter() #L95 and getParameterMap() #L111 in the Filter, so I believe that that issue is taken care of. > It would be worth a more thorough search of the archives for other previous > discussions. Unfortunately the search capability of the archives is not that great. [1] https://github.com/isapir/servlet-filter-utils/blob/master/src/main/java/net/twentyonesolutions/servlet/util/RereadableServletRequest.java#L95 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62389] Add ipv6 loopback address to the default internalProxies
https://bz.apache.org/bugzilla/show_bug.cgi?id=62389 Phillip Webb changed: What|Removed |Added CC||pw...@pivotal.io -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62405] Add Rereadable Request Filter
https://bz.apache.org/bugzilla/show_bug.cgi?id=62405 --- Comment #5 from Mark Thomas --- I usually head towards tomcat.markmail.org when I need to search the archives. >From memory, getPart() and getParts() also caused complications. I don't think getTrailerFields() etc. was part of any of those discussions either. I haven't looked to see if it plays nicely with the buffering solution. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62405] Add Rereadable Request Filter
https://bz.apache.org/bugzilla/show_bug.cgi?id=62405 --- Comment #6 from Igal Sapir --- (In reply to Mark Thomas from comment #5) > I usually head towards tomcat.markmail.org when I need to search the > archives. Good to know. I was looking at http://tomcat.apache.org/lists.html and under archives I saw >> Archives: at Apache, at MARC (searchable), at MarkMail, at Nabble >> and at Mail Archive so I thought that only MARC is searchable and didn't bother to check the others. MarkMail seems to have a better search than MARC. I will update the lists.html page on the site. > From memory, getPart() and getParts() also caused complications. > > I don't think getTrailerFields() etc. was part of any of those discussions > either. I haven't looked to see if it plays nicely with the buffering > solution. I will look into those and update this thread when I have more information. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] New committer: Igal Sapir
On behalf of the Tomcat committers I am pleased to announce that Igal Sapir (isapir) has been voted in as a new Tomcat committer. Please join me in welcoming him. Regards, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1832193 - in /tomcat/trunk: java/org/apache/catalina/filters/ java/org/apache/catalina/valves/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Thu May 24 19:41:06 2018
New Revision: 1832193
URL: http://svn.apache.org/viewvc?rev=1832193&view=rev
Log:
Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny
requests based on IPv4 and/or IPv6 client address where the IP ranges are
defined using CIDR notation.
Based on a patch by Francis Galiegue.
Added:
tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java (with
props)
tomcat/trunk/java/org/apache/catalina/valves/RemoteCIDRValve.java (with
props)
Modified:
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties?rev=1832193&r1=1832192&r2=1832193&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties Thu
May 24 19:41:06 2018
@@ -49,6 +49,9 @@ 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
+remoteCidrFilter.invalid=Invalid configuration provided for [{0}]. See
previous messages for details.
+remoteCidrFilter.noRemoteIp=Client does not have an IP address. Request denied.
+
requestFilter.deny=Denied request for [{0}] based on property [{1}]
restCsrfPreventionFilter.invalidNonce=CSRF nonce validation failed
\ No newline at end of file
Added: tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java?rev=1832193&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java (added)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java Thu May
24 19:41:06 2018
@@ -0,0 +1,236 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.filters;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.catalina.util.NetMask;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+public final class RemoteCIDRFilter extends FilterBase {
+
+/**
+ * text/plain MIME type: this is the MIME type we return when a
+ * {@link ServletResponse} is not an {@link HttpServletResponse}
+ */
+private static final String PLAIN_TEXT_MIME_TYPE = "text/plain";
+
+/**
+ * Our logger
+ */
+private final Log log = LogFactory.getLog(RemoteCIDRFilter.class);
+
+/**
+ * The list of allowed {@link NetMask}s
+ */
+private final List allow = new ArrayList<>();
+
+/**
+ * The list of denied {@link NetMask}s
+ */
+private final List deny = new ArrayList<>();
+
+
+/**
+ * Return a string representation of the {@link NetMask} list in #allow.
+ *
+ * @return the #allow list as a string, without the leading '[' and
trailing
+ * ']'
+ */
+public String getAllow() {
+return allow.toString().replace("[", "").replace("]", "");
+}
+
+
+/**
+ * Fill the #allow list with the list of netmasks provided as an argument,
+ * if any. Calls #fillFromInput.
+ *
+ * @param
svn commit: r1832194 - in /tomcat/site/trunk: docs/security-9.html xdocs/security-9.xml
Author: markt Date: Thu May 24 19:43:30 2018 New Revision: 1832194 URL: http://svn.apache.org/viewvc?rev=1832194&view=rev Log: Fix copy/paste error in fixed version header Modified: tomcat/site/trunk/docs/security-9.html tomcat/site/trunk/xdocs/security-9.xml Modified: tomcat/site/trunk/docs/security-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1832194&r1=1832193&r2=1832194&view=diff == --- tomcat/site/trunk/docs/security-9.html (original) +++ tomcat/site/trunk/docs/security-9.html Thu May 24 19:43:30 2018 @@ -222,7 +222,7 @@ Apache Tomcat 9.x vulnerabilities -Fixed in Apache Tomcat 9.0.5 +Fixed in Apache Tomcat 9.0.9 Fixed in Apache Tomcat 9.0.5 @@ -312,8 +312,8 @@ - -not yet released Fixed in Apache Tomcat 9.0.5 + +not yet released Fixed in Apache Tomcat 9.0.9 Modified: tomcat/site/trunk/xdocs/security-9.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-9.xml?rev=1832194&r1=1832193&r2=1832194&view=diff == --- tomcat/site/trunk/xdocs/security-9.xml (original) +++ tomcat/site/trunk/xdocs/security-9.xml Thu May 24 19:43:30 2018 @@ -50,7 +50,7 @@ - + Low: CORS filter has insecure defaults CVE-2018-8014 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1832195 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/filters/ java/org/apache/catalina/util/ java/org/apache/catalina/valves/ test/org/apache/catalina/util/ webapps/docs/ webap
Author: markt Date: Thu May 24 19:48:58 2018 New Revision: 1832195 URL: http://svn.apache.org/viewvc?rev=1832195&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=51953 Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny requests based on IPv4 and/or IPv6 client address where the IP ranges are defined using CIDR notation. Based on a patch by Francis Galiegue. Added: tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java - copied unchanged from r1832193, tomcat/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/NetMask.java - copied, changed from r1832124, tomcat/trunk/java/org/apache/catalina/util/NetMask.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteCIDRValve.java - copied unchanged from r1832193, tomcat/trunk/java/org/apache/catalina/valves/RemoteCIDRValve.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/util/TestNetMask.java - copied, changed from r1832124, tomcat/trunk/test/org/apache/catalina/util/TestNetMask.java 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/util/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/docs/config/filter.xml tomcat/tc8.5.x/trunk/webapps/docs/config/valve.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 24 19:48:58 2018 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/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,1739492,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,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,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,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,
[Bug 51953] Proposal: netmask filtering valve and filter [PATCH]
https://bz.apache.org/bugzilla/show_bug.cgi?id=51953 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #26 from Mark Thomas --- Fixed in: - trunk for 9.0.9 onwards - 8.5.x for 8.5.32 onwards - 7.0.x for 7.0.89 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1832196 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/filters/ java/org/apache/catalina/util/ java/org/apache/catalina/valves/ test/org/apache/catalina/util/ webapps/docs/ webap
Author: markt Date: Thu May 24 19:51:58 2018 New Revision: 1832196 URL: http://svn.apache.org/viewvc?rev=1832196&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=51953 Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny requests based on IPv4 and/or IPv6 client address where the IP ranges are defined using CIDR notation. Based on a patch by Francis Galiegue. Added: tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java - copied, changed from r1832195, tomcat/tc8.5.x/trunk/java/org/apache/catalina/filters/RemoteCIDRFilter.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/NetMask.java - copied unchanged from r1832195, tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/NetMask.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteCIDRValve.java - copied, changed from r1832195, tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/RemoteCIDRValve.java tomcat/tc7.0.x/trunk/test/org/apache/catalina/util/TestNetMask.java - copied, changed from r1832195, tomcat/tc8.5.x/trunk/test/org/apache/catalina/util/TestNetMask.java Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 24 19:51:58 2018 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/3305 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1832193 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1832209 - in /tomcat/trunk: java/org/apache/tomcat/util/http/parser/Authorization.java java/org/apache/tomcat/util/http/parser/LocalStrings.properties test/org/apache/tomcat/util/http/par
Author: markt
Date: Thu May 24 22:17:11 2018
New Revision: 1832209
URL: http://svn.apache.org/viewvc?rev=1832209&view=rev
Log:
Refactor to simplify code
Improve code coverage
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
tomcat/trunk/java/org/apache/tomcat/util/http/parser/LocalStrings.properties
tomcat/trunk/test/org/apache/tomcat/util/http/parser/TestAuthorizationDigest.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java?rev=1832209&r1=1832208&r2=1832209&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/parser/Authorization.java Thu
May 24 22:17:11 2018
@@ -22,43 +22,32 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import org.apache.tomcat.util.res.StringManager;
-
/**
* Parser for an "Authorization" header.
*/
public class Authorization {
-private static final StringManager sm =
StringManager.getManager(Authorization.class);
-
-@SuppressWarnings("unused") // Unused due to buggy client implementations
-private static final Integer FIELD_TYPE_TOKEN = Integer.valueOf(0);
-private static final Integer FIELD_TYPE_QUOTED_STRING = Integer.valueOf(1);
-private static final Integer FIELD_TYPE_TOKEN_OR_QUOTED_STRING =
Integer.valueOf(2);
-private static final Integer FIELD_TYPE_LHEX = Integer.valueOf(3);
-private static final Integer FIELD_TYPE_QUOTED_TOKEN = Integer.valueOf(4);
-
-private static final Map fieldTypes = new HashMap<>();
+private static final Map fieldTypes = new HashMap<>();
static {
// Digest field types.
// Note: These are more relaxed than RFC2617. This adheres to the
// recommendation of RFC2616 that servers are tolerant of buggy
// clients when they can be so without ambiguity.
-fieldTypes.put("username", FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put("realm", FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put("nonce", FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put("digest-uri", FIELD_TYPE_QUOTED_STRING);
+fieldTypes.put("username", FieldType.QUOTED_STRING);
+fieldTypes.put("realm", FieldType.QUOTED_STRING);
+fieldTypes.put("nonce", FieldType.QUOTED_STRING);
+fieldTypes.put("digest-uri", FieldType.QUOTED_STRING);
// RFC2617 says response is <">32LHEX<">. 32LHEX will also be accepted
-fieldTypes.put("response", FIELD_TYPE_LHEX);
+fieldTypes.put("response", FieldType.LHEX);
// RFC2617 says algorithm is token. <">token<"> will also be accepted
-fieldTypes.put("algorithm", FIELD_TYPE_QUOTED_TOKEN);
-fieldTypes.put("cnonce", FIELD_TYPE_QUOTED_STRING);
-fieldTypes.put("opaque", FIELD_TYPE_QUOTED_STRING);
+fieldTypes.put("algorithm", FieldType.QUOTED_TOKEN);
+fieldTypes.put("cnonce", FieldType.QUOTED_STRING);
+fieldTypes.put("opaque", FieldType.QUOTED_STRING);
// RFC2617 says qop is token. <">token<"> will also be accepted
-fieldTypes.put("qop", FIELD_TYPE_QUOTED_TOKEN);
+fieldTypes.put("qop", FieldType.QUOTED_TOKEN);
// RFC2617 says nc is 8LHEX. <">8LHEX<"> will also be accepted
-fieldTypes.put("nc", FIELD_TYPE_LHEX);
+fieldTypes.put("nc", FieldType.LHEX);
}
@@ -94,37 +83,25 @@ public class Authorization {
if (HttpParser.skipConstant(input, "=") != SkipResult.FOUND) {
return null;
}
-String value;
-Integer type = fieldTypes.get(field.toLowerCase(Locale.ENGLISH));
+String value = null;
+FieldType type = fieldTypes.get(field.toLowerCase(Locale.ENGLISH));
if (type == null) {
// auth-param = token "=" ( token | quoted-string )
-type = FIELD_TYPE_TOKEN_OR_QUOTED_STRING;
+type = FieldType.TOKEN_OR_QUOTED_STRING;
}
-switch (type.intValue()) {
-case 0:
-// FIELD_TYPE_TOKEN
-value = HttpParser.readToken(input);
-break;
-case 1:
-// FIELD_TYPE_QUOTED_STRING
+switch (type) {
+case QUOTED_STRING:
value = HttpParser.readQuotedString(input, false);
break;
-case 2:
-// FIELD_TYPE_TOKEN_OR_QUOTED_STRING
+case TOKEN_OR_QUOTED_STRING:
value = HttpParser.readTokenOrQuotedString(input, false);
break;
-case 3:
-// FIELD_TYPE_LHEX
+case L
[Bug 62404] Visibility issue on field org.apache.catalina.util.LifecycleBase.throwOnFailure
https://bz.apache.org/bugzilla/show_bug.cgi?id=62404 --- Comment #5 from Laszlo Magyar --- In my opinion it is a visibility issue. Who knows in this case when the writer (Editor) thread's modification will be visible to the reader (Watcher) thread, if the writer (Editor) thread live for ages maybe this modification will remain it the CPU cache, maybe it will available to the reader (Watcher) thread on the next cycle. But I'm ok with your wont fix. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
