Author: markt
Date: Thu Nov 5 20:00:46 2015
New Revision: 1712860
URL: http://svn.apache.org/viewvc?rev=1712860&view=rev
Log:
Further work on https://bz.apache.org/bugzilla/show_bug.cgi?id=57136
Add a configuration option that allows EL expressions in attribute values to
use JSP attribute quoting or not. The default (and specification compliant
behaviour) is not to.
Added:
tomcat/tc8.0.x/trunk/test/webapp/el-misc-no-quote-attribute-el.jsp
- copied unchanged from r1712859,
tomcat/trunk/test/webapp/el-misc-no-quote-attribute-el.jsp
tomcat/tc8.0.x/trunk/test/webapp/el-misc-with-quote-attribute-el.jsp
- copied unchanged from r1712859,
tomcat/trunk/test/webapp/el-misc-with-quote-attribute-el.jsp
Removed:
tomcat/tc8.0.x/trunk/test/webapp/el-misc.jsp
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/Options.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 5 20:00:46 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,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,1666569,1666579,1
666637,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,1685739,1685744,168577
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,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,1703143,1703146,1703151,170
3160,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
+/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,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,1666569,1666579,1
666637,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,1685739,1685744,168577
2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,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,1703143,1703146,1703151,170
3160,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
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1712860&r1=1712859&r2=1712860&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Thu
Nov 5 20:00:46 2015
@@ -213,6 +213,8 @@ public final class EmbeddedServletOption
*/
private boolean strictQuoteEscaping = STRICT_QUOTE_ESCAPING_DEFAULT;
+ private boolean quoteAttributeEL = false;
+
public String getProperty(String name ) {
return settings.getProperty( name );
}
@@ -223,6 +225,15 @@ public final class EmbeddedServletOption
}
}
+ public void setQuoteAttributeEL(boolean b) {
+ this.quoteAttributeEL = b;
+ }
+
+ @Override
+ public boolean getQuoteAttributeEL() {
+ return quoteAttributeEL;
+ }
+
/**
* Are we keeping generated code around?
*/
@@ -774,6 +785,18 @@ public final class EmbeddedServletOption
}
}
+ String quoteAttributeEL = config.getInitParameter("quoteAttributeEL");
+ if (quoteAttributeEL != null) {
+ if (quoteAttributeEL.equalsIgnoreCase("true")) {
+ this.quoteAttributeEL = true;
+ } else if (quoteAttributeEL.equalsIgnoreCase("false")) {
+ this.quoteAttributeEL = false;
+ } else {
+ if (log.isWarnEnabled()) {
+
log.warn(Localizer.getMessage("jsp.warning.quoteAttributeEL"));
+ }
+ }
+ }
// Setup the global Tag Libraries location cache for this
// web-application.
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1712860&r1=1712859&r2=1712860&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/JspC.java Thu Nov 5 20:00:46
2015
@@ -148,6 +148,7 @@ public class JspC extends Task implement
protected static final String SWITCH_NO_BLOCK_EXTERNAL =
"-no-blockExternal";
protected static final String SWITCH_STRICT_QUOTE_ESCAPING =
"-strictQuoteEscaping";
protected static final String SWITCH_NO_STRICT_QUOTE_ESCAPING =
"-no-strictQuoteEscaping";
+ protected static final String SWITCH_QUOTE_ATTRIBUTE_EL =
"-quoteAttributeEL";
protected static final String SHOW_SUCCESS ="-s";
protected static final String LIST_ERRORS = "-l";
protected static final int INC_WEBXML = 10;
@@ -182,6 +183,7 @@ public class JspC extends Task implement
protected boolean validateXml;
protected boolean blockExternal = true;
protected boolean strictQuoteEscaping = STRICT_QUOTE_ESCAPING_DEFAULT;
+ protected boolean quoteAttributeEL = false;
protected boolean xpoweredBy;
protected boolean mappedFile = false;
protected boolean poolingEnabled = true;
@@ -402,6 +404,8 @@ public class JspC extends Task implement
setStrictQuoteEscaping(true);
} else if (tok.equals(SWITCH_NO_STRICT_QUOTE_ESCAPING)) {
setStrictQuoteEscaping(false);
+ } else if (tok.equals(SWITCH_QUOTE_ATTRIBUTE_EL)) {
+ setQuoteAttributeEL(true);
} else {
if (tok.startsWith("-")) {
throw new JasperException("Unrecognized option: " + tok +
@@ -918,6 +922,15 @@ public class JspC extends Task implement
return strictQuoteEscaping;
}
+ public void setQuoteAttributeEL(boolean b) {
+ quoteAttributeEL = b;
+ }
+
+ @Override
+ public boolean getQuoteAttributeEL() {
+ return quoteAttributeEL;
+ }
+
public void setListErrors( boolean b ) {
listErrors = b;
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/Options.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/Options.java?rev=1712860&r1=1712859&r2=1712860&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/Options.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/Options.java Thu Nov 5
20:00:46 2015
@@ -237,4 +237,10 @@ public interface Options {
* the JSP specification should be applied to scriplet expression.
*/
public boolean getStrictQuoteEscaping();
+
+ /**
+ * @return {@code true} if EL expressions used within attributes should
have
+ * the quoting rules in JSP.1.6 applied to the expression.
+ */
+ public boolean getQuoteAttributeEL();
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=1712860&r1=1712859&r2=1712860&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/AttributeParser.java
Thu Nov 5 20:00:46 2015
@@ -41,15 +41,16 @@ public class AttributeParser {
* Are deferred expressions treated as literals?
* @param strict Should the rules of JSP.1.6 for escpaing quotes be
* strictly applied?
+ * @param quoteAttributeEL
* @return An unquoted JSP attribute that, if it contains
* expression language can be safely passed to the EL
* processor without fear of ambiguity.
*/
public static String getUnquoted(String input, char quote,
boolean isELIgnored, boolean isDeferredSyntaxAllowedAsLiteral,
- boolean strict) {
+ boolean strict, boolean quoteAttributeEL) {
return (new AttributeParser(input, quote, isELIgnored,
- isDeferredSyntaxAllowedAsLiteral, strict)).getUnquoted();
+ isDeferredSyntaxAllowedAsLiteral, strict,
quoteAttributeEL)).getUnquoted();
}
/* The quoted input string. */
@@ -70,6 +71,8 @@ public class AttributeParser {
*/
private final boolean strict;
+ private final boolean quoteAttributeEL;
+
/* The type ($ or #) of expression. Literals have a type of null. */
private final char type;
@@ -94,13 +97,14 @@ public class AttributeParser {
*/
private AttributeParser(String input, char quote,
boolean isELIgnored, boolean isDeferredSyntaxAllowedAsLiteral,
- boolean strict) {
+ boolean strict, boolean quoteAttributeEL) {
this.input = input;
this.quote = quote;
this.isELIgnored = isELIgnored;
this.isDeferredSyntaxAllowedAsLiteral =
isDeferredSyntaxAllowedAsLiteral;
this.strict = strict;
+ this.quoteAttributeEL = quoteAttributeEL;
this.type = getType(input);
this.size = input.length();
result = new StringBuilder(size);
@@ -189,7 +193,12 @@ public class AttributeParser {
boolean insideLiteral = false;
char literalQuote = 0;
while (i < size && !endEL) {
- char ch = input.charAt(i++);
+ char ch;
+ if (quoteAttributeEL) {
+ ch = nextChar();
+ } else {
+ ch = input.charAt(i++);
+ }
if (ch == '\'' || ch == '\"') {
if (insideLiteral) {
if (literalQuote == ch) {
@@ -203,7 +212,11 @@ public class AttributeParser {
} else if (ch == '\\') {
result.append(ch);
if (insideLiteral && size < i) {
- ch = input.charAt(i++);
+ if (quoteAttributeEL) {
+ ch = nextChar();
+ } else {
+ ch = input.charAt(i++);
+ }
result.append(ch);
}
} else if (ch == '}') {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1712860&r1=1712859&r2=1712860&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/jasper/compiler/Parser.java Thu Nov 5
20:00:46 2015
@@ -264,8 +264,11 @@ class Parser implements TagConstants {
* ('%>"' | TRANSLATION_ERROR)
*/
private String parseAttributeValue(String qName, String watch, boolean
ignoreEL) throws JasperException {
+ boolean quoteAttributeEL = ctxt.getOptions().getQuoteAttributeEL();
Mark start = reader.mark();
- Mark stop = reader.skipUntilIgnoreEsc(watch, ignoreEL);
+ // In terms of finding the end of the value, quoting EL is equivalent
to
+ // ignoring it.
+ Mark stop = reader.skipUntilIgnoreEsc(watch, ignoreEL ||
quoteAttributeEL);
if (stop == null) {
err.jspError(start, "jsp.error.attribute.unterminated", qName);
}
@@ -282,7 +285,8 @@ class Parser implements TagConstants {
ret = AttributeParser.getUnquoted(reader.getText(start, stop),
quote, isElIgnored,
pageInfo.isDeferredSyntaxAllowedAsLiteral(),
- ctxt.getOptions().getStrictQuoteEscaping());
+ ctxt.getOptions().getStrictQuoteEscaping(),
+ quoteAttributeEL);
} catch (IllegalArgumentException iae) {
err.jspError(start, iae.getMessage());
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1712860&r1=1712859&r2=1712860&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Thu Nov 5 20:00:46 2015
@@ -124,6 +124,7 @@ jsp.warning.displaySourceFragment=Warnin
jsp.warning.maxLoadedJsps=Warning: Invalid value for the initParam
maxLoadedJsps. Will use the default value of \"-1\"
jsp.warning.jspIdleTimeout=Warning: Invalid value for the initParam
jspIdleTimeout. Will use the default value of \"-1\"
jsp.warning.strictQuoteEscaping=Warning: Invalid value for the initParam
strictQuoteEscaping. Will use the default value of \"{0}\"
+jsp.warning.quoteAttributeEL=Warning: Invalid value for the initParam
quoteAttributeEL. Will use the default value of \"false\"
jsp.warning.unknown.element.in.taglib=Unknown element ({0}) in taglib
jsp.warning.unknown.element.in.tag=Unknown element ({0}) in tag
jsp.warning.unknown.element.in.tagfile=Unknown element ({0}) in tag-file
Modified: tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java?rev=1712860&r1=1712859&r2=1712860&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/el/TestELInJsp.java Thu Nov 5
20:00:46 2015
@@ -16,6 +16,7 @@
*/
package org.apache.el;
+import java.io.File;
import java.math.BigDecimal;
import java.util.Collections;
@@ -24,7 +25,11 @@ import javax.servlet.DispatcherType;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.core.StandardContext;
+import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.jasper.servlet.JasperInitializer;
import org.apache.tomcat.util.buf.ByteChunk;
/**
@@ -289,10 +294,43 @@ public class TestELInJsp extends TomcatB
}
@Test
- public void testELMisc() throws Exception {
- getTomcatInstanceTestWebapp(false, true);
+ public void testELMiscNoQuoteAttributeEL() throws Exception {
+ doTestELMisc(false);
+ }
+
+ @Test
+ public void testELMiscWithQuoteAttributeEL() throws Exception {
+ doTestELMisc(true);
+ }
+
+ private void doTestELMisc(boolean quoteAttributeEL) throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ // Create the context (don't use addWebapp as we want to modify the
+ // JSP Servlet settings).
+ File appDir = new File("test/webapp");
+ StandardContext ctxt = (StandardContext) tomcat.addContext(
+ null, "/test", appDir.getAbsolutePath());
+
+ ctxt.addServletContainerInitializer(new JasperInitializer(), null);
+
+ // Configure the defaults and then tweak the JSP servlet settings
+ // Note: Min value for maxLoadedJsps is 2
+ Tomcat.initWebappDefaults(ctxt);
+ Wrapper w = (Wrapper) ctxt.findChild("jsp");
+
+ String jspName;
+ if (quoteAttributeEL) {
+ jspName = "/test/el-misc-with-quote-attribute-el.jsp";
+ w.addInitParameter("quoteAttributeEL", "true");
+ } else {
+ jspName = "/test/el-misc-no-quote-attribute-el.jsp";
+ w.addInitParameter("quoteAttributeEL", "false");
+ }
+
+ tomcat.start();
- ByteChunk res = getUrl("http://localhost:"; + getPort() +
"/test/el-misc.jsp");
+ ByteChunk res = getUrl("http://localhost:"; + getPort() + jspName);
String result = res.toString();
assertEcho(result, "00-\\\\\\\"${'hello world'}");
Modified:
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java?rev=1712860&r1=1712859&r2=1712860&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
(original)
+++
tomcat/tc8.0.x/trunk/test/org/apache/jasper/compiler/TestAttributeParser.java
Thu Nov 5 20:00:46 2015
@@ -171,14 +171,14 @@ public class TestAttributeParser {
ctx.setFunctionMapper(new FMapper());
ValueExpression ve = exprFactory.createValueExpression(ctx,
AttributeParser.getUnquoted(expression, quote, false, false,
- false),
+ false, false),
String.class);
return (String) ve.getValue(ctx);
}
private String parseScriptExpression(String expression, char quote) {
return AttributeParser.getUnquoted(expression, quote, false, false,
- false);
+ false, false);
}
public static class FMapper extends FunctionMapper {
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=1712860&r1=1712859&r2=1712860&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Nov 5 20:00:46 2015
@@ -48,6 +48,12 @@
<subsection name="Catalina">
<changelog>
<add>
+ Extend the fix for <bug>57136</bug> to provide a JSP Servlet
+ initialisation parameter per web application that controls whether o
+ not EL in JSP attributes is processed as if it uses JSP attribute
+ quoting. By default, EL does not use JSP attribute quoting. (markt)
+ </add>
+ <add>
Extend the fix for <bug>58228</bug> to include
<code>ServletContext.getRealPath()</code>. (markt)
</add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
