Author: markt
Date: Wed Oct 19 14:07:44 2016
New Revision: 1765602
URL: http://svn.apache.org/viewvc?rev=1765602&view=rev
Log:
Add checks around the handling of HTTP/2 pseudo headers.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HeaderSink.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HpackDecoder.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Parser.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHpack.java
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 14:07:44 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765447,1765495,1765569-1765571,1765579
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-176332
0,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765447,1765495,1765502,1765569-1765571,1765579
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HeaderSink.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HeaderSink.java?rev=1765602&r1=1765601&r2=1765602&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HeaderSink.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HeaderSink.java Wed Oct
19 14:07:44 2016
@@ -26,7 +26,12 @@ import org.apache.coyote.http2.HpackDeco
public class HeaderSink implements HeaderEmitter {
@Override
- public void emitHeader(String name, String value, boolean neverIndex) {
+ public void emitHeader(String name, String value) {
+ // NO-OP
+ }
+
+ @Override
+ public void validateHeaders() throws StreamException {
// NO-OP
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HpackDecoder.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HpackDecoder.java?rev=1765602&r1=1765601&r2=1765602&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HpackDecoder.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/HpackDecoder.java Wed Oct
19 14:07:44 2016
@@ -109,7 +109,7 @@ public class HpackDecoder {
buffer.position(originalPos);
return;
}
- headerEmitter.emitHeader(headerName, headerValue, false);
+ headerEmitter.emitHeader(headerName, headerValue);
addEntryToHeaderTable(new Hpack.HeaderField(headerName,
headerValue));
} else if ((b & 0b11110000) == 0) {
//Literal Header Field without Indexing
@@ -123,7 +123,7 @@ public class HpackDecoder {
buffer.position(originalPos);
return;
}
- headerEmitter.emitHeader(headerName, headerValue, false);
+ headerEmitter.emitHeader(headerName, headerValue);
} else if ((b & 0b11110000) == 0b00010000) {
//Literal Header Field never indexed
String headerName = readHeaderName(buffer, 4);
@@ -136,7 +136,7 @@ public class HpackDecoder {
buffer.position(originalPos);
return;
}
- headerEmitter.emitHeader(headerName, headerValue, true);
+ headerEmitter.emitHeader(headerName, headerValue);
} else if ((b & 0b11100000) == 0b00100000) {
//context update max table size change
if (!handleMaxMemorySizeChange(buffer, originalPos)) {
@@ -246,7 +246,7 @@ public class HpackDecoder {
} else {
int adjustedIndex = getRealIndex(index -
Hpack.STATIC_TABLE_LENGTH);
Hpack.HeaderField headerField = headerTable[adjustedIndex];
- headerEmitter.emitHeader(headerField.name, headerField.value,
false);
+ headerEmitter.emitHeader(headerField.name, headerField.value);
}
}
@@ -273,7 +273,7 @@ public class HpackDecoder {
if (entry.value == null) {
throw new HpackException();
}
- headerEmitter.emitHeader(entry.name, entry.value, false);
+ headerEmitter.emitHeader(entry.name, entry.value);
}
private void addEntryToHeaderTable(Hpack.HeaderField entry) {
@@ -324,10 +324,29 @@ public class HpackDecoder {
/**
- * Interface that can be used to immediately validate headers (ex:
uppercase detection).
+ * Interface implemented by the intended recipient of the headers.
*/
- public interface HeaderEmitter {
- void emitHeader(String name, String value, boolean neverIndex);
+ interface HeaderEmitter {
+ /**
+ * Pass a single header to the recipient.
+ *
+ * @param name Header name
+ * @param value Header value
+ */
+ void emitHeader(String name, String value);
+
+ /**
+ * Are the headers pass to the recipient so far valid? The decoder
needs
+ * to process all the headers to maintain state even if there is a
+ * problem. In addition, it is easy for the the intended recipient to
+ * track if the complete set of headers is valid since to do that state
+ * needs to be maintained between the parsing of the initial headers
and
+ * the parsing of any trailer headers. The recipient is the best place
+ * to maintain that state.
+ *
+ * @throws StreamException If the headers received to date are not
valid
+ */
+ void validateHeaders() throws StreamException;
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Parser.java?rev=1765602&r1=1765601&r2=1765602&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Parser.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Parser.java Wed Oct
19 14:07:44 2016
@@ -397,6 +397,8 @@ class Http2Parser {
headerReadBuffer.compact();
payloadSize -= toRead;
}
+
+ hpackDecoder.getHeaderEmitter().validateHeaders();
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1765602&r1=1765601&r2=1765602&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Wed Oct 19 14:07:44 2016
@@ -68,6 +68,8 @@ pingManager.roundTripTime=Connection [{0
stream.closed=Connection [{0}], Stream [{1}], Unable to write to stream once
it has been closed
stream.header.debug=Connection [{0}], Stream [{1}], HTTP header [{2}], Value
[{3}]
+stream.header.unexpectedPseudoHeader=Connection [{0}], Stream [{1}], Pseduo
header [{2}] received after a regular header
+stream.header.unknownPseudoHeader=Connection [{0}], Stream [{1}], Unknown
pseduo header [{2}] received
stream.notWritable=Connection [{0}], Stream [{1}], This stream is not writable
stream.reprioritisation.debug=Connection [{0}], Stream [{1}], Exclusive [{2}],
Parent [{3}], Weight [{4}]
stream.reset.debug=Connection [{0}], Stream [{1}], Reset due to [{2}]
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java?rev=1765602&r1=1765601&r2=1765602&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Stream.java Wed Oct 19
14:07:44 2016
@@ -39,6 +39,11 @@ public class Stream extends AbstractStre
private static final Log log = LogFactory.getLog(Stream.class);
private static final StringManager sm =
StringManager.getManager(Stream.class);
+ private static final int HEADER_STATE_START = 0;
+ private static final int HEADER_STATE_PSEUDO = 1;
+ private static final int HEADER_STATE_REGULAR = 2;
+ private static final int HEADER_STATE_TRAILER = 3;
+
private static final Response ACK_RESPONSE = new Response();
static {
@@ -49,6 +54,9 @@ public class Stream extends AbstractStre
private final Http2UpgradeHandler handler;
private final StreamStateMachine state;
+ // State machine would be too much overhead
+ private int headerState = HEADER_STATE_START;
+ private String headerStateErrorMsg = null;
// TODO: null these when finished to reduce memory used by closed stream
private final Request coyoteRequest;
private StringBuilder cookieHeader = null;
@@ -202,12 +210,31 @@ public class Stream extends AbstractStre
@Override
- public void emitHeader(String name, String value, boolean neverIndex) {
+ public void emitHeader(String name, String value) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("stream.header.debug", getConnectionId(),
getIdentifier(),
name, value));
}
+ if (headerStateErrorMsg != null) {
+ // Don't bother processing the header since the stream is going to
+ // be reset anyway
+ return;
+ }
+
+ boolean pseudoHeader = name.charAt(0) == ':';
+
+ if (pseudoHeader && headerState != HEADER_STATE_PSEUDO) {
+ headerStateErrorMsg =
sm.getString("stream.header.unexpectedPseudoHeader",
+ getConnectionId(), getIdentifier(), name);
+ // No need for further processing. The stream will be reset.
+ return;
+ }
+
+ if (headerState == HEADER_STATE_PSEUDO && !pseudoHeader) {
+ headerState = HEADER_STATE_REGULAR;
+ }
+
switch(name) {
case ":method": {
coyoteRequest.method().setString(value);
@@ -256,6 +283,10 @@ public class Stream extends AbstractStre
if ("expect".equals(name) && "100-continue".equals(value)) {
coyoteRequest.setExpectation(true);
}
+ if (pseudoHeader) {
+ headerStateErrorMsg =
sm.getString("stream.header.unknownPseudoHeader",
+ getConnectionId(), getIdentifier(), name);
+ }
// Assume other HTTP header
coyoteRequest.getMimeHeaders().addValue(name).setString(value);
}
@@ -263,6 +294,17 @@ public class Stream extends AbstractStre
}
+ @Override
+ public void validateHeaders() throws StreamException {
+ if (headerStateErrorMsg == null) {
+ return;
+ }
+
+ throw new StreamException(headerStateErrorMsg,
Http2Error.PROTOCOL_ERROR,
+ getIdentifier().intValue());
+ }
+
+
final void receivedEndOfHeaders() {
// Cookie headers need to be concatenated into a single header
// See RFC 7540 8.1.2.5
@@ -321,6 +363,13 @@ public class Stream extends AbstractStre
void receivedStartOfHeaders() {
+ if (headerState == HEADER_STATE_START) {
+ headerState = HEADER_STATE_PSEUDO;
+ } else if (headerState == HEADER_STATE_PSEUDO || headerState ==
HEADER_STATE_REGULAR) {
+ headerState = HEADER_STATE_TRAILER;
+ }
+ // Parser will catch attempt to send a headers frame after the stream
+ // has closed.
state.receivedStartOfHeaders();
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java?rev=1765602&r1=1765601&r2=1765602&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/Http2TestBase.java Wed
Oct 19 14:07:44 2016
@@ -24,6 +24,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Locale;
import javax.net.SocketFactory;
@@ -170,14 +172,25 @@ public abstract class Http2TestBase exte
protected void buildGetRequest(byte[] frameHeader, ByteBuffer
headersPayload, byte[] padding,
int streamId, String url) {
+ List<Header> headers = new ArrayList<>(3);
+ headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":path", url));
+ headers.add(new Header(":authority", "localhost:" + getPort()));
+
+ buildGetRequest(frameHeader, headersPayload, padding, headers,
streamId);
+ }
+
+
+ protected void buildGetRequest(byte[] frameHeader, ByteBuffer
headersPayload, byte[] padding,
+ List<Header> headers, int streamId) {
if (padding != null) {
headersPayload.put((byte) (0xFF & padding.length));
}
- MimeHeaders headers = new MimeHeaders();
- headers.addValue(":method").setString("GET");
- headers.addValue(":path").setString(url);
- headers.addValue(":authority").setString("localhost:" + getPort());
- hpackEncoder.encode(headers, headersPayload);
+ MimeHeaders mimeHeaders = new MimeHeaders();
+ for (Header header : headers) {
+
mimeHeaders.addValue(header.getName()).setString(header.getValue());
+ }
+ hpackEncoder.encode(mimeHeaders, headersPayload);
if (padding != null) {
headersPayload.put(padding);
}
@@ -197,10 +210,21 @@ public abstract class Http2TestBase exte
protected void buildSimpleGetRequestPart1(byte[] frameHeader, ByteBuffer
headersPayload,
int streamId) {
- MimeHeaders headers = new MimeHeaders();
- headers.addValue(":method").setString("GET");
- headers.addValue(":path").setString("/simple");
- hpackEncoder.encode(headers, headersPayload);
+ List<Header> headers = new ArrayList<>(3);
+ headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":path", "/simple"));
+
+ buildSimpleGetRequestPart1(frameHeader, headersPayload, headers,
streamId);
+ }
+
+
+ protected void buildSimpleGetRequestPart1(byte[] frameHeader, ByteBuffer
headersPayload,
+ List<Header> headers, int streamId) {
+ MimeHeaders mimeHeaders = new MimeHeaders();
+ for (Header header : headers) {
+
mimeHeaders.addValue(header.getName()).setString(header.getValue());
+ }
+ hpackEncoder.encode(mimeHeaders, headersPayload);
headersPayload.flip();
@@ -215,9 +239,20 @@ public abstract class Http2TestBase exte
protected void buildSimpleGetRequestPart2(byte[] frameHeader, ByteBuffer
headersPayload,
int streamId) {
- MimeHeaders headers = new MimeHeaders();
- headers.addValue(":authority").setString("localhost:" + getPort());
- hpackEncoder.encode(headers, headersPayload);
+ List<Header> headers = new ArrayList<>(3);
+ headers.add(new Header(":authority", "localhost:" + getPort()));
+
+ buildSimpleGetRequestPart2(frameHeader, headersPayload, headers,
streamId);
+ }
+
+
+ protected void buildSimpleGetRequestPart2(byte[] frameHeader, ByteBuffer
headersPayload,
+ List<Header> headers, int streamId) {
+ MimeHeaders mimeHeaders = new MimeHeaders();
+ for (Header header : headers) {
+
mimeHeaders.addValue(header.getName()).setString(header.getValue());
+ }
+ hpackEncoder.encode(mimeHeaders, headersPayload);
headersPayload.flip();
@@ -856,7 +891,7 @@ public abstract class Http2TestBase exte
@Override
- public void emitHeader(String name, String value, boolean neverIndex) {
+ public void emitHeader(String name, String value) {
// Date headers will always change so use a hard-coded default
if ("date".equals(name)) {
value = DEFAULT_DATE;
@@ -866,6 +901,12 @@ public abstract class Http2TestBase exte
@Override
+ public void validateHeaders() {
+ // NO-OP: Accept anything the server sends for the unit tests
+ }
+
+
+ @Override
public void headersEnd(int streamId) {
trace.append(streamId + "-HeadersEnd\n");
}
@@ -1080,4 +1121,23 @@ public abstract class Http2TestBase exte
return value;
}
}
+
+
+ static class Header {
+ private final String name;
+ private final String value;
+
+ public Header(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+ }
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHpack.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHpack.java?rev=1765602&r1=1765601&r2=1765602&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHpack.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHpack.java Wed Oct 19
14:07:44 2016
@@ -76,9 +76,13 @@ public class TestHpack {
this.headers = headers;
}
@Override
- public void emitHeader(String name, String value, boolean neverIndex) {
+ public void emitHeader(String name, String value) {
headers.setValue(name).setString(value);
}
+ @Override
+ public void validateHeaders() throws StreamException {
+ // NO-OP
+ }
}
// TODO: Write more complete tests
Modified:
tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java?rev=1765602&r1=1765601&r2=1765602&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/coyote/http2/TestHttp2Section_8_1.java
Wed Oct 19 14:07:44 2016
@@ -17,6 +17,8 @@
package org.apache.coyote.http2;
import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
import org.junit.Assert;
import org.junit.Test;
@@ -71,6 +73,80 @@ public class TestHttp2Section_8_1 extend
"3-Body-256\n" +
"3-EndOfStream\n",
output.getTrace());
+ }
+
+
+ @Test
+ public void testUndefinedPseudoHeader() throws Exception {
+ List<Header> headers = new ArrayList<>(3);
+ headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":path", "/simple"));
+ headers.add(new Header(":authority", "localhost:" + getPort()));
+ headers.add(new Header(":foo", "bar"));
+
+ doInvalidPseudoHeaderTest(headers);
+ }
+
+
+ @Test
+ public void testInvalidPseudoHeader() throws Exception {
+ List<Header> headers = new ArrayList<>(3);
+ headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":path", "/simple"));
+ headers.add(new Header(":authority", "localhost:" + getPort()));
+ headers.add(new Header(":status", "200"));
+
+ doInvalidPseudoHeaderTest(headers);
+ }
+
+
+ @Test
+ public void testPseudoHeaderOrder() throws Exception {
+ // Need to do this in two frames because HPACK encoder automatically
+ // re-orders fields
+
+ http2Connect();
+
+ List<Header> headers = new ArrayList<>(3);
+ headers.add(new Header(":method", "GET"));
+ headers.add(new Header(":path", "/simple"));
+ headers.add(new Header("x-test", "test"));
+
+ byte[] headersFrameHeader = new byte[9];
+ ByteBuffer headersPayload = ByteBuffer.allocate(128);
+
+ buildSimpleGetRequestPart1(headersFrameHeader, headersPayload, headers
, 3);
+
+ writeFrame(headersFrameHeader, headersPayload);
+
+ headers.clear();
+ headers.add(new Header(":authority", "localhost:" + getPort()));
+ headersPayload.clear();
+
+ buildSimpleGetRequestPart2(headersFrameHeader, headersPayload, headers
, 3);
+
+ writeFrame(headersFrameHeader, headersPayload);
+
+
+ parser.readFrame(true);
+
+ Assert.assertEquals("3-RST-[1]\n", output.getTrace());
+ }
+
+
+ private void doInvalidPseudoHeaderTest(List<Header> headers) throws
Exception {
+ http2Connect();
+
+ byte[] headersFrameHeader = new byte[9];
+ ByteBuffer headersPayload = ByteBuffer.allocate(128);
+
+ buildGetRequest(headersFrameHeader, headersPayload, null, headers , 3);
+
+ // Write the headers
+ writeFrame(headersFrameHeader, headersPayload);
+
+ parser.readFrame(true);
+ Assert.assertEquals("3-RST-[1]\n", output.getTrace());
}
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1765602&r1=1765601&r2=1765602&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Oct 19 14:07:44 2016
@@ -98,6 +98,9 @@
Correct the HTTP header parser so that DEL is not treated as a valid
token character. (markt)
</fix>
+ <add>
+ Add checks around the handling of HTTP/2 pseudo headers. (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
