Author: markt
Date: Wed Nov 2 13:59:15 2016
New Revision: 1767683
URL: http://svn.apache.org/viewvc?rev=1767683&view=rev
Log:
Add additional checks for valid characters to the HTTP request line
parsing so invalid request lines are rejected sooner.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 2 13:59:15 2016
@@ -1,4 +1,4 @@
-/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001
,1664176,1665087,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759567,1761
631,1761748,1762772,1763236,1763415,1763580,1765593,1765598,1767374
-/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666759,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018,1759565
+/tomcat/tc7.0.x/trunk:1190476,1224802,1243045,1298635,1304471,1311997,1312007,1331772,1333164,1333176,1348992,1354866,1371298,1371302,1371620,1402110,1409014,1413553,1413557,1413563,1430083,1438415,1446641-1446660,1447013,1453106,1453119,1484919,1486877,1498342,1500065,1503852,1505844,1513151,1521040,1524796,1526470,1536524,1539176-1539177,1544469,1544473,1552805,1558894,1558917,1560812,1561368,1561382,1561386,1561552,1561561,1561636,1561641,1561643,1561737,1562748,1564317,1564417,1568922,1570163,1577328,1577464-1577465,1578814,1586659,1586897,1586960,1588199,1588997,1589740,1589851,1589997,1590019,1590028,1590337,1590492,1590651,1590838,1590845,1590848,1590912,1593262,1593288,1593371,1593835,1594230,1595174,1595366,1600956,1601333,1601856,1601909,1609079,1609606,1617364,1617374,1617433,1617457-1617458,1624249,1626579,1627420,1627469,1632586,1637686,1637711,1640675,1642045,1643515,1643540,1643572,1643585-1643586,1643642,1643647,1644019,1648817,1656301,1658815,1659523,1659564,1664001
,1664176,1665087,1666762,1666968,1666989,1668541,1668635,1669802,1676557,1681183,1681841,1681865,1681867,1685829,1693109,1694293,1694433,1694875,1696381,1701945,1710353,1712656,1713873,1714000,1714005,1714540,1715213,1716221,1716417,1717107,1717210,1717212,1720236,1720398,1720443,1720464,1721814,1721883,1722645,1722801,1723151,1724435,1724553,1724675,1724797,1724806,1725931,1726631,1726808,1726813,1726815,1726817,1726819,1726917,1726919,1726922-1726924,1727031,1727034,1727043,1727158,1727672,1727903,1728450,1729363,1731010,1731119,1731956,1731978,1732362,1732674-1732675,1733942,1734116,1734134,1734532,1737249,1737253,1737968,1738049,1738186,1739778,1741178,1741184,1741193,1741211,1741218,1741228,1741235,1742281,1743121,1743142,1743649,1744061,1744129,1744155,1744241,1744383,1744689,1745230,1746942,1746994,1749377,1750018,1750980,1751066,1754114,1754147,1754728,1754880,1754891,1754898,1754902,1756030,1756417,1756420,1756423,1756942,1757275,1757284,1757503,1758490,1758495,1759567,1761
631,1761748,1762772,1763236,1763415,1763580,1765593,1765598,1767374,1767675
+/tomcat/tc8.0.x/trunk:1637685,1637709,1640674,1641726,1641729-1641730,1643513,1643539,1643571,1643581-1643582,1644018,1648816,1656300,1658801-1658803,1658811,1659522,1663997,1664175,1665086,1666759,1666967,1666988,1668634,1669801,1676556,1681182,1681840,1681864,1685827,1689921,1693108,1694291,1694427,1694873,1696379,1701944,1710347,1712618,1712655,1713872,1713998,1714004,1714538,1715207,1715866,1716216-1716217,1716414,1717208-1717209,1720235,1720396,1720442,1720463,1721813,1721882,1722800,1723130,1724434,1724674,1724792,1724803,1725929,1725963-1725965,1725970,1725974,1726172,1726175,1726179-1726182,1726195-1726198,1726200,1726203,1726226,1726576,1726630,1727029,1727037,1727671,1727900,1728449,1729362,1731009,1731955,1731977,1732360,1732672,1733941,1734115,1734133,1734531,1737967,1738173,1739777,1741217,1743647,1744152,1756018,1759565,1767653
/tomcat/tc8.5.x/trunk:1737199,1737966,1738044,1741174,1741182,1741191,1741209,1741226,1741233,1742277,1743118,1743139-1743140,1744059,1744127,1744151,1744232,1744377,1744687,1745228,1746940,1749375,1750016,1750976,1751062,1754112,1754144,1754726,1754806,1754878,1754889,1754894,1754900,1756412,1756940,1757272,1757282,1757501,1758488,1758493,1761629,1761741,1762770,1763233,1763413,1763578,1765591,1765596,1767370
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907727,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,94
8057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1041892,1042022,1042029,1042447,1042452,1042494,1043983,1044944,1044987,1049264,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1060486,1061412,1061442,1061446,1061503,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073184,1073393,1075458,1076212,1078409,1078412,1079801,1081118,1081334,1088179,1088460,1090022,1
094069,1094089,1095138,1097899,1099575,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1139280,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1145137,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1174882,1174884,1175158,1175190,1176799,1177125,1177245,1177850,1177862,1178228,1178233,1178684,1181028,1181136,1184917,1184919,1185200,1185588,1186011,1186104,1186123,1186137,1186153,1186378,1186712,1186763,1186949,1187381,1189240,1189386,1190388-1190389,1190474,1198622,1201576,1203091,1224801,1233426,1243034,1243038,1244567,1298140,1298628-1298629,1304468,1311997,1331766,1333161,1333173,1342498,1342503,1348425,1348461-1348495,1348989,1350294,1351056,1351636-1351640,1352011,1354685,1354847,1354856,1356125,1359981,1371283,1409007,1413552,1413556,1413562,1417282,1430079,1430481,1430567,1435606,1435636,1435642,1438411,1439054,1441348,1446640,1446650,1447012,1453105,145311
2,1456666-1456678,1456713,1456721,1457968,1460342,1460533,1484862,1486875,1492570,1494143,1498340,1500062,1503851,1505843,1513148-1513149,1526469,1533312,1536520,1539157,1539173,1540374,1552804,1555163,1558811,1560810,1561054-1561065,1561067-1561070,1561072-1561075,1561083,1561190-1561192,1561635,1561640,1561732,1562742,1562746,1564299,1564309,1564312,1564414,1568921,1574004,1577315,1577324,1577463,1578812-1578813,1586658,1586894,1586959,1588193,1588197,1589737-1589738,1589763,1589837,1589842,1589980,1590018,1590302,1590646,1590648,1590835,1590842,1590911,1593259,1593261,1593335,1593834,1594229,1595171,1595289,1597532,1600955,1600963,1600978,1600984,1601329-1601330,1601332,1601855,1608963,1609061,1609593,1617362,1617365,1617383,1617456,1623392,1624247,1626579,1627033,1628978,1631155,1631520,1632584,1634117,1634130,1637684,1637695,1640655-1640658,1641656,1641660,1641692,1641707-1641718,1641721-1641722,1642564,1642606,1643045,1643054,1643570,1644017,1648815,1656299,1658799,1658802,165
9521,1663995,1664174,1665085,1666757,1666966,1666985,1668630,1669800,1676552,1681837-1681838,1681854,1685826,1687242,1689918,1693105,1694290,1694872,1696378,1701940,1710346,1712617,1712654,1713871,1713997,1714002,1715188,1715206,1716213-1716214,1716413,1716640,1716856,1716858,1716881-1716882,1716886,1716894,1720234,1720394,1720439,1720462,1721812,1721881,1722532,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1723127,1723707,1723736,1724427,1724433,1724673,1724788,1724863,1725113,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725646,1725649-1725652,1725696-1725697,1725914,1725926,1726177,1726202,1726628,1726676,1726926,1727162,1727670,1727899,1728448,1729361,1731008,1731953,1731976,1732359,1733940,1734113,1734128,1734192,1737119,1737715,1737834,1737959,1738039,1738043,1739775,1741173,1741181,1741190,1741208,1741213,1741225,1741232,1742090,1742276,1743115,1743117,1743554,1744058,1744125,1744229,1744323,1744684,1745227,1745337,1746939,
1748629,1750015,1750975,1751061,1754111,1754140-1754141,1754445,1754494,1754496,1754528,1754532-1754533,1754714,1756013,1756408,1756410,1756939,1757271,1757278,1757499,1758486-1758487,1760648,1761628,1761682,1761740,1762769,1762772,1763232,1763412,1763574,1763578,1765299,1765358,1765439,1767368,1767429
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,656018,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770
809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,890265
,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907727,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,943112,944409,944416,945231,945808,945835,945841,946686,94
8057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,961948,962865,962872,962881,962900,963106,963865,963868,964614,966177-966178,966292,966692,966863,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004393,1004409,1004415,1004868-1004869,1004912,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1033897,1037715,1037794,1037887,1037924,1038041,1041892,1042022,1042029,1042447,1042452,1042494,1043983,1044944,1044987,1049264,1050249,1055055,1055236,1055458,1055975,1056264,1056828,1056889,1059881,1060486,1061412,1061442,1061446,1061503,1062398,1064652,1066244,1066772,1067039,1067139,1069824,1070139,1070420,1070609,1072042,1073184,1073393,1075458,1076212,1078409,1078412,1079801,1081118,1081334,1088179,1088460,1090022,1
094069,1094089,1095138,1097899,1099575,1099586,1099772,1099789,1100145,1100822,1101094,1101144,1124680,1130774,1133014,1137862,1137996,1138950,1138953,1139280,1140693,1141104,1141441,1142043,1142904,1143134,1143150,1145137,1148216,1148471,1152601,1156171,1156519,1164567,1167394,1172233-1172234,1172236,1173614,1174353,1174882,1174884,1175158,1175190,1176799,1177125,1177245,1177850,1177862,1178228,1178233,1178684,1181028,1181136,1184917,1184919,1185200,1185588,1186011,1186104,1186123,1186137,1186153,1186378,1186712,1186763,1186949,1187381,1189240,1189386,1190388-1190389,1190474,1198622,1201576,1203091,1224801,1233426,1243034,1243038,1244567,1298140,1298628-1298629,1304468,1311997,1331766,1333161,1333173,1342498,1342503,1348425,1348461-1348495,1348989,1350294,1351056,1351636-1351640,1352011,1354685,1354847,1354856,1356125,1359981,1371283,1409007,1413552,1413556,1413562,1417282,1430079,1430481,1430567,1435606,1435636,1435642,1438411,1439054,1441348,1446640,1446650,1447012,1453105,145311
2,1456666-1456678,1456713,1456721,1457968,1460342,1460533,1484862,1486875,1492570,1494143,1498340,1500062,1503851,1505843,1513148-1513149,1526469,1533312,1536520,1539157,1539173,1540374,1552804,1555163,1558811,1560810,1561054-1561065,1561067-1561070,1561072-1561075,1561083,1561190-1561192,1561635,1561640,1561732,1562742,1562746,1564299,1564309,1564312,1564414,1568921,1574004,1577315,1577324,1577463,1578812-1578813,1586658,1586894,1586959,1588193,1588197,1589737-1589738,1589763,1589837,1589842,1589980,1590018,1590302,1590646,1590648,1590835,1590842,1590911,1593259,1593261,1593335,1593834,1594229,1595171,1595289,1597532,1600955,1600963,1600978,1600984,1601329-1601330,1601332,1601855,1608963,1609061,1609593,1617362,1617365,1617383,1617456,1623392,1624247,1626579,1627033,1628978,1631155,1631520,1632584,1634117,1634130,1637684,1637695,1640655-1640658,1641656,1641660,1641692,1641707-1641718,1641721-1641722,1642564,1642606,1643045,1643054,1643570,1644017,1648815,1656299,1658799,1658802,165
9521,1663995,1664174,1665085,1666757,1666966,1666985,1668630,1669800,1676552,1681837-1681838,1681854,1685826,1687242,1689918,1693105,1694290,1694872,1696378,1701940,1710346,1712617,1712654,1713871,1713997,1714002,1715188,1715206,1716213-1716214,1716413,1716640,1716856,1716858,1716881-1716882,1716886,1716894,1720234,1720394,1720439,1720462,1721812,1721881,1722532,1722799,1722807,1722824,1722828-1722829,1722831,1722859,1723127,1723707,1723736,1724427,1724433,1724673,1724788,1724863,1725113,1725183,1725199,1725202,1725204,1725207,1725263-1725264,1725266,1725278,1725282,1725405,1725646,1725649-1725652,1725696-1725697,1725914,1725926,1726177,1726202,1726628,1726676,1726926,1727162,1727670,1727899,1728448,1729361,1731008,1731953,1731976,1732359,1733940,1734113,1734128,1734192,1737119,1737715,1737834,1737959,1738039,1738043,1739775,1741173,1741181,1741190,1741208,1741213,1741225,1741232,1742090,1742276,1743115,1743117,1743554,1744058,1744125,1744229,1744323,1744684,1745227,1745337,1746939,
1748629,1750015,1750975,1751061,1754111,1754140-1754141,1754445,1754494,1754496,1754528,1754532-1754533,1754714,1756013,1756408,1756410,1756939,1757271,1757278,1757499,1758486-1758487,1760648,1761628,1761682,1761740,1762769,1762772,1763232,1763412,1763574,1763578,1765299,1765358,1765439,1767368,1767429,1767641-1767643
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=1767683&r1=1767682&r2=1767683&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
Wed Nov 2 13:59:15 2016
@@ -17,56 +17,8 @@
package org.apache.coyote.http11;
import org.apache.coyote.InputBuffer;
+import org.apache.tomcat.util.res.StringManager;
public abstract class AbstractInputBuffer implements InputBuffer {
-
- protected static final boolean[] HTTP_TOKEN_CHAR = new boolean[128];
- static {
- for (int i = 0; i < 128; i++) {
- if (i < 32) {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == 127) {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '(') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == ')') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '<') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '>') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '@') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == ',') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == ';') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == ':') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '\\') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '\"') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '/') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '[') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == ']') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '?') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '=') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '{') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == '}') {
- HTTP_TOKEN_CHAR[i] = false;
- } else if (i == ' ') {
- HTTP_TOKEN_CHAR[i] = false;
- } else {
- HTTP_TOKEN_CHAR[i] = true;
- }
- }
- }
-}
+ protected static final StringManager sm =
StringManager.getManager(AbstractInputBuffer.class);}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1767683&r1=1767682&r2=1767683&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Wed Nov 2 13:59:15 2016
@@ -26,7 +26,7 @@ import org.apache.tomcat.jni.Status;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.util.http.parser.HttpParser;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.Request;
import org.apache.juli.logging.Log;
@@ -68,23 +68,12 @@ public class InternalAprInputBuffer exte
parsingHeader = true;
swallowInput = true;
-
- }
-
-
- // -------------------------------------------------------------- Variables
-
- /**
- * The string manager for this package.
- */
- protected static StringManager sm =
- StringManager.getManager(Constants.Package);
+ }
// ----------------------------------------------------- Instance Variables
-
/**
* Associated Coyote request.
*/
@@ -196,7 +185,7 @@ public class InternalAprInputBuffer exte
*/
public void addFilter(InputFilter filter) {
- InputFilter[] newFilterLibrary =
+ InputFilter[] newFilterLibrary =
new InputFilter[filterLibrary.length + 1];
for (int i = 0; i < filterLibrary.length; i++) {
newFilterLibrary[i] = filterLibrary[i];
@@ -264,7 +253,7 @@ public class InternalAprInputBuffer exte
/**
- * Recycle the input buffer. This should be called when closing the
+ * Recycle the input buffer. This should be called when closing the
* connection.
*/
public void recycle() {
@@ -289,7 +278,7 @@ public class InternalAprInputBuffer exte
/**
* End processing of current HTTP request.
- * Note: All bytes of the current request should have been already
+ * Note: All bytes of the current request should have been already
* consumed. This method only resets all the pointers so that we are ready
* to parse the next HTTP request.
*/
@@ -302,7 +291,7 @@ public class InternalAprInputBuffer exte
if (lastValid - pos > 0 && pos > 0) {
System.arraycopy(buf, pos, buf, 0, lastValid - pos);
}
-
+
// Recycle filters
for (int i = 0; i <= lastActiveFilter; i++) {
activeFilters[i].recycle();
@@ -320,7 +309,7 @@ public class InternalAprInputBuffer exte
/**
* End request (consumes leftover bytes).
- *
+ *
* @throws IOException an undelying I/O error occured
*/
public void endRequest()
@@ -335,14 +324,14 @@ public class InternalAprInputBuffer exte
/**
- * Read the request line. This function is meant to be used during the
- * HTTP request header parsing. Do NOT attempt to read the request body
+ * Read the request line. This function is meant to be used during the
+ * HTTP request header parsing. Do NOT attempt to read the request body
* using it.
*
* @throws IOException If an exception occurs during the underlying socket
* read operations, or if the given buffer is not big enough to accomodate
* the whole line.
- * @return true if data is properly fed; false if no data is available
+ * @return true if data is properly fed; false if no data is available
* immediately and thread should be freed
*/
public boolean parseRequestLine(boolean useAvailableData)
@@ -403,7 +392,7 @@ public class InternalAprInputBuffer exte
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
space = true;
request.method().setBytes(buf, start, pos - start);
- } else if (!HTTP_TOKEN_CHAR[buf[pos]]) {
+ } else if (!HttpParser.isToken(buf[pos])) {
throw new
IllegalArgumentException(sm.getString("iib.invalidmethod"));
}
@@ -448,15 +437,17 @@ public class InternalAprInputBuffer exte
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
space = true;
end = pos;
- } else if ((buf[pos] == Constants.CR)
+ } else if ((buf[pos] == Constants.CR)
|| (buf[pos] == Constants.LF)) {
// HTTP/0.9 style request
eol = true;
space = true;
end = pos;
- } else if ((buf[pos] == Constants.QUESTION)
+ } else if ((buf[pos] == Constants.QUESTION)
&& (questionPos == -1)) {
questionPos = pos;
+ } else if (HttpParser.isNotRequestTarget(buf[pos])) {
+ throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
}
pos++;
@@ -465,7 +456,7 @@ public class InternalAprInputBuffer exte
request.unparsedURI().setBytes(buf, start, end - start);
if (questionPos >= 0) {
- request.queryString().setBytes(buf, questionPos + 1,
+ request.queryString().setBytes(buf, questionPos + 1,
end - questionPos - 1);
request.requestURI().setBytes(buf, start, questionPos - start);
} else {
@@ -493,7 +484,7 @@ public class InternalAprInputBuffer exte
//
// Reading the protocol
- // Protocol is always US-ASCII
+ // Protocol is always "HTTP/" DIGIT "." DIGIT
//
while (!eol) {
@@ -510,6 +501,8 @@ public class InternalAprInputBuffer exte
if (end == 0)
end = pos;
eol = true;
+ } else if (!HttpParser.isHttpProtocol(buf[pos])) {
+ throw new
IllegalArgumentException(sm.getString("iib.invalidHttpProtocol"));
}
pos++;
@@ -521,7 +514,7 @@ public class InternalAprInputBuffer exte
} else {
request.protocol().setString("");
}
-
+
return true;
}
@@ -544,7 +537,7 @@ public class InternalAprInputBuffer exte
/**
* Parse an HTTP header.
- *
+ *
* @return false after reading a blank line (which indicates that the
* HTTP header parsing is done
*/
@@ -602,7 +595,7 @@ public class InternalAprInputBuffer exte
if (buf[pos] == Constants.COLON) {
colon = true;
headerValue = headers.addValue(buf, start, pos - start);
- } else if (!HTTP_TOKEN_CHAR[buf[pos]]) {
+ } else if (!HttpParser.isToken(buf[pos])) {
// If a non-token header is detected, skip the line and
// ignore the header
skipLine(start);
@@ -708,14 +701,14 @@ public class InternalAprInputBuffer exte
}
-
+
private void skipLine(int start) throws IOException {
boolean eol = false;
int lastRealByte = start;
if (pos - 1 > start) {
lastRealByte = pos - 1;
}
-
+
while (!eol) {
// Read new bytes if needed
@@ -739,8 +732,8 @@ public class InternalAprInputBuffer exte
lastRealByte - start + 1, "ISO-8859-1")));
}
}
-
-
+
+
/**
* Available bytes (note that due to encoding, this may not correspond )
*/
@@ -761,7 +754,7 @@ public class InternalAprInputBuffer exte
/**
* Read some bytes.
*/
- public int doRead(ByteChunk chunk, Request req)
+ public int doRead(ByteChunk chunk, Request req)
throws IOException {
if (lastActiveFilter == -1)
@@ -777,7 +770,7 @@ public class InternalAprInputBuffer exte
/**
* Fill the internal buffer using data from the undelying input stream.
- *
+ *
* @return false if at end of stream
*/
protected boolean fill()
@@ -809,7 +802,7 @@ public class InternalAprInputBuffer exte
} else {
if (buf.length - end < 4500) {
- // In this case, the request header was really large, so we
allocate a
+ // In this case, the request header was really large, so we
allocate a
// brand new one; the old one will get GCed when subsequent
requests
// clear all references
buf = new byte[buf.length];
@@ -848,14 +841,14 @@ public class InternalAprInputBuffer exte
* This class is an input buffer which will read its data from an input
* stream.
*/
- protected class SocketInputBuffer
+ protected class SocketInputBuffer
implements InputBuffer {
/**
* Read bytes into the specified chunk.
*/
- public int doRead(ByteChunk chunk, Request req )
+ public int doRead(ByteChunk chunk, Request req )
throws IOException {
if (pos >= lastValid) {
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java?rev=1767683&r1=1767682&r2=1767683&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
Wed Nov 2 13:59:15 2016
@@ -23,8 +23,7 @@ import java.io.EOFException;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.MimeHeaders;
-import org.apache.tomcat.util.res.StringManager;
-
+import org.apache.tomcat.util.http.parser.HttpParser;
import org.apache.coyote.InputBuffer;
import org.apache.coyote.Request;
import org.apache.juli.logging.Log;
@@ -39,7 +38,7 @@ import org.apache.juli.logging.LogFactor
public class InternalInputBuffer extends AbstractInputBuffer {
private static final Log log =
LogFactory.getLog(InternalInputBuffer.class);
-
+
// -------------------------------------------------------------- Constants
@@ -76,19 +75,8 @@ public class InternalInputBuffer extends
}
- // -------------------------------------------------------------- Variables
-
-
- /**
- * The string manager for this package.
- */
- protected static StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ----------------------------------------------------- Instance Variables
-
/**
* Associated Coyote request.
*/
@@ -201,7 +189,7 @@ public class InternalInputBuffer extends
// FIXME: Check for null ?
- InputFilter[] newFilterLibrary =
+ InputFilter[] newFilterLibrary =
new InputFilter[filterLibrary.length + 1];
for (int i = 0; i < filterLibrary.length; i++) {
newFilterLibrary[i] = filterLibrary[i];
@@ -269,7 +257,7 @@ public class InternalInputBuffer extends
/**
- * Recycle the input buffer. This should be called when closing the
+ * Recycle the input buffer. This should be called when closing the
* connection.
*/
public void recycle() {
@@ -294,7 +282,7 @@ public class InternalInputBuffer extends
/**
* End processing of current HTTP request.
- * Note: All bytes of the current request should have been already
+ * Note: All bytes of the current request should have been already
* consumed. This method only resets all the pointers so that we are ready
* to parse the next HTTP request.
*/
@@ -325,7 +313,7 @@ public class InternalInputBuffer extends
/**
* End request (consumes leftover bytes).
- *
+ *
* @throws IOException an undelying I/O error occured
*/
public void endRequest()
@@ -340,8 +328,8 @@ public class InternalInputBuffer extends
/**
- * Read the request line. This function is meant to be used during the
- * HTTP request header parsing. Do NOT attempt to read the request body
+ * Read the request line. This function is meant to be used during the
+ * HTTP request header parsing. Do NOT attempt to read the request body
* using it.
*
* @throws IOException If an exception occurs during the underlying socket
@@ -395,7 +383,7 @@ public class InternalInputBuffer extends
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
space = true;
request.method().setBytes(buf, start, pos - start);
- } else if (!HTTP_TOKEN_CHAR[buf[pos]]) {
+ } else if (!HttpParser.isToken(buf[pos])) {
throw new
IllegalArgumentException(sm.getString("iib.invalidmethod"));
}
@@ -440,15 +428,17 @@ public class InternalInputBuffer extends
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
space = true;
end = pos;
- } else if ((buf[pos] == Constants.CR)
+ } else if ((buf[pos] == Constants.CR)
|| (buf[pos] == Constants.LF)) {
// HTTP/0.9 style request
eol = true;
space = true;
end = pos;
- } else if ((buf[pos] == Constants.QUESTION)
+ } else if ((buf[pos] == Constants.QUESTION)
&& (questionPos == -1)) {
questionPos = pos;
+ } else if (HttpParser.isNotRequestTarget(buf[pos])) {
+ throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
}
pos++;
@@ -457,7 +447,7 @@ public class InternalInputBuffer extends
request.unparsedURI().setBytes(buf, start, end - start);
if (questionPos >= 0) {
- request.queryString().setBytes(buf, questionPos + 1,
+ request.queryString().setBytes(buf, questionPos + 1,
end - questionPos - 1);
request.requestURI().setBytes(buf, start, questionPos - start);
} else {
@@ -484,7 +474,7 @@ public class InternalInputBuffer extends
//
// Reading the protocol
- // Protocol is always US-ASCII
+ // Protocol is always "HTTP/" DIGIT "." DIGIT
//
while (!eol) {
@@ -501,6 +491,8 @@ public class InternalInputBuffer extends
if (end == 0)
end = pos;
eol = true;
+ } else if (!HttpParser.isHttpProtocol(buf[pos])) {
+ throw new
IllegalArgumentException(sm.getString("iib.invalidHttpProtocol"));
}
pos++;
@@ -533,7 +525,7 @@ public class InternalInputBuffer extends
/**
* Parse an HTTP header.
- *
+ *
* @return false after reading a blank line (which indicates that the
* HTTP header parsing is done
*/
@@ -591,7 +583,7 @@ public class InternalInputBuffer extends
if (buf[pos] == Constants.COLON) {
colon = true;
headerValue = headers.addValue(buf, start, pos - start);
- } else if (!HTTP_TOKEN_CHAR[buf[pos]]) {
+ } else if (!HttpParser.isToken(buf[pos])) {
// If a non-token header is detected, skip the line and
// ignore the header
skipLine(start);
@@ -705,7 +697,7 @@ public class InternalInputBuffer extends
/**
* Read some bytes.
*/
- public int doRead(ByteChunk chunk, Request req)
+ public int doRead(ByteChunk chunk, Request req)
throws IOException {
if (lastActiveFilter == -1)
@@ -724,7 +716,7 @@ public class InternalInputBuffer extends
if (pos - 1 > start) {
lastRealByte = pos - 1;
}
-
+
while (!eol) {
// Read new bytes if needed
@@ -749,10 +741,10 @@ public class InternalInputBuffer extends
}
}
-
+
/**
* Fill the internal buffer using data from the undelying input stream.
- *
+ *
* @return false if at end of stream
*/
protected boolean fill()
@@ -775,7 +767,7 @@ public class InternalInputBuffer extends
} else {
if (buf.length - end < 4500) {
- // In this case, the request header was really large, so we
allocate a
+ // In this case, the request header was really large, so we
allocate a
// brand new one; the old one will get GCed when subsequent
requests
// clear all references
buf = new byte[buf.length];
@@ -802,14 +794,14 @@ public class InternalInputBuffer extends
* This class is an input buffer which will read its data from an input
* stream.
*/
- protected class InputStreamInputBuffer
+ protected class InputStreamInputBuffer
implements InputBuffer {
/**
* Read bytes into the specified chunk.
*/
- public int doRead(ByteChunk chunk, Request req )
+ public int doRead(ByteChunk chunk, Request req )
throws IOException {
if (pos >= lastValid) {
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1767683&r1=1767682&r2=1767683&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Wed Nov 2 13:59:15 2016
@@ -25,9 +25,9 @@ import org.apache.coyote.Request;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.http.parser.HttpParser;
import org.apache.tomcat.util.net.NioChannel;
import org.apache.tomcat.util.net.NioSelectorPool;
-import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.net.NioEndpoint;
/**
@@ -88,7 +88,7 @@ public class InternalNioInputBuffer exte
}
// ----------------------------------------------------------- Constructors
-
+
/**
* Alternate constructor.
@@ -119,19 +119,8 @@ public class InternalNioInputBuffer exte
}
- // -------------------------------------------------------------- Variables
-
-
- /**
- * The string manager for this package.
- */
- protected static StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ----------------------------------------------------- Instance Variables
-
/**
* Associated Coyote request.
*/
@@ -193,12 +182,12 @@ public class InternalNioInputBuffer exte
* Underlying socket.
*/
protected NioChannel socket;
-
+
/**
* Selector pool, for blocking reads and blocking writes
*/
protected NioSelectorPool pool;
-
+
/**
* Underlying input buffer.
@@ -263,7 +252,7 @@ public class InternalNioInputBuffer exte
buf = new byte[bufLength];
}
}
-
+
/**
* Get the underlying socket input stream.
*/
@@ -271,10 +260,10 @@ public class InternalNioInputBuffer exte
return socket;
}
- public void setSelectorPool(NioSelectorPool pool) {
+ public void setSelectorPool(NioSelectorPool pool) {
this.pool = pool;
}
-
+
public NioSelectorPool getSelectorPool() {
return pool;
}
@@ -285,7 +274,7 @@ public class InternalNioInputBuffer exte
*/
public void addFilter(InputFilter filter) {
- InputFilter[] newFilterLibrary =
+ InputFilter[] newFilterLibrary =
new InputFilter[filterLibrary.length + 1];
for (int i = 0; i < filterLibrary.length; i++) {
newFilterLibrary[i] = filterLibrary[i];
@@ -357,7 +346,7 @@ public class InternalNioInputBuffer exte
public boolean isReadable() throws IOException {
return (pos < lastValid) || (nbRead()>0);
}
-
+
/**
* Issues a non blocking read
* @return int
@@ -368,7 +357,7 @@ public class InternalNioInputBuffer exte
}
/**
- * Recycle the input buffer. This should be called when closing the
+ * Recycle the input buffer. This should be called when closing the
* connection.
*/
public void recycle() {
@@ -399,7 +388,7 @@ public class InternalNioInputBuffer exte
/**
* End processing of current HTTP request.
- * Note: All bytes of the current request should have been already
+ * Note: All bytes of the current request should have been already
* consumed. This method only resets all the pointers so that we are ready
* to parse the next HTTP request.
*/
@@ -437,7 +426,7 @@ public class InternalNioInputBuffer exte
/**
* End request (consumes leftover bytes).
- *
+ *
* @throws IOException an undelying I/O error occured
*/
public void endRequest()
@@ -452,14 +441,14 @@ public class InternalNioInputBuffer exte
/**
- * Read the request line. This function is meant to be used during the
- * HTTP request header parsing. Do NOT attempt to read the request body
+ * Read the request line. This function is meant to be used during the
+ * HTTP request header parsing. Do NOT attempt to read the request body
* using it.
*
* @throws IOException If an exception occurs during the underlying socket
* read operations, or if the given buffer is not big enough to accommodate
* the whole line.
- * @return true if data is properly fed; false if no data is available
+ * @return true if data is properly fed; false if no data is available
* immediately and thread should be freed
*/
public boolean parseRequestLine(boolean useAvailableDataOnly)
@@ -473,7 +462,7 @@ public class InternalNioInputBuffer exte
if ( parsingRequestLinePhase == 0 ) {
byte chr = 0;
do {
-
+
// Read new bytes if needed
if (pos >= lastValid) {
if (useAvailableDataOnly) {
@@ -515,7 +504,7 @@ public class InternalNioInputBuffer exte
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
space = true;
request.method().setBytes(buf, parsingRequestLineStart,
pos - parsingRequestLineStart);
- } else if (!HTTP_TOKEN_CHAR[buf[pos]]) {
+ } else if (!HttpParser.isToken(buf[pos])) {
throw new
IllegalArgumentException(sm.getString("iib.invalidmethod"));
}
pos++;
@@ -542,7 +531,7 @@ public class InternalNioInputBuffer exte
}
if (parsingRequestLinePhase == 4) {
// Mark the current buffer position
-
+
int end = 0;
//
// Reading the URI
@@ -557,21 +546,23 @@ public class InternalNioInputBuffer exte
if (buf[pos] == Constants.SP || buf[pos] == Constants.HT) {
space = true;
end = pos;
- } else if ((buf[pos] == Constants.CR)
+ } else if ((buf[pos] == Constants.CR)
|| (buf[pos] == Constants.LF)) {
// HTTP/0.9 style request
parsingRequestLineEol = true;
space = true;
end = pos;
- } else if ((buf[pos] == Constants.QUESTION)
+ } else if ((buf[pos] == Constants.QUESTION)
&& (parsingRequestLineQPos == -1)) {
parsingRequestLineQPos = pos;
+ } else if (HttpParser.isNotRequestTarget(buf[pos])) {
+ throw new
IllegalArgumentException(sm.getString("iib.invalidRequestTarget"));
}
pos++;
}
request.unparsedURI().setBytes(buf, parsingRequestLineStart, end -
parsingRequestLineStart);
if (parsingRequestLineQPos >= 0) {
- request.queryString().setBytes(buf, parsingRequestLineQPos +
1,
+ request.queryString().setBytes(buf, parsingRequestLineQPos + 1,
end - parsingRequestLineQPos -
1);
request.requestURI().setBytes(buf, parsingRequestLineStart,
parsingRequestLineQPos - parsingRequestLineStart);
} else {
@@ -600,10 +591,10 @@ public class InternalNioInputBuffer exte
// Mark the current buffer position
end = 0;
}
- if (parsingRequestLinePhase == 6) {
+ if (parsingRequestLinePhase == 6) {
//
// Reading the protocol
- // Protocol is always US-ASCII
+ // Protocol is always "HTTP/" DIGIT "." DIGIT
//
while (!parsingRequestLineEol) {
// Read new bytes if needed
@@ -611,17 +602,19 @@ public class InternalNioInputBuffer exte
if (!fill(true, false)) //request line parsing
return false;
}
-
+
if (buf[pos] == Constants.CR) {
end = pos;
} else if (buf[pos] == Constants.LF) {
if (end == 0)
end = pos;
parsingRequestLineEol = true;
+ } else if (!HttpParser.isHttpProtocol(buf[pos])) {
+ throw new
IllegalArgumentException(sm.getString("iib.invalidHttpProtocol"));
}
pos++;
}
-
+
if ( (end - parsingRequestLineStart) > 0) {
request.protocol().setBytes(buf, parsingRequestLineStart, end
- parsingRequestLineStart);
} else {
@@ -635,7 +628,7 @@ public class InternalNioInputBuffer exte
}
throw new IllegalStateException("Invalid request line parse
phase:"+parsingRequestLinePhase);
}
-
+
private void expand(int newsize) {
if ( newsize > buf.length ) {
if (parsingHeader) {
@@ -651,7 +644,7 @@ public class InternalNioInputBuffer exte
tmp = null;
}
}
-
+
/**
* Perform blocking read with a timeout if desired
* @param timeout boolean - if we want to use the timeout data
@@ -672,7 +665,7 @@ public class InternalNioInputBuffer exte
nRead =
getSelectorPool().read(socket.getBufHandler().getReadBuffer(),socket,selector,att.getTimeout());
} catch ( EOFException eof ) {
nRead = -1;
- } finally {
+ } finally {
if ( selector != null ) getSelectorPool().put(selector);
}
} else {
@@ -699,7 +692,7 @@ public class InternalNioInputBuffer exte
public boolean parseHeaders()
throws IOException {
HeaderParseStatus status = HeaderParseStatus.HAVE_MORE_HEADERS;
-
+
do {
status = parseHeader();
// Checking that
@@ -728,7 +721,7 @@ public class InternalNioInputBuffer exte
/**
* Parse an HTTP header.
- *
+ *
* @return false after reading a blank line (which indicates that the
* HTTP header parsing is done
*/
@@ -744,7 +737,7 @@ public class InternalNioInputBuffer exte
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) {//parse header
+ if (!fill(true,false)) {//parse header
headerParsePos = HeaderParsePosition.HEADER_START;
return HeaderParseStatus.NEED_MORE_DATA;
}
@@ -769,18 +762,18 @@ public class InternalNioInputBuffer exte
// Mark the current buffer position
headerData.start = pos;
headerParsePos = HeaderParsePosition.HEADER_NAME;
- }
+ }
//
// Reading the header name
// Header name is always US-ASCII
//
-
+
while (headerParsePos == HeaderParsePosition.HEADER_NAME) {
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) { //parse header
+ if (!fill(true,false)) { //parse header
return HeaderParseStatus.NEED_MORE_DATA;
}
}
@@ -795,7 +788,7 @@ public class InternalNioInputBuffer exte
headerData.realPos = pos;
headerData.lastSignificantChar = pos;
break;
- } else if (!HTTP_TOKEN_CHAR[chr]) {
+ } else if (!HttpParser.isToken(chr)) {
// If a non-token header is detected, skip the line and
// ignore the header
headerData.lastSignificantChar = pos;
@@ -827,7 +820,7 @@ public class InternalNioInputBuffer exte
while (true) {
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) {//parse header
+ if (!fill(true,false)) {//parse header
//HEADER_VALUE_START
return HeaderParseStatus.NEED_MORE_DATA;
}
@@ -850,7 +843,7 @@ public class InternalNioInputBuffer exte
// Read new bytes if needed
if (pos >= lastValid) {
- if (!fill(true,false)) {//parse header
+ if (!fill(true,false)) {//parse header
//HEADER_VALUE
return HeaderParseStatus.NEED_MORE_DATA;
}
@@ -883,7 +876,7 @@ public class InternalNioInputBuffer exte
// Read new bytes if needed
if (pos >= lastValid) {
if (!fill(true,false)) {//parse header
-
+
//HEADER_MULTI_LINE
return HeaderParseStatus.NEED_MORE_DATA;
}
@@ -909,7 +902,7 @@ public class InternalNioInputBuffer exte
headerData.recycle();
return HeaderParseStatus.HAVE_MORE_HEADERS;
}
-
+
private HeaderParseStatus skipLine() throws IOException {
headerParsePos = HeaderParsePosition.HEADER_SKIPLINE;
boolean eol = false;
@@ -944,7 +937,7 @@ public class InternalNioInputBuffer exte
headerParsePos = HeaderParsePosition.HEADER_START;
return HeaderParseStatus.HAVE_MORE_HEADERS;
}
-
+
private HeaderParseData headerData = new HeaderParseData();
public static class HeaderParseData {
/**
@@ -1003,7 +996,7 @@ public class InternalNioInputBuffer exte
/**
* Read some bytes.
*/
- public int doRead(ByteChunk chunk, Request req)
+ public int doRead(ByteChunk chunk, Request req)
throws IOException {
if (lastActiveFilter == -1)
@@ -1018,7 +1011,7 @@ public class InternalNioInputBuffer exte
/**
* Fill the internal buffer using data from the undelying input stream.
- *
+ *
* @return false if at end of stream
*/
protected boolean fill(boolean timeout, boolean block)
@@ -1051,14 +1044,14 @@ public class InternalNioInputBuffer exte
* This class is an input buffer which will read its data from an input
* stream.
*/
- protected class SocketInputBuffer
+ protected class SocketInputBuffer
implements InputBuffer {
/**
* Read bytes into the specified chunk.
*/
- public int doRead(ByteChunk chunk, Request req )
+ public int doRead(ByteChunk chunk, Request req )
throws IOException {
if (pos >= lastValid) {
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties?rev=1767683&r1=1767682&r2=1767683&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties
Wed Nov 2 13:59:15 2016
@@ -62,5 +62,7 @@ http11processor.sendfile.error=Error sen
iib.eof.error=Unexpected EOF read on the socket
iib.requestheadertoolarge.error=Request header is too large
+iib.invalidheader=The HTTP header line [{0}] does not conform to RFC 7230 and
has been ignored.
iib.invalidmethod=Invalid character found in method name. HTTP method names
must be tokens
-
+iib.invalidRequestTarget=Invalid character found in the request target. The
valid characters are defined in RFC 7230 and RFC 3986
+iib.invalidHttpProtocol=Invalid character found in the HTTP protocol
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java?rev=1767683&r1=1767682&r2=1767683&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/parser/HttpParser.java
Wed Nov 2 13:59:15 2016
@@ -59,6 +59,8 @@ public class HttpParser {
private static final boolean[] IS_SEPARATOR = new boolean[ARRAY_SIZE];
private static final boolean[] IS_TOKEN = new boolean[ARRAY_SIZE];
private static final boolean[] IS_HEX = new boolean[ARRAY_SIZE];
+ private static final boolean[] IS_NOT_REQUEST_TARGET = new
boolean[ARRAY_SIZE];
+ private static final boolean[] IS_HTTP_PROTOCOL = new boolean[ARRAY_SIZE];
static {
// Digest field types.
@@ -103,6 +105,21 @@ public class HttpParser {
if ((i >= '0' && i <='9') || (i >= 'a' && i <= 'f') || (i >= 'A'
&& i <= 'F')) {
IS_HEX[i] = true;
}
+
+ // Not valid for request target.
+ // Combination of multiple rules from RFC7230 and RFC 3986. Must be
+ // ASCII, no controls plus a few additional characters excluded
+ if (IS_CONTROL[i] || i > 127 ||
+ i == ' ' || i == '\"' || i == '#' || i == '<' || i == '>'
|| i == '\\' ||
+ i == '^' || i == '`' || i == '{' || i == '|' || i == '}')
{
+ IS_NOT_REQUEST_TARGET[i] = true;
+ }
+
+ // Not valid for HTTP protocol
+ // "HTTP/" DIGIT "." DIGIT
+ if (i == 'H' || i == 'T' || i == 'P' || i == '/' || i == '.' || (i
>= '0' && i <= '9')) {
+ IS_HTTP_PROTOCOL[i] = true;
+ }
}
}
@@ -254,6 +271,7 @@ public class HttpParser {
return result.toString();
}
+
public static boolean isToken(int c) {
// Fast for correct values, slower for incorrect ones
try {
@@ -263,8 +281,9 @@ public class HttpParser {
}
}
+
public static boolean isHex(int c) {
- // Fast for correct values, slower for incorrect ones
+ // Fast for correct values, slower for some incorrect ones
try {
return IS_HEX[c];
} catch (ArrayIndexOutOfBoundsException ex) {
@@ -272,6 +291,29 @@ public class HttpParser {
}
}
+
+ public static boolean isNotRequestTarget(int c) {
+ // Fast for valid request target characters, slower for some incorrect
+ // ones
+ try {
+ return IS_NOT_REQUEST_TARGET[c];
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ return true;
+ }
+ }
+
+
+ public static boolean isHttpProtocol(int c) {
+ // Fast for valid HTTP protocol characters, slower for some incorrect
+ // ones
+ try {
+ return IS_HTTP_PROTOCOL[c];
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ return false;
+ }
+ }
+
+
// Skip any LWS and return the next char
private static int skipLws(StringReader input, boolean withReset)
throws IOException {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1767683&r1=1767682&r2=1767683&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Nov 2 13:59:15 2016
@@ -59,6 +59,10 @@
Correct the HTTP header parser so that DEL is not treated as a valid
token character. (markt)
</fix>
+ <add>
+ Add additional checks for valid characters to the HTTP request line
+ parsing so invalid request lines are rejected sooner. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
