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 2016/10/05 10:56:42 UTC
svn commit: r1763405 - in /tomcat/tc8.0.x/trunk: ./ bin/ conf/
java/org/apache/catalina/webresources/
java/org/apache/catalina/webresources/war/ java/org/apache/tomcat/util/buf/
java/org/apache/tomcat/util/scan/ test/org/apache/catalina/loader/ webapps...
Author: markt
Date: Wed Oct 5 10:56:42 2016
New Revision: 1763405
URL: http://svn.apache.org/viewvc?rev=1763405&view=rev
Log:
Refactor the web resources handling to use the Tomcat specific 'war:file:...' URL protocol to refer to WAR files and their contents rather than the standard 'jar:file:...' form since some components of the JRE, such as JAR verification, give unexpected results when the standard form is used. A side-effect of the refactoring is that when using packed WARs, it is now possible to reference a WAR and/or specific JARs within a WAR in the security policy file used when running under a SecurityManager.
Added:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResource.java
- copied unchanged from r1763377, tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResource.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
- copied unchanged from r1763377, tomcat/trunk/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarResource.java
- copied unchanged from r1763377, tomcat/trunk/java/org/apache/catalina/webresources/WarResource.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/WarResourceSet.java
- copied unchanged from r1763377, tomcat/trunk/java/org/apache/catalina/webresources/WarResourceSet.java
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/bin/catalina.bat
tomcat/tc8.0.x/trunk/bin/catalina.sh
tomcat/tc8.0.x/trunk/build.xml
tomcat/tc8.0.x/trunk/conf/catalina.policy
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/Handler.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/docs/security-manager-howto.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 5 10:56:42 2016
@@ -1,2 +1,2 @@
/tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
666387,1666494,1666496,1666552,1666569,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,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,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,1692894,1692896,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,170
2923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,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,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-17199
10,1720200,1720234,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1724012,1724232,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-1725907,1725910,1725914,1725920,17
25926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740509,1740520,1740535,1740707
,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755
647,1755650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758486-1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,1761740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886
,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657
592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1
666387,1666494,1666496,1666552,1666569,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,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452
7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,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,1692894,1692896,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,170
2923,1702971,1702984,1703024,1703040,1703044,1703049-1703050,1703143,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,1713397,1713446,1713612,1713618,1713871,1713931,1713975,1713987,1713992,1713997,1714002,1714012,1714019,1714054,1714521,1714535,1714537,1715168,1715188,1715206,1715413,1715415,1715434,1715510-1715512,1715514-1715515,1715517-1715519,1715521,1715633,1715661,1715682,1715965,1716213-1716214,1716258,1716269,1716347,1716354,1716364,1716413,1716420,1716511,1716543,1716640,1716644,1716856,1716858,1716881-1716882,1716886,1716894,1717085,1717225,1717233,1717252,1717264,1717282,1717286,1717290,1717385,1717416,1717418,1717445,1717515,1717520,1717528,1717965,1717967-1717968,1717979,1718022,1718308,1718523,1718794,1718796,1718834,1718836-1718838,1719278,1719291,1719315,1719332,1719334,1719340,1719346,1719441,1719446,1719488,1719909-17199
10,1720200,1720234,1720394,1720439,1720445,1720448,1720462,1720506,1720652,1720654-1720655,1720711,1720752,1720769,1720776,1720804,1720815,1721303,1721307,1721311,1721314,1721447,1721528,1721539,1721812,1721817,1721830,1721860,1721866,1721881,1721887,1722205,1722292,1722399,1722453,1722455,1722522,1722526,1722532,1722548,1722574,1722583,1722585,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1722902,1722905,1722923,1722939,1722945,1722996,1723068,1723127,1723155,1723250,1723316-1723318,1723368,1723371,1723375,1723377,1723380,1723410,1723414,1723437,1723484,1723486,1723493-1723494,1723500,1723552,1723554,1723683,1723707,1723736,1724012,1724232,1724252,1724325,1724427-1724428,1724433,1724673,1724788,1724863,1724900,1724997,1725113,1725126-1725127,1725150,1725165,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725599,1725601,1725635,1725646,1725649-1725652,1725694,1725696-1725697,1725816,1725851,1725906-1725907,1725910,1725914,1725920,17
25926,1726177,1726202,1726628,1726632,1726637,1726639,1726648,1726651,1726654,1726669,1726676,1726803,1726925-1726926,1726972-1726973,1726991,1727162,1727670,1727675,1727899,1727914,1727917,1728091,1728138,1728433,1728448,1728664,1728677,1729185,1729361,1729625,1729730,1730101-1730102,1730137,1730612,1730946-1730975,1731008,1731055,1731079,1731283,1731856,1731882,1731946-1731958,1731976-1731983,1732359,1732488,1732900-1733448,1733602,1733617-1733963,1733978,1734113,1734128,1734192,1734258,1734301,1734418-1734454,1734466-1734512,1734522,1734592,1734594,1734597,1735041,1735577,1736162,1736209,1736280,1736646,1736836,1737119,1737280,1737339,1737632,1737664,1737715,1737834,1737903,1737959,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738643,1738850,1738982,1738996,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740509,1740520,1740535,1740707
,1740803,1740810,1740980,1740991,1741015,1741147,1741173,1741181,1741190,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741677,1741892,1741896,1742071,1742090,1742093,1742101,1742105,1742111,1742146,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742919,1742975,1742984,1742986,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743697,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744760,1745227,1745337,1746306,1746427,1746473,1746620,1746649,1746724,1746939,1746989,1747536,1747924,1748001,1748547,1748629,1748715,1749287,1749328,1749665-1749666,1750015,1750056,1750899,1750975,1750995,1751061,1751097,1752212,1752737,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755214,1755224,1755230,1755646-1755
647,1755650,1755675,1755693,1755717,1755884,1755890,1755918-1755919,1755942,1756013,1756019,1756039,1756408,1756410,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757495,1757499,1757527,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758486-1758487,1758499,1758556,1758582,1758584,1758588,1758842,1759019,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761491,1761498,1761500-1761501,1761550,1761625-1761626,1761628,1761682,1761740,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762541,1762608,1762710,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276,1763319,1763370,1763372,1763375,1763377,1763393
Modified: tomcat/tc8.0.x/trunk/bin/catalina.bat
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/bin/catalina.bat?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/bin/catalina.bat (original)
+++ tomcat/tc8.0.x/trunk/bin/catalina.bat Wed Oct 5 10:56:42 2016
@@ -207,6 +207,10 @@ set JSSE_OPTS="-Djdk.tls.ephemeralDHKeyS
:gotJsseOpts
set "JAVA_OPTS=%JAVA_OPTS% %JSSE_OPTS%"
+rem Register custom URL handlers
+rem Do this here so they can be used in the security policy
+set "JAVA_OPTS=%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
+
if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
set LOGGING_CONFIG=-Dnop
if not exist "%CATALINA_BASE%\conf\logging.properties" goto noJuliConfig
Modified: tomcat/tc8.0.x/trunk/bin/catalina.sh
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/bin/catalina.sh?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/bin/catalina.sh (original)
+++ tomcat/tc8.0.x/trunk/bin/catalina.sh Wed Oct 5 10:56:42 2016
@@ -245,6 +245,10 @@ if [ -z "$JSSE_OPTS" ] ; then
fi
JAVA_OPTS="$JAVA_OPTS $JSSE_OPTS"
+# Register custom URL handlers
+# Do this here so they can be used in the security policy
+JAVA_OPTS="%JAVA_OPTS% -Djava.protocol.handler.pkgs=org.apache.catalina.webresources"
+
# Set juli LogManager config file if it is present and an override has not been issued
if [ -z "$LOGGING_CONFIG" ]; then
if [ -r "$CATALINA_BASE"/conf/logging.properties ]; then
Modified: tomcat/tc8.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.xml?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/build.xml (original)
+++ tomcat/tc8.0.x/trunk/build.xml Wed Oct 5 10:56:42 2016
@@ -325,6 +325,11 @@
<include name="org/apache/tomcat/websocket/**" />
</patternset>
+ <!-- This duplicates some classes in files.catalina -->
+ <!-- Duplicating a few classes in bootstrap.jar is simpler than excluding -->
+ <!-- them from files.catalina and having to manually add them to -->
+ <!-- files.tomcat-embed-core because of an include/exclude conflict -->
+ <!-- between files.catalina and files.bootstrap. -->
<patternset id="files.bootstrap">
<include name="org/apache/catalina/startup/Bootstrap.*" />
<include name="org/apache/catalina/startup/catalina.properties" />
@@ -333,6 +338,8 @@
<include name="org/apache/catalina/startup/ClassLoaderFactory$*.*" />
<include name="org/apache/catalina/startup/Tool.*" />
<include name="org/apache/catalina/security/SecurityClassLoad.*" />
+ <include name="org/apache/catalina/webresources/war/**" />
+ <include name="org/apache/tomcat/util/buf/UriUtil.*" />
</patternset>
<patternset id="files.tomcat-juli">
@@ -434,7 +441,6 @@
<!-- Every standard pattern set above should be included in an embedded JAR -->
<patternset id="files.tomcat-embed-core" >
<patternset refid="files.annotations-api" />
- <patternset refid="files.bootstrap" />
<patternset refid="files.catalina" />
<patternset refid="files.servlet-api" />
<patternset refid="files.tomcat-api" />
Modified: tomcat/tc8.0.x/trunk/conf/catalina.policy
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/conf/catalina.policy?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/conf/catalina.policy (original)
+++ tomcat/tc8.0.x/trunk/conf/catalina.policy Wed Oct 5 10:56:42 2016
@@ -248,3 +248,13 @@ grant codeBase "file:${catalina.home}/we
// permission java.net.SocketPermission "*.noaa.gov:80", "connect";
// };
+// To grant permissions for web applications using packed WAR files, use the
+// Tomcat specific WAR url scheme.
+//
+// The permissions granted to the entire web application
+// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/-" {
+// };
+//
+// The permissions granted to a specific JAR
+// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
+// };
\ No newline at end of file
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResource.java Wed Oct 5 10:56:42 2016
@@ -16,10 +16,7 @@
*/
package org.apache.catalina.webresources;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -28,35 +25,16 @@ import org.apache.juli.logging.LogFactor
* Represents a single resource (file or directory) that is located within a
* JAR.
*/
-public class JarResource extends AbstractArchiveResource {
+public class JarResource extends AbstractSingleArchiveResource {
private static final Log log = LogFactory.getLog(JarResource.class);
+
public JarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath,
String baseUrl, JarEntry jarEntry) {
super(archiveResourceSet, webAppPath, "jar:" + baseUrl, jarEntry, baseUrl);
}
- @Override
- protected JarInputStreamWrapper getJarInputStreamWrapper() {
- JarFile jarFile = null;
- try {
- jarFile = getArchiveResourceSet().openJarFile();
- // Need to create a new JarEntry so the certificates can be read
- JarEntry jarEntry = jarFile.getJarEntry(getResource().getName());
- InputStream is = jarFile.getInputStream(jarEntry);
- return new JarInputStreamWrapper(jarEntry, is);
- } catch (IOException e) {
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("jarResource.getInputStreamFail",
- getResource().getName(), getBaseUrl()), e);
- }
- if (jarFile != null) {
- getArchiveResourceSet().closeJarFile();
- }
- return null;
- }
- }
@Override
protected Log getLog() {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarResourceSet.java Wed Oct 5 10:56:42 2016
@@ -16,24 +16,16 @@
*/
package org.apache.catalina.webresources;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Enumeration;
-import java.util.HashMap;
import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.apache.catalina.LifecycleException;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
-import org.apache.tomcat.util.buf.UriUtil;
/**
* Represents a {@link org.apache.catalina.WebResourceSet} based on a JAR file.
*/
-public class JarResourceSet extends AbstractArchiveResourceSet {
+public class JarResourceSet extends AbstractSingleArchiveResourceSet {
/**
* A no argument constructor is required for this to work with the digester.
@@ -41,6 +33,7 @@ public class JarResourceSet extends Abst
public JarResourceSet() {
}
+
/**
* Creates a new {@link org.apache.catalina.WebResourceSet} based on a JAR
* file.
@@ -63,86 +56,13 @@ public class JarResourceSet extends Abst
*/
public JarResourceSet(WebResourceRoot root, String webAppMount, String base,
String internalPath) throws IllegalArgumentException {
- setRoot(root);
- setWebAppMount(webAppMount);
- setBase(base);
- setInternalPath(internalPath);
-
- if (getRoot().getState().isAvailable()) {
- try {
- start();
- } catch (LifecycleException e) {
- throw new IllegalStateException(e);
- }
- }
+ super(root, webAppMount, base, internalPath);
}
+
@Override
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath, Manifest manifest) {
return new JarResource(this, webAppPath, getBaseUrlString(), jarEntry);
}
-
-
- @Override
- protected HashMap<String,JarEntry> getArchiveEntries(boolean single) {
- synchronized (archiveLock) {
- if (archiveEntries == null && !single) {
- JarFile jarFile = null;
- archiveEntries = new HashMap<>();
- try {
- jarFile = openJarFile();
- Enumeration<JarEntry> entries = jarFile.entries();
- while (entries.hasMoreElements()) {
- JarEntry entry = entries.nextElement();
- archiveEntries.put(entry.getName(), entry);
- }
- } catch (IOException ioe) {
- // Should never happen
- archiveEntries = null;
- throw new IllegalStateException(ioe);
- } finally {
- if (jarFile != null) {
- closeJarFile();
- }
- }
- }
- return archiveEntries;
- }
- }
-
-
- @Override
- protected JarEntry getArchiveEntry(String pathInArchive) {
- JarFile jarFile = null;
- try {
- jarFile = openJarFile();
- return jarFile.getJarEntry(pathInArchive);
- } catch (IOException ioe) {
- // Should never happen
- throw new IllegalStateException(ioe);
- } finally {
- if (jarFile != null) {
- closeJarFile();
- }
- }
- }
-
-
- //-------------------------------------------------------- Lifecycle methods
- @Override
- protected void initInternal() throws LifecycleException {
-
- try (JarFile jarFile = new JarFile(getBase())) {
- setManifest(jarFile.getManifest());
- } catch (IOException ioe) {
- throw new IllegalArgumentException(ioe);
- }
-
- try {
- setBaseUrl(UriUtil.buildJarSafeUrl(new File(getBase())));
- } catch (MalformedURLException e) {
- throw new IllegalArgumentException(e);
- }
- }
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/JarWarResource.java Wed Oct 5 10:56:42 2016
@@ -37,8 +37,9 @@ public class JarWarResource extends Abst
public JarWarResource(AbstractArchiveResourceSet archiveResourceSet, String webAppPath,
String baseUrl, JarEntry jarEntry, String archivePath) {
- super(archiveResourceSet, webAppPath, "jar:war:" + baseUrl + "*/" + archivePath,
- jarEntry, "jar:" + baseUrl + "!/" + archivePath);
+
+ super(archiveResourceSet, webAppPath, "jar:war:" + baseUrl + "*/" + archivePath + "!/",
+ jarEntry, "war:" + baseUrl + "*/" + archivePath);
this.archivePath = archivePath;
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java Wed Oct 5 10:56:42 2016
@@ -725,7 +725,7 @@ public class StandardRoot extends Lifecy
if (f.isDirectory()) {
mainResourceSet = new DirResourceSet(this, "/", f.getAbsolutePath(), "/");
} else if(f.isFile() && docBase.endsWith(".war")) {
- mainResourceSet = new JarResourceSet(this, "/", f.getAbsolutePath(), "/");
+ mainResourceSet = new WarResourceSet(this, "/", f.getAbsolutePath());
} else {
throw new IllegalArgumentException(
sm.getString("standardRoot.startInvalidMain",
@@ -798,9 +798,14 @@ public class StandardRoot extends Lifecy
BaseLocation(URL url) {
File f = null;
- if ("jar".equals(url.getProtocol())) {
+ if ("jar".equals(url.getProtocol()) || "war".equals(url.getProtocol())) {
String jarUrl = url.toString();
- int endOfFileUrl = jarUrl.indexOf("!/");
+ int endOfFileUrl = -1;
+ if ("jar".equals(url.getProtocol())) {
+ endOfFileUrl = jarUrl.indexOf("!/");
+ } else {
+ endOfFileUrl = jarUrl.indexOf("*/");
+ }
String fileUrl = jarUrl.substring(4, endOfFileUrl);
try {
f = new File(new URL(fileUrl).toURI());
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/Handler.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/Handler.java?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/Handler.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/Handler.java Wed Oct 5 10:56:42 2016
@@ -27,4 +27,20 @@ public class Handler extends URLStreamHa
protected URLConnection openConnection(URL u) throws IOException {
return new WarURLConnection(u);
}
+
+ @Override
+ protected void setURL(URL u, String protocol, String host, int port, String authority, String userInfo, String path,
+ String query, String ref) {
+ if (path.startsWith("file:") && !path.startsWith("file:/")) {
+ // Work around a problem with the URLs in the security policy file.
+ // On Windows, the use of ${catalina.[home|base]} in the policy file
+ // results in codebase URLs of the form file:C:/... when they should
+ // be file:/C:/...
+ // For file: and jar: URLs, the JRE compensates for this. It does not
+ // compensate for this for war:file:... URLs. Therefore, we do that
+ // here
+ path = "file:/" + path.substring(5);
+ }
+ super.setURL(u, protocol, host, port, authority, userInfo, path, query, ref);
+ }
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/war/WarURLConnection.java Wed Oct 5 10:56:42 2016
@@ -22,6 +22,8 @@ import java.net.URL;
import java.net.URLConnection;
import java.security.Permission;
+import org.apache.tomcat.util.buf.UriUtil;
+
public class WarURLConnection extends URLConnection {
@@ -30,18 +32,7 @@ public class WarURLConnection extends UR
protected WarURLConnection(URL url) throws IOException {
super(url);
-
- // Need to make this look like a JAR URL for the WAR file
- // Assumes that the spec is absolute and starts war:file:/...
- String file = url.getFile();
- if (file.contains("*/")) {
- file = file.replaceFirst("\\*/", "!/");
- } else {
- file = file.replaceFirst("\\^/", "!/");
- }
-
- URL innerJarUrl = new URL("jar", url.getHost(), url.getPort(), file);
-
+ URL innerJarUrl = UriUtil.warToJar(url);
wrappedJarUrlConnection = innerJarUrl.openConnection();
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/buf/UriUtil.java Wed Oct 5 10:56:42 2016
@@ -128,4 +128,27 @@ public final class UriUtil {
tmp = PATTERN_CARET.matcher(tmp).replaceAll("%5e/");
return PATTERN_ASTERISK.matcher(tmp).replaceAll("%2a/");
}
+
+
+ /**
+ * Convert a URL of the form <code>war:file:...</code> to
+ * <code>war:file:...</code>.
+ *
+ * @param warUrl The WAR URL to convert
+ *
+ * @return The equivalent JAR URL
+ *
+ * @throws MalformedURLException If the conversion fails
+ */
+ public static URL warToJar(URL warUrl) throws MalformedURLException {
+ // Assumes that the spec is absolute and starts war:file:/...
+ String file = warUrl.getFile();
+ if (file.contains("*/")) {
+ file = file.replaceFirst("\\*/", "!/");
+ } else {
+ file = file.replaceFirst("\\^/", "!/");
+ }
+
+ return new URL("jar", warUrl.getHost(), warUrl.getPort(), file);
+ }
}
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/JarFactory.java Wed Oct 5 10:56:42 2016
@@ -21,6 +21,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import org.apache.tomcat.Jar;
+import org.apache.tomcat.util.buf.UriUtil;
/**
* Provide a mechanism to obtain objects that implement {@link Jar}.
@@ -31,21 +32,26 @@ public class JarFactory {
// Factory class. Hide public constructor.
}
+
public static Jar newInstance(URL url) throws IOException {
- String jarUrl = url.toString();
- if (jarUrl.startsWith("jar:file:")) {
- if (jarUrl.endsWith("!/")) {
+ String urlString = url.toString();
+ if (urlString.startsWith("jar:file:")) {
+ if (urlString.endsWith("!/")) {
return new JarFileUrlJar(url, true);
} else {
return new JarFileUrlNestedJar(url);
}
- } else if (jarUrl.startsWith("file:")) {
+ } else if (urlString.startsWith("war:file:")) {
+ URL jarUrl = UriUtil.warToJar(url);
+ return new JarFileUrlNestedJar(jarUrl);
+ } else if (urlString.startsWith("file:")) {
return new JarFileUrlJar(url, false);
} else {
return new UrlJar(url);
}
}
+
public static URL getJarEntryURL(URL baseUrl, String entryName)
throws MalformedURLException {
Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java (original)
+++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoader.java Wed Oct 5 10:56:42 2016
@@ -36,8 +36,8 @@ public class TestWebappClassLoader exten
String[] expected = new String[2];
String warUrl = f.toURI().toURL().toExternalForm();
- expected[0] = "jar:" + warUrl + "!/WEB-INF/classes/";
- expected[1] = "jar:" + warUrl + "!/WEB-INF/lib/test.jar";
+ expected[0] = "war:" + warUrl + "*/WEB-INF/classes/";
+ expected[1] = "war:" + warUrl + "*/WEB-INF/lib/test.jar";
Tomcat tomcat = getTomcatInstance();
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=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Oct 5 10:56:42 2016
@@ -60,6 +60,16 @@
test cases by Santhana Preethiand a patch by Tiago Oliveira. (markt)
</fix>
<fix>
+ <bug>60087</bug>: Refactor the web resources handling to use the Tomcat
+ specific <code>war:file:...</code> URL protocol to refer to WAR files
+ and their contents rather than the standard <code>jar:file:...</code>
+ form since some components of the JRE, such as JAR verification, give
+ unexpected results when the standard form is used. A side-effect of the
+ refactoring is that when using packed WARs, it is now possible to
+ reference a WAR and/or specific JARs within a WAR in the security policy
+ file used when running under a <code>SecurityManager</code>. (markt)
+ </fix>
+ <fix>
<bug>60116</bug>: Fix a problem with the rewrite valve that caused back
references evaluated in conditions to be forced to lower case when using
the <code>NC</code> flag. (markt)
Modified: tomcat/tc8.0.x/trunk/webapps/docs/security-manager-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/security-manager-howto.xml?rev=1763405&r1=1763404&r2=1763405&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/security-manager-howto.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/security-manager-howto.xml Wed Oct 5 10:56:42 2016
@@ -154,7 +154,33 @@ grant [signedBy <signer>,] [codeBase <co
<source>$CATALINA_HOME/bin/catalina.sh start -security (Unix)
%CATALINA_HOME%\bin\catalina start -security (Windows)</source>
+ <subsection name="Permissions for packed WAR files">
+
+ <p>When using packed WAR files, it is necessary to use Tomcat's custom war
+ URL protocol to asisgn permissions to web application code.</p>
+
+ <p>To assign permissions to the entire web application the entry in the
+ policy file would look like this:</p>
+
+<source><![CDATA[// Example policy file entry
+grant codeBase "war:file:${catalina.base}/webapps/examples.war*/-" {
+ ...
+};
+]]></source>
+
+ <p>To assign permissions to a single JAR within the web application the
+ entry in the policy file would look like this:</p>
+
+<source><![CDATA[// Example policy file entry
+grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
+ ...
+};
+]]></source>
+
+ </subsection>
+
</section>
+
<section name="Configuring Package Protection in Tomcat">
<p>Starting with Tomcat 5, it is now possible to configure which Tomcat
internal package are protected against package definition and access. See
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org