Author: markt
Date: Thu Nov 19 16:20:32 2015
New Revision: 1715207
URL: http://svn.apache.org/viewvc?rev=1715207&view=rev
Log:
Move the functionality that provides redirects for context roots and
directories where a trailing <code>/</code> is added from the Mapper to the
DefaultServlet. This enables such requests to be processed by any configured
Valves and Filters before the redirect is made. This behaviour is configurable
via the mapperContextRootRedirectEnabled and mapperDirectoryRedirectEnabled
attributes of the Context which may be used to restore the previous behaviour.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/config/context.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 19 16:20:32 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
609,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1
666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
9,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,170
3143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,1710945,1711006,1711016,1711022,1711026,1712163,1712225,1712228,1712233,1712250,
1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,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,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657
609,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,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,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-1666387,1666494,1666496,1666552,1
666569,1666579,1666637,1666649,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,168573
9,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687551,1688563,1688841,1688878,1688885,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,1696366-1696368,1696378,1696390,1696392,1696467,1698212,1698220,1700607,1700870,1700896,1700977,1701093,1701123,1701213,1701607,1701666,1701673,1701760-1701761,1701765,1701940,1702092,1702183,1702244,1702246,1702250,1702268,1702313,1702531,1702630-1702635,1702637-1702638,1702640,1702647,1702660,1702662,1702665-1702666,1702668,1702671-1702673,1702675-1702676,1702680,1702722,1702778,1702795,1702862,1702881,1702886,1702910,1702923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,170
3143,1703146,1703151,1703160,1703164,1703167,1703174,1703192,1703287,1703290,1703358,1703408,1703486,1703509,1703523,1703542,1703545,1703554,1703584,1703673,1703676,1703678,1703680,1703763,1703784,1703821,1703842,1703849,1703851,1703853,1703856,1703860,1703865,1703890,1703948,1704149,1704151,1704251,1704278,1704289,1704302,1704305,1704307,1704318,1704331,1704647,1704658,1704689,1704702,1704706,1704711,1704730-1704733,1704735,1704739,1704741-1704742,1704744,1704786,1704867,1705231,1705630,1705635,1705639,1705647,1705650-1705652,1705842,1705848,1705865-1705866,1705942,1706017,1706744-1706745,1706853,1706915,1707052,1707088,1708500-1708501,1708504-1708505,1708570,1708649,1708687,1708745,1708957,1709120,1709266,1709295,1709375,1709663,1709895,1709960,1710070,1710134,1710341,1710346,1710441,1710445,1710489,1710517,1710523,1710571,1710577,1710632,1710676,1710689,1710753-1710754,1710779,1710924,1710930,1710933,1710945,1711006,1711016,1711022,1711026,1712163,1712225,1712228,1712233,1712250,
1712254,1712489,1712547-1712548,1712588,1712617,1712645,1712654,1712695,1712765-1712766,1712771,1712775,1712859,1712876,1712898,1712902,1712905,1712912,1712974,1713129,1713168,1713184,1713285,1713362,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715188,1715206
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/Context.java Thu Nov 19
16:20:32 2015
@@ -1698,4 +1698,44 @@ public interface Context extends Contain
* false}
*/
public boolean getValidateClientProvidedNewSessionId();
+
+ /**
+ * If enabled, requests for a web application context root will be
+ * redirected (adding a trailing slash) by the Mapper. This is more
+ * efficient but has the side effect of confirming that the context path is
+ * valid.
+ *
+ * @param mapperContextRootRedirectEnabled Should the redirects be enabled?
+ */
+ public void setMapperContextRootRedirectEnabled(boolean
mapperContextRootRedirectEnabled);
+
+ /**
+ * Determines if requests for a web application context root will be
+ * redirected (adding a trailing slash) by the Mapper. This is more
+ * efficient but has the side effect of confirming that the context path is
+ * valid.
+ *
+ * @return {@code true} if the Mapper level redirect is enabled for this
+ * Context.
+ */
+ public boolean getMapperContextRootRedirectEnabled();
+
+ /**
+ * If enabled, requests for a directory will be redirected (adding a
+ * trailing slash) by the Mapper. This is more efficient but has the
+ * side effect of confirming that the directory is valid.
+ *
+ * @param mapperDirectoryRedirectEnabled Should the redirects be enabled?
+ */
+ public void setMapperDirectoryRedirectEnabled(boolean
mapperDirectoryRedirectEnabled);
+
+ /**
+ * Determines if requests for a directory will be redirected (adding a
+ * trailing slash) by the Mapper. This is more efficient but has the
+ * side effect of confirming that the directory is valid.
+ *
+ * @return {@code true} if the Mapper level redirect is enabled for this
+ * Context.
+ */
+ public boolean getMapperDirectoryRedirectEnabled();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Thu
Nov 19 16:20:32 2015
@@ -815,13 +815,53 @@ public class StandardContext extends Con
private boolean validateClientProvidedNewSessionId = true;
+ boolean mapperContextRootRedirectEnabled = false;
+
+ boolean mapperDirectoryRedirectEnabled = false;
+
+
// ----------------------------------------------------- Context Properties
@Override
+ public void setMapperContextRootRedirectEnabled(boolean
mapperContextRootRedirectEnabled) {
+ this.mapperContextRootRedirectEnabled =
mapperContextRootRedirectEnabled;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * The default value for this implementation is {@code false}.
+ */
+ @Override
+ public boolean getMapperContextRootRedirectEnabled() {
+ return mapperContextRootRedirectEnabled;
+ }
+
+
+ @Override
+ public void setMapperDirectoryRedirectEnabled(boolean
mapperDirectoryRedirectEnabled) {
+ this.mapperDirectoryRedirectEnabled = mapperDirectoryRedirectEnabled;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ * <p>
+ * The default value for this implementation is {@code false}.
+ */
+ @Override
+ public boolean getMapperDirectoryRedirectEnabled() {
+ return mapperDirectoryRedirectEnabled;
+ }
+
+
+ @Override
public void setValidateClientProvidedNewSessionId(boolean
validateClientProvidedNewSessionId) {
this.validateClientProvidedNewSessionId =
validateClientProvidedNewSessionId;
}
+
/**
* {@inheritDoc}
* <p>
@@ -832,6 +872,7 @@ public class StandardContext extends Con
return validateClientProvidedNewSessionId;
}
+
@Override
public void setCookieProcessor(CookieProcessor cookieProcessor) {
if (cookieProcessor == null) {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Thu Nov 19 16:20:32 2015
@@ -177,6 +177,14 @@
description="Associated manager."
type="org.apache.catalina.Manager" />
+ <attribute name="mapperContextRootRedirectEnabled"
+ description="Should the Mapper be used for context root
redirects"
+ type="boolean" />
+
+ <attribute name="mapperDirectoryRedirectEnabled"
+ description="Should the Mapper be used for directory redirects"
+ type="boolean" />
+
<attribute name="namingContextListener"
description="Associated naming context listener."
type="org.apache.catalina.core.NamingContextListener" />
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java Thu Nov 19
16:20:32 2015
@@ -884,7 +884,8 @@ public final class Mapper {
}
}
- if(mappingData.wrapper == null && noServletPath) {
+ if(mappingData.wrapper == null && noServletPath &&
+ mappingData.context.getMapperContextRootRedirectEnabled()) {
// The path is empty, redirect to "/"
mappingData.redirectPath.setChars
(path.getBuffer(), pathOffset, pathEnd-pathOffset);
@@ -1002,9 +1003,9 @@ public final class Mapper {
char[] buf = path.getBuffer();
if (contextVersion.resources != null && buf[pathEnd -1 ] != '/') {
String pathStr = path.toString();
- WebResource file =
- contextVersion.resources.getResource(pathStr);
- if (file != null && file.isDirectory()) {
+ WebResource file =
contextVersion.resources.getResource(pathStr);
+ if (file != null && file.isDirectory() &&
+
mappingData.context.getMapperDirectoryRedirectEnabled()) {
// Note: this mutates the path: do not do any processing
// after this (since we set the redirectPath, there
// shouldn't be any)
@@ -1021,7 +1022,6 @@ public final class Mapper {
path.setOffset(pathOffset);
path.setEnd(pathEnd);
-
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Thu Nov 19 16:20:32 2015
@@ -816,6 +816,17 @@ public class DefaultServlet extends Http
long contentLength = -1L;
if (resource.isDirectory()) {
+ if (!path.endsWith("/")) {
+ StringBuilder location = new
StringBuilder(request.getRequestURI());
+ location.append('/');
+ if (request.getQueryString() != null) {
+ location.append('?');
+ location.append(request.getQueryString());
+ }
+
response.sendRedirect(response.encodeRedirectURL(location.toString()));
+ return;
+ }
+
// Skip directory listings if we have been configured to
// suppress them
if (!listings) {
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
Thu Nov 19 16:20:32 2015
@@ -764,9 +764,25 @@ public class FailedContext extends Lifec
@Override
public void setValidateClientProvidedNewSessionId(boolean
validateClientProvidedNewSessionId) {
- //NO-OP
+ // NO-OP
}
@Override
public boolean getValidateClientProvidedNewSessionId() { return false; }
+
+ @Override
+ public void setMapperContextRootRedirectEnabled(boolean
mapperContextRootRedirectEnabled) {
+ // NO-OP
+ }
+
+ @Override
+ public boolean getMapperContextRootRedirectEnabled() { return false; }
+
+ @Override
+ public void setMapperDirectoryRedirectEnabled(boolean
mapperDirectoryRedirectEnabled) {
+ // NO-OP
+ }
+
+ @Override
+ public boolean getMapperDirectoryRedirectEnabled() { return false; }
}
\ No newline at end of file
Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TesterContext.java?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/core/TesterContext.java Thu
Nov 19 16:20:32 2015
@@ -1234,4 +1234,20 @@ public class TesterContext implements Co
@Override
public boolean getValidateClientProvidedNewSessionId() { return false; }
+
+ @Override
+ public void setMapperContextRootRedirectEnabled(boolean
mapperContextRootRedirectEnabled) {
+ // NO-OP
+ }
+
+ @Override
+ public boolean getMapperContextRootRedirectEnabled() { return false; }
+
+ @Override
+ public void setMapperDirectoryRedirectEnabled(boolean
mapperDirectoryRedirectEnabled) {
+ // NO-OP
+ }
+
+ @Override
+ public boolean getMapperDirectoryRedirectEnabled() { return false; }
}
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperWebapps.java
Thu Nov 19 16:20:32 2015
@@ -18,6 +18,7 @@ package org.apache.catalina.mapper;
import java.io.File;
import java.io.IOException;
+import java.net.HttpURLConnection;
import java.util.HashMap;
import java.util.List;
@@ -33,7 +34,10 @@ import org.apache.catalina.Context;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.valves.RemoteAddrValve;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.descriptor.web.SecurityCollection;
+import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
import org.apache.tomcat.websocket.server.WsContextListener;
/**
@@ -225,6 +229,66 @@ public class TestMapperWebapps extends T
Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
}
+ @Test
+ public void testRedirect() throws Exception {
+ // Disable the following of redirects for this test only
+ boolean originalValue = HttpURLConnection.getFollowRedirects();
+ HttpURLConnection.setFollowRedirects(false);
+ try {
+ Tomcat tomcat = getTomcatInstance();
+
+ // Use standard test webapp as ROOT
+ File rootDir = new File("test/webapp");
+ org.apache.catalina.Context root =
+ tomcat.addWebapp(null, "", rootDir.getAbsolutePath());
+
+ // Add a security constraint
+ SecurityConstraint constraint = new SecurityConstraint();
+ SecurityCollection collection = new SecurityCollection();
+ collection.addPattern("/welcome-files/*");
+ collection.addPattern("/welcome-files");
+ constraint.addCollection(collection);
+ constraint.addAuthRole("foo");
+ root.addConstraint(constraint);
+
+ // Also make examples available
+ File examplesDir = new File(getBuildDirectory(),
"webapps/examples");
+ org.apache.catalina.Context examples = tomcat.addWebapp(
+ null, "/examples", examplesDir.getAbsolutePath());
+ // Then block access to the examples to test redirection
+ RemoteAddrValve rav = new RemoteAddrValve();
+ rav.setDeny(".*");
+ rav.setDenyStatus(404);
+ examples.getPipeline().addValve(rav);
+
+ tomcat.start();
+
+ // Redirects within a web application
+ doRedirectTest("/welcome-files", 401);
+ doRedirectTest("/welcome-files/", 401);
+
+ doRedirectTest("/jsp", 302);
+ doRedirectTest("/jsp/", 404);
+
+ doRedirectTest("/WEB-INF", 404);
+ doRedirectTest("/WEB-INF/", 404);
+
+ // Redirects between web applications
+ doRedirectTest("/examples", 404);
+ doRedirectTest("/examples/", 404);
+ } finally {
+ HttpURLConnection.setFollowRedirects(originalValue);
+ }
+ }
+
+
+ private void doRedirectTest(String path, int expected) throws IOException {
+ ByteChunk bc = new ByteChunk();
+ int rc = getUrl("http://localhost:"; + getPort() + path, bc, null);
+ Assert.assertEquals(expected, rc);
+ }
+
+
/**
* Prepare a string to search in messages that contain a timestamp, when it
* is known that the timestamp was printed between {@code timeA} and
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
(original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Thu Nov 19 16:20:32 2015
@@ -646,8 +646,7 @@ public abstract class TomcatBaseTest ext
String method) throws IOException {
URL url = new URL(path);
- HttpURLConnection connection =
- (HttpURLConnection) url.openConnection();
+ HttpURLConnection connection = (HttpURLConnection)
url.openConnection();
connection.setUseCaches(false);
connection.setReadTimeout(readTimeout);
connection.setRequestMethod(method);
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/rewrite/TestRewriteValve.java
Thu Nov 19 16:20:32 2015
@@ -20,6 +20,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.catalina.Context;
+import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
@@ -75,6 +76,8 @@ public class TestRewriteValve extends To
Tomcat.addServlet(ctx, "snoop", new SnoopServlet());
ctx.addServletMapping("/a/%255A", "snoop");
ctx.addServletMapping("/c/*", "snoop");
+ Tomcat.addServlet(ctx, "default", new DefaultServlet());
+ ctx.addServletMapping("/", "default");
tomcat.start();
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Nov 19 16:20:32 2015
@@ -188,6 +188,16 @@
Ensure that in an embedded Tomcat the logging configuration is
not lost during garbage collection. (violetagg)
</fix>
+ <add>
+ Move the functionality that provides redirects for context roots and
+ directories where a trailing <code>/</code> is added from the Mapper to
+ the <code>DefaultServlet</code>. This enables such requests to be
+ processed by any configured Valves and Filters before the redirect is
+ made. This behaviour is configurable via the
+ <code>mapperContextRootRedirectEnabled</code> and
+ <code>mapperDirectoryRedirectEnabled</code> attributes of the Context
+ which may be used to restore the previous behaviour. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Coyote">
Modified: tomcat/tc8.0.x/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/config/context.xml?rev=1715207&r1=1715206&r2=1715207&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/config/context.xml Thu Nov 19 16:20:32
2015
@@ -360,6 +360,22 @@
default value of <code>false</code> is used.</p>
</attribute>
+ <attribute name="mapperContextRootRedirectEnabled" required="false">
+ <p>If enabled, requests for a web application context root will be
+ redirected (adding a trailing slash) if necessary by the Mapper rather
+ than the default Servlet. This is more efficient but has the side
effect
+ of confirming that the context path exists. If not specified, the
+ default value of <code>false</code> is used.</p>
+ </attribute>
+
+ <attribute name="mapperDirectoryRedirectEnabled" required="false">
+ <p>If enabled, requests for a web application directory will be
+ redirected (adding a trailing slash) if necessary by the Mapper rather
+ than the default Servlet. This is more efficient but has the side
effect
+ of confirming that the directory is exists. If not specified, the
+ default value of <code>false</code> is used.</p>
+ </attribute>
+
<attribute name="override" required="false">
<p>Set to <code>true</code> to ignore any settings in both the global
or <a href="host.html">Host</a> default contexts. By default, settings
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
