You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/10/18 10:46:14 UTC
svn commit: r1812492 - in /tomcat/tc8.5.x/trunk: ./
java/org/apache/catalina/connector/ java/org/apache/catalina/manager/
java/org/apache/catalina/manager/host/ java/org/apache/catalina/servlets/
java/org/apache/catalina/ssi/ java/org/apache/catalina/s...
Author: markt
Date: Wed Oct 18 10:46:14 2017
New Revision: 1812492
URL: http://svn.apache.org/viewvc?rev=1812492&view=rev
Log:
Refactor XML and HTML escaping to a single location
Added:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/security/Escape.java
- copied unchanged from r1812489, tomcat/trunk/java/org/apache/tomcat/util/security/Escape.java
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Response.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/DOMWriter.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/RequestUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityUtil.java
tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TesterValidator.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 18 10:46:14 2017
@@ -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,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,176
8520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,
1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,17885
54,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,17
95893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616
,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812
088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401
+/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,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205
3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635,1763718,1763786,1763798-1763799,1763810,1763813,1763815,1763819,1763831,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698,1766700,1766822,1766834,1766840,1767047,1767328,1767362,1767368,1767429,1767471,1767505,1767641-1767644,1767903,1767945-1767946,1768123,1768283,176
8520,1768569,1768651,1768762,1768922,1769191,1769263,1769630,1769833,1769975,1770047,1770140,1770180,1770258,1770389,1770656,1770666,1770718,1770762,1770952,1770954,1770956,1770961,1771087,1771126,1771139,1771143,1771149,1771156,1771266,1771316,1771386,1771611,1771613,1771711,1771718,1771723-1771724,1771730,1771743,1771752,1771853,1771963,1772170,1772174,1772223,1772229,1772318-1772319,1772353,1772355,1772554,1772603-1772609,1772849,1772865,1772870,1772872,1772875-1772876,1772881,1772886,1772947,1773306,1773344,1773418,1773756,1773813-1773814,1774052,1774102,1774131,1774161,1774164,1774248,1774253,1774257,1774259,1774262,1774267,1774271,1774303,1774340,1774406,1774412,1774426,1774433,1774522-1774523,1774526,1774528-1774529,1774531,1774732-1774736,1774738-1774739,1774741-1774742,1774749,1774755,1774789,1774858,1774867,1775596,1775985-1775986,1776540,1776937,1776954,1777011,1777173,1777189,1777211,1777524,1777546,1777605,1777619,1777647,1777721-1777722,1777967,1778061,1778138-1778139,
1778141-1778150,1778154,1778275-1778276,1778295,1778342,1778348,1778404,1778424,1778426,1778575,1778582,1778600,1778603,1779312,1779370,1779545,1779612,1779622,1779641,1779654,1779708,1779718,1779897,1779899,1779932,1780109,1780120,1780189,1780196,1780488,1780514-1780516,1780601,1780606,1780609-1780610,1780652,1780991,1780995-1780996,1781174,1781569,1781975,1781986,1782116,1782383-1782384,1782566,1782572,1782775,1782779,1782814,1782857,1782868,1782934,1782946-1782947,1782956,1783144-1783147,1783155,1783408,1784182,1784565,1784583,1784657,1784669,1784712,1784723,1784751,1784767,1784806,1784818,1784911,1784926,1784956,1784963,1785032,1785037,1785245,1785271,1785310,1785317,1785643,1785667,1785762,1785774,1785823,1785935,1786051,1786070,1786123-1786124,1786127,1786129,1786341,1786378,1786844,1787200,1787250,1787405,1787701,1787703,1787938,1787959,1787973,1788223-1788224,1788228,1788232,1788241-1788242,1788248,1788323,1788328,1788455,1788460,1788473,1788543-1788544,1788548,1788550,17885
54,1788558,1788560,1788567,1788569,1788572,1788647,1788732,1788741,1788747,1788753,1788764,1788771,1788834,1788841,1788852,1788860,1788883,1788890,1789051,1789400,1789415,1789442-1789443,1789447,1789453,1789456,1789458,1789461-1789463,1789465-1789467,1789470,1789472,1789474,1789476,1789479-1789480,1789733,1789735,1789744-1789745,1789937,1789984,1790119,1790180,1790183,1790376,1790614,1790983,1790991,1791027-1791028,1791050,1791090,1791095-1791096,1791099,1791101-1791103,1791124,1791129,1791134,1791137,1791298,1791527,1791557,1791970,1792033,1792038,1792055,1792093,1792140,1792460,1792468,1792791,1792957,1793095,1793121,1793123,1793127,1793136,1793139,1793147-1793148,1793266,1793437,1793449,1793460,1793468,1793487,1793498,1793502,1793514,1793682-1793683,1793711-1793712,1793719,1793736,1793746,1793771,1793776,1793798,1793802,1793812,1793819,1793844,1793854,1793887,1793891,1793898,1793901-1793902,1793907,1793910,1793980,1794674,1794941-1794942,1795278,1795289,1795298,1795305,1795813,17
95893,1796090,1796275,1796693-1796695,1796729,1796806,1796836,1796873,1796878,1797197,1797338,1797344,1797354-1797355,1797516,1797528,1797532,1797536,1797540,1797543,1797677-1797678,1797692,1797694,1797748,1797828,1798126,1798238,1798280,1798371,1798379,1798384,1798390,1798395,1798419,1798505,1798507,1798509,1798533,1798546,1798561,1798977,1799115,1799126,1799164,1799190,1799194,1799216,1799231,1799250,1799253,1799285,1799368,1799412,1799515,1799701-1799702,1799704,1799709,1799885,1799893,1799895,1799916,1800136-1800138,1800202,1800309,1800390,1800617,1800629,1800791,1800816,1800850,1800864,1800867,1800874,1800885,1800981,1800984,1800988,1800992,1801195,1801686,1801688,1801709,1801717,1801774,1801778,1802083,1802195,1802204-1802205,1802210,1802225-1802226,1802229,1802403,1802475,1802490,1802788,1802796,1802803,1802820,1802828,1802833,1802836,1803030,1803038,1803055,1803135,1803165,1803174,1803193,1803205,1803224,1803278,1803281,1803295,1803297,1803446,1803451,1803456,1803459,1803616
,1803636,1803828,1803901,1803972,1804040,1804094,1804306,1804461-1804463,1804501,1804506-1804507,1804754,1804813,1804888,1804890,1804903-1804908,1804915,1804917,1805523-1805530,1805550,1805612-1805613,1805637,1805645,1805652,1805726,1805752,1805782,1805826,1806307,1806356,1806445,1806736,1806794,1806798,1806801,1806807,1806873,1806966,1806973,1807004,1807093,1807135,1807205-1807206,1807237,1807242,1807251,1807282,1807455,1807686,1807698,1807713,1807715,1807729,1807742,1807747,1807751,1807755,1808116,1808156,1808266,1808433,1808438-1808439,1808695,1808701,1808766,1809011,1809025,1809141,1809143-1809144,1809146,1809158,1809212,1809214,1809239,1809248,1809263,1809265,1809317,1809434,1809669,1809671,1809674,1809684,1809711,1809828,1809830,1809908-1809909,1809922,1810106,1810110,1810280,1810300,1811031,1811119,1811122,1811132,1811137,1811139,1811174,1811176,1811198-1811201,1811203-1811206,1811220,1811235,1811246,1811327-1811329,1811350,1811560,1811704,1811837-1811839,1811861,1811932,1812
088,1812092,1812094,1812103,1812107,1812113,1812129,1812134-1812136,1812184,1812315,1812401,1812489
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Response.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/Response.java Wed Oct 18 10:46:14 2017
@@ -48,7 +48,6 @@ import org.apache.catalina.Globals;
import org.apache.catalina.Session;
import org.apache.catalina.Wrapper;
import org.apache.catalina.security.SecurityUtil;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.SessionConfig;
import org.apache.coyote.ActionCode;
import org.apache.juli.logging.Log;
@@ -61,6 +60,7 @@ import org.apache.tomcat.util.http.FastH
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.parser.MediaTypeCache;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.security.Escape;
/**
* Wrapper object for the Coyote response.
@@ -1373,7 +1373,7 @@ public class Response implements HttpSer
if (getContext().getSendRedirectBody()) {
PrintWriter writer = getWriter();
writer.print(sm.getString("coyoteResponse.sendRedirect.note",
- RequestUtil.filter(locationUri)));
+ Escape.htmlElementContent(locationUri)));
flushBuffer();
}
} catch (IllegalArgumentException e) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Wed Oct 18 10:46:14 2017
@@ -49,10 +49,10 @@ import org.apache.catalina.Session;
import org.apache.catalina.manager.util.BaseSessionComparator;
import org.apache.catalina.manager.util.SessionUtils;
import org.apache.catalina.util.ContextName;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.URLEncoder;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.security.Escape;
/**
* Servlet that enables remote management of the web applications deployed
@@ -349,7 +349,7 @@ public final class HTMLManagerServlet ex
if (message == null || message.length() == 0) {
args[1] = "OK";
} else {
- args[1] = RequestUtil.filter(message);
+ args[1] = Escape.htmlElementContent(message);
}
writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
@@ -442,19 +442,19 @@ public final class HTMLManagerServlet ex
args = new Object[7];
args[0] = "<a href=\"" +
URLEncoder.DEFAULT.encode(contextPath + "/", StandardCharsets.UTF_8) +
- "\">" + RequestUtil.filter(displayPath) + "</a>";
+ "\">" + Escape.htmlElementContent(displayPath) + "</a>";
if ("".equals(ctxt.getWebappVersion())) {
args[1] = noVersion;
} else {
- args[1] = RequestUtil.filter(ctxt.getWebappVersion());
+ args[1] = Escape.htmlElementContent(ctxt.getWebappVersion());
}
if (ctxt.getDisplayName() == null) {
args[2] = " ";
} else {
- args[2] = RequestUtil.filter(ctxt.getDisplayName());
+ args[2] = Escape.htmlElementContent(ctxt.getDisplayName());
}
args[3] = Boolean.valueOf(ctxt.getState().isAvailable());
- args[4] = RequestUtil.filter(response.encodeURL(request.getContextPath() +
+ args[4] = Escape.htmlElementContent(response.encodeURL(request.getContextPath() +
"/html/sessions?" + pathVersion));
Manager manager = ctxt.getManager();
if (manager instanceof DistributedManager && showProxySessions) {
@@ -472,19 +472,19 @@ public final class HTMLManagerServlet ex
(MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
args = new Object[14];
- args[0] = RequestUtil.filter(response.encodeURL(request
+ args[0] = Escape.htmlElementContent(response.encodeURL(request
.getContextPath() + "/html/start?" + pathVersion));
args[1] = appsStart;
- args[2] = RequestUtil.filter(response.encodeURL(request
+ args[2] = Escape.htmlElementContent(response.encodeURL(request
.getContextPath() + "/html/stop?" + pathVersion));
args[3] = appsStop;
- args[4] = RequestUtil.filter(response.encodeURL(request
+ args[4] = Escape.htmlElementContent(response.encodeURL(request
.getContextPath() + "/html/reload?" + pathVersion));
args[5] = appsReload;
- args[6] = RequestUtil.filter(response.encodeURL(request
+ args[6] = Escape.htmlElementContent(response.encodeURL(request
.getContextPath() + "/html/undeploy?" + pathVersion));
args[7] = appsUndeploy;
- args[8] = RequestUtil.filter(response.encodeURL(request
+ args[8] = Escape.htmlElementContent(response.encodeURL(request
.getContextPath() + "/html/expire?" + pathVersion));
args[9] = appsExpire;
args[10] = smClient.getString("htmlManagerServlet.expire.explain");
@@ -824,14 +824,14 @@ public final class HTMLManagerServlet ex
}
throw new IllegalArgumentException(smClient.getString(
"managerServlet.invalidPath",
- RequestUtil.filter(path)));
+ Escape.htmlElementContent(path)));
}
Context ctxt = (Context) host.findChild(cn.getName());
if (null == ctxt) {
throw new IllegalArgumentException(smClient.getString(
"managerServlet.noContext",
- RequestUtil.filter(cn.getDisplayName())));
+ Escape.htmlElementContent(cn.getDisplayName())));
}
Manager manager = ctxt.getManager();
List<Session> sessions = new ArrayList<>();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed Oct 18 10:46:14 2017
@@ -58,13 +58,13 @@ import org.apache.catalina.connector.Con
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.startup.ExpandWar;
import org.apache.catalina.util.ContextName;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.tomcat.util.Diagnostics;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.security.Escape;
/**
@@ -997,7 +997,7 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(cn.getName());
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(cn.getDisplayName())));
+ Escape.htmlElementContent(cn.getDisplayName())));
return;
}
// It isn't possible for the manager to reload itself
@@ -1177,13 +1177,13 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(cn.getName());
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(displayPath)));
+ Escape.htmlElementContent(displayPath)));
return;
}
Manager manager = context.getManager() ;
if(manager == null) {
writer.println(smClient.getString("managerServlet.noManager",
- RequestUtil.filter(displayPath)));
+ Escape.htmlElementContent(displayPath)));
return;
}
int maxCount = 60;
@@ -1303,7 +1303,7 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(cn.getName());
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(displayPath)));
+ Escape.htmlElementContent(displayPath)));
return;
}
context.start();
@@ -1349,7 +1349,7 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(cn.getName());
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(displayPath)));
+ Escape.htmlElementContent(displayPath)));
return;
}
// It isn't possible for the manager to stop itself
@@ -1397,13 +1397,13 @@ public class ManagerServlet extends Http
Context context = (Context) host.findChild(name);
if (context == null) {
writer.println(smClient.getString("managerServlet.noContext",
- RequestUtil.filter(displayPath)));
+ Escape.htmlElementContent(displayPath)));
return;
}
if (!isDeployed(name)) {
writer.println(smClient.getString("managerServlet.notDeployed",
- RequestUtil.filter(displayPath)));
+ Escape.htmlElementContent(displayPath)));
return;
}
@@ -1614,7 +1614,7 @@ public class ManagerServlet extends Http
String path = null;
if (cn != null) {
- path = RequestUtil.filter(cn.getPath());
+ path = Escape.htmlElementContent(cn.getPath());
}
writer.println(sm.getString("managerServlet.invalidPath", path));
return false;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java Wed Oct 18 10:46:14 2017
@@ -37,8 +37,8 @@ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.util.RequestUtil;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.security.Escape;
/**
* This is a refactoring of the servlet to externalize
@@ -260,7 +260,7 @@ public class StatusTransformer {
for (MemoryPoolMXBean memoryPoolMBean : memoryPoolMBeans.values()) {
MemoryUsage usage = memoryPoolMBean.getUsage();
writer.write("<memorypool");
- writer.write(" name='" + filterXml(memoryPoolMBean.getName()) + "'");
+ writer.write(" name='" + Escape.xml("", memoryPoolMBean.getName()) + "'");
writer.write(" type='" + memoryPoolMBean.getType() + "'");
writer.write(" usageInit='" + usage.getInit() + "'");
writer.write(" usageCommitted='" + usage.getCommitted() + "'");
@@ -500,32 +500,32 @@ public class StatusTransformer {
}
writer.write("</td>");
writer.write("<td>");
- writer.print(filter(mBeanServer.getAttribute
+ writer.print(Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "remoteAddrForwarded")));
writer.write("</td>");
writer.write("<td>");
- writer.print(filter(mBeanServer.getAttribute
+ writer.print(Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "remoteAddr")));
writer.write("</td>");
writer.write("<td nowrap>");
- writer.write(filter(mBeanServer.getAttribute
+ writer.write(Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "virtualHost")));
writer.write("</td>");
writer.write("<td nowrap class=\"row-left\">");
if (showRequest) {
- writer.write(filter(mBeanServer.getAttribute
+ writer.write(Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "method")));
writer.write(" ");
- writer.write(filter(mBeanServer.getAttribute
+ writer.write(Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "currentUri")));
String queryString = (String) mBeanServer.getAttribute
(pName, "currentQueryString");
if ((queryString != null) && (!queryString.equals(""))) {
writer.write("?");
- writer.print(RequestUtil.filter(queryString));
+ writer.print(Escape.htmlElementContent(queryString));
}
writer.write(" ");
- writer.write(filter(mBeanServer.getAttribute
+ writer.write(Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "protocol")));
} else {
writer.write("?");
@@ -559,30 +559,30 @@ public class StatusTransformer {
}
writer.write("\"");
writer.write(" remoteAddr=\""
- + filter(mBeanServer.getAttribute
+ + Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "remoteAddr")) + "\"");
writer.write(" virtualHost=\""
- + filter(mBeanServer.getAttribute
+ + Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "virtualHost")) + "\"");
if (showRequest) {
writer.write(" method=\""
- + filter(mBeanServer.getAttribute
+ + Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "method")) + "\"");
writer.write(" currentUri=\""
- + filter(mBeanServer.getAttribute
+ + Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "currentUri")) + "\"");
String queryString = (String) mBeanServer.getAttribute
(pName, "currentQueryString");
if ((queryString != null) && (!queryString.equals(""))) {
writer.write(" currentQueryString=\""
- + RequestUtil.filter(queryString) + "\"");
+ + Escape.htmlElementContent(queryString) + "\"");
} else {
writer.write(" currentQueryString=\"?\"");
}
writer.write(" protocol=\""
- + filter(mBeanServer.getAttribute
+ + Escape.htmlElementContext(mBeanServer.getAttribute
(pName, "protocol")) + "\"");
} else {
writer.write(" method=\"?\"");
@@ -644,7 +644,7 @@ public class StatusTransformer {
}
writer.print("<a href=\"#" + (count++) + ".0\">");
- writer.print(filter(webModuleName));
+ writer.print(Escape.htmlElementContext(webModuleName));
writer.print("</a>");
if (iterator.hasNext()) {
writer.print("<br>");
@@ -727,7 +727,7 @@ public class StatusTransformer {
}
writer.print("<h1>");
- writer.print(filter(name));
+ writer.print(Escape.htmlElementContext(name));
writer.print("</h1>");
writer.print("</a>");
@@ -874,11 +874,11 @@ public class StatusTransformer {
mBeanServer.invoke(objectName, "findMappings", null, null);
writer.print("<h2>");
- writer.print(filter(servletName));
+ writer.print(Escape.htmlElementContext(servletName));
if ((mappings != null) && (mappings.length > 0)) {
writer.print(" [ ");
for (int i = 0; i < mappings.length; i++) {
- writer.print(filter(mappings[i]));
+ writer.print(Escape.htmlElementContext(mappings[i]));
if (i < mappings.length - 1) {
writer.print(" , ");
}
@@ -919,7 +919,10 @@ public class StatusTransformer {
*
* @param obj The message string to be filtered
* @return filtered HTML content
+ *
+ * @deprecated This method will be removed in Tomcat 9
*/
+ @Deprecated
public static String filter(Object obj) {
if (obj == null)
@@ -956,7 +959,10 @@ public class StatusTransformer {
* Escape the 5 entities defined by XML.
* @param s The message string to be filtered
* @return filtered XML content
+ *
+ * @deprecated This method will be removed in Tomcat 9
*/
+ @Deprecated
public static String filterXml(String s) {
if (s == null)
return "";
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java Wed Oct 18 10:46:14 2017
@@ -33,9 +33,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.catalina.Container;
import org.apache.catalina.Host;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.security.Escape;
/**
* Servlet that enables remote management of the virtual hosts deployed
@@ -283,7 +283,7 @@ public final class HTMLHostManagerServle
if (message == null || message.length() == 0) {
args[1] = "OK";
} else {
- args[1] = RequestUtil.filter(message);
+ args[1] = Escape.htmlElementContent(message);
}
writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
@@ -341,7 +341,7 @@ public final class HTMLHostManagerServle
if (host != null ) {
args = new Object[2];
- args[0] = RequestUtil.filter(hostName);
+ args[0] = Escape.htmlElementContent(hostName);
String[] aliases = host.findAliases();
StringBuilder buf = new StringBuilder();
if (aliases.length > 0) {
@@ -355,7 +355,7 @@ public final class HTMLHostManagerServle
buf.append(" ");
args[1] = buf.toString();
} else {
- args[1] = RequestUtil.filter(buf.toString());
+ args[1] = Escape.htmlElementContent(buf.toString());
}
writer.print
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Wed Oct 18 10:46:14 2017
@@ -70,10 +70,10 @@ import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.connector.RequestFacade;
import org.apache.catalina.connector.ResponseFacade;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.URLEncoder;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.security.Escape;
import org.apache.tomcat.util.security.PrivilegedGetTccl;
import org.apache.tomcat.util.security.PrivilegedSetTccl;
import org.w3c.dom.Document;
@@ -1482,7 +1482,7 @@ public class DefaultServlet extends Http
.append("'");
sb.append(">");
- sb.append(RequestUtil.filter(entry));
+ sb.append(Escape.htmlElementContent(entry));
if (childResource.isDirectory())
sb.append("/");
sb.append("</entry>");
@@ -1656,7 +1656,7 @@ public class DefaultServlet extends Http
if (childResource.isDirectory())
sb.append("/");
sb.append("\"><tt>");
- sb.append(RequestUtil.filter(entry));
+ sb.append(Escape.htmlElementContent(entry));
if (childResource.isDirectory())
sb.append("/");
sb.append("</tt></a></td>\r\n");
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Wed Oct 18 10:46:14 2017
@@ -1090,7 +1090,7 @@ public class WebdavServlet extends Defau
break;
case Node.ELEMENT_NODE:
strWriter = new StringWriter();
- domWriter = new DOMWriter(strWriter, true);
+ domWriter = new DOMWriter(strWriter);
domWriter.print(currentNode);
lock.owner += strWriter.toString();
break;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/ssi/SSIMediator.java Wed Oct 18 10:46:14 2017
@@ -26,9 +26,9 @@ import java.util.Locale;
import java.util.Set;
import java.util.TimeZone;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.Strftime;
import org.apache.catalina.util.URLEncoder;
+import org.apache.tomcat.util.security.Escape;
/**
* Allows the different SSICommand implementations to share data/talk to each
@@ -284,7 +284,7 @@ public class SSIMediator {
} else if (encoding.equalsIgnoreCase("none")) {
retVal = value;
} else if (encoding.equalsIgnoreCase("entity")) {
- retVal = RequestUtil.filter(value);
+ retVal = Escape.htmlElementContent(value);
} else {
//This shouldn't be possible
throw new IllegalArgumentException("Unknown encoding: " + encoding);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java Wed Oct 18 10:46:14 2017
@@ -26,6 +26,7 @@ import java.util.Iterator;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.descriptor.web.ResourceBase;
+import org.apache.tomcat.util.security.Escape;
/**
* StoreAppends generate really the xml tag elements
@@ -106,7 +107,7 @@ public class StoreAppender {
aWriter.print("<");
aWriter.print(tag);
aWriter.print(">");
- aWriter.print(convertStr(content));
+ aWriter.print(Escape.xml(content));
aWriter.print("</");
aWriter.print(tag);
aWriter.println(">");
@@ -341,7 +342,7 @@ public class StoreAppender {
if (!(value instanceof String)) {
value = value.toString();
}
- String strValue = convertStr((String) value);
+ String strValue = Escape.xml((String) value);
pos = pos + name.length() + strValue.length();
if (pos > 60) {
writer.println();
@@ -360,7 +361,9 @@ public class StoreAppender {
* '&', and '"'.
* @param input The string to escape
* @return the escaped string
+ * @deprecated This method will be removed in Tomcat 9
*/
+ @Deprecated
public String convertStr(String input) {
StringBuffer filtered = new StringBuffer(input.length());
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/users/MemoryUser.java Wed Oct 18 10:46:14 2017
@@ -25,9 +25,9 @@ import java.util.Iterator;
import org.apache.catalina.Group;
import org.apache.catalina.Role;
import org.apache.catalina.UserDatabase;
-import org.apache.catalina.util.RequestUtil;
import org.apache.tomcat.util.buf.StringUtils;
import org.apache.tomcat.util.buf.StringUtils.Function;
+import org.apache.tomcat.util.security.Escape;
/**
* <p>Concrete implementation of {@link org.apache.catalina.User} for the
@@ -261,13 +261,13 @@ public class MemoryUser extends Abstract
public String toXml() {
StringBuilder sb = new StringBuilder("<user username=\"");
- sb.append(RequestUtil.filter(username));
+ sb.append(Escape.xml(username));
sb.append("\" password=\"");
- sb.append(RequestUtil.filter(password));
+ sb.append(Escape.xml(password));
sb.append("\"");
if (fullName != null) {
sb.append(" fullName=\"");
- sb.append(RequestUtil.filter(fullName));
+ sb.append(Escape.xml(fullName));
sb.append("\"");
}
synchronized (groups) {
@@ -275,7 +275,7 @@ public class MemoryUser extends Abstract
sb.append(" groups=\"");
StringUtils.join(groups, ',', new Function<Group>() {
@Override public String apply(Group t) {
- return RequestUtil.filter(t.getGroupname());
+ return Escape.xml(t.getGroupname());
}
}, sb);
sb.append("\"");
@@ -286,7 +286,7 @@ public class MemoryUser extends Abstract
sb.append(" roles=\"");
StringUtils.join(roles, ',', new Function<Role>() {
@Override public String apply(Role t) {
- return RequestUtil.filter(t.getRolename());
+ return Escape.xml(t.getRolename());
}
}, sb);
sb.append("\"");
@@ -304,11 +304,11 @@ public class MemoryUser extends Abstract
public String toString() {
StringBuilder sb = new StringBuilder("User username=\"");
- sb.append(RequestUtil.filter(username));
+ sb.append(Escape.xml(username));
sb.append("\"");
if (fullName != null) {
sb.append(", fullName=\"");
- sb.append(RequestUtil.filter(fullName));
+ sb.append(Escape.xml(fullName));
sb.append("\"");
}
synchronized (groups) {
@@ -316,7 +316,7 @@ public class MemoryUser extends Abstract
sb.append(", groups=\"");
StringUtils.join(groups, ',', new Function<Group>() {
@Override public String apply(Group t) {
- return RequestUtil.filter(t.getGroupname());
+ return Escape.xml(t.getGroupname());
}
}, sb);
sb.append("\"");
@@ -327,7 +327,7 @@ public class MemoryUser extends Abstract
sb.append(", roles=\"");
StringUtils.join(roles, ',', new Function<Role>() {
@Override public String apply(Role t) {
- return RequestUtil.filter(t.getRolename());
+ return Escape.xml(t.getRolename());
}
}, sb);
sb.append("\"");
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/DOMWriter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/DOMWriter.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/DOMWriter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/DOMWriter.java Wed Oct 18 10:46:14 2017
@@ -49,6 +49,12 @@ public class DOMWriter {
protected final boolean canonical;
+ public DOMWriter(Writer writer) {
+ this (writer, true);
+ }
+
+
+ @Deprecated
public DOMWriter(Writer writer, boolean canonical) {
out = new PrintWriter(writer);
this.canonical = canonical;
@@ -130,7 +136,7 @@ public class DOMWriter {
// print text
case Node.TEXT_NODE:
- out.print(normalize(node.getNodeValue()));
+ out.print(normalize(node.getNodeValue()));
break;
// print processing instruction
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/RequestUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/util/RequestUtil.java Wed Oct 18 10:46:14 2017
@@ -32,7 +32,10 @@ public final class RequestUtil {
* @param message The message string to be filtered
*
* @return the filtered message
+ *
+ * @deprecated This method will be removed in Tomcat 9
*/
+ @Deprecated
public static String filter(String message) {
if (message == null) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Wed Oct 18 10:46:14 2017
@@ -27,12 +27,12 @@ import javax.servlet.http.HttpServletRes
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
-import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.ServerInfo;
import org.apache.catalina.util.TomcatCSS;
import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.security.Escape;
/**
* <p>Implementation of a Valve that outputs HTML error pages.</p>
@@ -159,12 +159,12 @@ public class ErrorReportValve extends Va
return;
}
- String message = RequestUtil.filter(response.getMessage());
+ String message = Escape.htmlElementContent(response.getMessage());
if (message == null) {
if (throwable != null) {
String exceptionMessage = throwable.getMessage();
if (exceptionMessage != null && exceptionMessage.length() > 0) {
- message = RequestUtil.filter((new Scanner(exceptionMessage)).nextLine());
+ message = Escape.htmlElementContent((new Scanner(exceptionMessage)).nextLine());
}
}
if (message == null) {
@@ -237,7 +237,7 @@ public class ErrorReportValve extends Va
sb.append("<p><b>");
sb.append(smClient.getString("errorReportValve.exception"));
sb.append("</b></p><pre>");
- sb.append(RequestUtil.filter(stackTrace));
+ sb.append(Escape.htmlElementContent(stackTrace));
sb.append("</pre>");
int loops = 0;
@@ -247,7 +247,7 @@ public class ErrorReportValve extends Va
sb.append("<p><b>");
sb.append(smClient.getString("errorReportValve.rootCause"));
sb.append("</b></p><pre>");
- sb.append(RequestUtil.filter(stackTrace));
+ sb.append(Escape.htmlElementContent(stackTrace));
sb.append("</pre>");
// In case root cause is somehow heavily nested
rootCause = rootCause.getCause();
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/JspUtil.java Wed Oct 18 10:46:14 2017
@@ -27,6 +27,7 @@ import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
import org.apache.tomcat.Jar;
+import org.apache.tomcat.util.security.Escape;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -78,7 +79,7 @@ public class JspUtil {
returnString = expression;
}
- return escapeXml(returnString);
+ return Escape.xml(returnString);
}
/**
@@ -215,7 +216,9 @@ public class JspUtil {
* Escape the 5 entities defined by XML.
* @param s String to escape
* @return XML escaped string
+ * @deprecated This method will be removed in Tomcat 9
*/
+ @Deprecated
public static String escapeXml(String s) {
if (s == null) {
return null;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java Wed Oct 18 10:46:14 2017
@@ -25,6 +25,7 @@ import java.util.ListIterator;
import javax.servlet.jsp.tagext.PageData;
import org.apache.jasper.JasperException;
+import org.apache.tomcat.util.security.Escape;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
@@ -331,7 +332,7 @@ class PageDataImpl extends PageData impl
buf.append(jspId++).append("\">");
}
buf.append("${");
- buf.append(JspUtil.escapeXml(n.getText()));
+ buf.append(Escape.xml(n.getText()));
buf.append("}");
if (!n.getRoot().isXmlSyntax()) {
buf.append(JSP_TEXT_ACTION_END);
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/compiler/Validator.java Wed Oct 18 10:46:14 2017
@@ -40,6 +40,7 @@ import javax.servlet.jsp.tagext.Validati
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.ELNode.Text;
import org.apache.jasper.el.ELContextImpl;
+import org.apache.tomcat.util.security.Escape;
import org.xml.sax.Attributes;
/**
@@ -1403,7 +1404,7 @@ class Validator {
el.visit(v);
value = v.getText();
} else {
- value = xmlEscape(value);
+ value = Escape.xml(value);
}
}
@@ -1452,7 +1453,7 @@ class Validator {
@Override
public void visit(Text n) throws JasperException {
output.append(ELParser.escapeLiteralExpression(
- xmlEscape(n.getText()),
+ Escape.xml(n.getText()),
isDeferredSyntaxAllowedAsLiteral));
}
}
@@ -1913,67 +1914,4 @@ class Validator {
errDisp.jspError(errMsg.toString());
}
}
-
- protected static String xmlEscape(String s) {
- if (s == null) {
- return null;
- }
- int len = s.length();
-
- /*
- * Look for any "bad" characters, Escape "bad" character was found
- */
- // ASCII " 34 & 38 ' 39 < 60 > 62
- for (int i = 0; i < len; i++) {
- char c = s.charAt(i);
- if (c >= '\"' && c <= '>' &&
- (c == '<' || c == '>' || c == '\'' || c == '&' || c == '"')) {
- // need to escape them and then quote the whole string
- StringBuilder sb = new StringBuilder((int) (len * 1.2));
- sb.append(s, 0, i);
- int pos = i + 1;
- for (int j = i; j < len; j++) {
- c = s.charAt(j);
- if (c >= '\"' && c <= '>') {
- if (c == '<') {
- if (j > pos) {
- sb.append(s, pos, j);
- }
- sb.append("<");
- pos = j + 1;
- } else if (c == '>') {
- if (j > pos) {
- sb.append(s, pos, j);
- }
- sb.append(">");
- pos = j + 1;
- } else if (c == '\'') {
- if (j > pos) {
- sb.append(s, pos, j);
- }
- sb.append("'"); // '
- pos = j + 1;
- } else if (c == '&') {
- if (j > pos) {
- sb.append(s, pos, j);
- }
- sb.append("&");
- pos = j + 1;
- } else if (c == '"') {
- if (j > pos) {
- sb.append(s, pos, j);
- }
- sb.append("""); // "
- pos = j + 1;
- }
- }
- }
- if (pos < len) {
- sb.append(s, pos, len);
- }
- return sb.toString();
- }
- }
- return s;
- }
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityUtil.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityUtil.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/security/SecurityUtil.java Wed Oct 18 10:46:14 2017
@@ -47,7 +47,10 @@ public final class SecurityUtil{
*
* @param message The message string to be filtered
* @return the HTML filtered message
+ *
+ * @deprecated This method will be removed in Tomcat 9
*/
+ @Deprecated
public static String filter(String message) {
if (message == null)
@@ -77,5 +80,4 @@ public final class SecurityUtil{
return (result.toString());
}
-
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/jasper/servlet/JspServlet.java Wed Oct 18 10:46:14 2017
@@ -43,6 +43,7 @@ import org.apache.jasper.security.Securi
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.PeriodicEventListener;
+import org.apache.tomcat.util.security.Escape;
/**
* The JSP engine (a.k.a Jasper).
@@ -404,7 +405,7 @@ public class JspServlet extends HttpServ
Localizer.getMessage("jsp.error.file.not.found",jspUri);
// Strictly, filtering this is an application
// responsibility but just in case...
- throw new ServletException(SecurityUtil.filter(msg));
+ throw new ServletException(Escape.htmlElementContent(msg));
} else {
try {
response.sendError(HttpServletResponse.SC_NOT_FOUND,
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Wed Oct 18 10:46:14 2017
@@ -45,6 +45,7 @@ import org.apache.tomcat.util.buf.UDecod
import org.apache.tomcat.util.descriptor.XmlIdentifiers;
import org.apache.tomcat.util.digester.DocumentProperties;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.security.Escape;
/**
* Representation of common elements of web.xml and web-fragment.xml. Provides
@@ -1344,7 +1345,7 @@ public class WebXml extends XmlEncodingB
sb.append('<');
sb.append(elementName);
sb.append('>');
- sb.append(escapeXml(value));
+ sb.append(Escape.xml(value));
sb.append("</");
sb.append(elementName);
sb.append(">\n");
@@ -1358,33 +1359,6 @@ public class WebXml extends XmlEncodingB
}
- /**
- * Escape the 5 entities defined by XML.
- */
- private static String escapeXml(String s) {
- if (s == null)
- return null;
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
- if (c == '<') {
- sb.append("<");
- } else if (c == '>') {
- sb.append(">");
- } else if (c == '\'') {
- sb.append("'");
- } else if (c == '&') {
- sb.append("&");
- } else if (c == '"') {
- sb.append(""");
- } else {
- sb.append(c);
- }
- }
- return sb.toString();
- }
-
-
/**
* Merge the supplied web fragments into this main web.xml.
*
Modified: tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TesterValidator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TesterValidator.java?rev=1812492&r1=1812491&r2=1812492&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TesterValidator.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/jasper/compiler/TesterValidator.java Wed Oct 18 10:46:14 2017
@@ -16,6 +16,7 @@
*/
package org.apache.jasper.compiler;
+import org.apache.tomcat.util.security.Escape;
import org.junit.Assert;
import org.junit.Test;
@@ -42,7 +43,7 @@ public class TesterValidator {
for (int j = 0; j < bug53867TestData.length; j++) {
Assert.assertEquals(doTestBug53867OldVersion(bug53867TestData[j]),
- Validator.xmlEscape(bug53867TestData[j]));
+ Escape.xml(bug53867TestData[j]));
}
for (int i = 0; i < 100; i++) {
@@ -52,7 +53,7 @@ public class TesterValidator {
}
for (int i = 0; i < 100; i++) {
for (int j = 0; j < bug53867TestData.length; j++) {
- Validator.xmlEscape(bug53867TestData[j]);
+ Escape.xml(bug53867TestData[j]);
}
}
@@ -68,7 +69,7 @@ public class TesterValidator {
start = System.currentTimeMillis();
for (int i = 0; i < count; i++) {
for (int j = 0; j < bug53867TestData.length; j++) {
- Validator.xmlEscape(bug53867TestData[j]);
+ Escape.xml(bug53867TestData[j]);
}
}
System.out.println(
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org