archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8255244: HttpClient: Response headers contain incorrectly encoded Unicode characters

Browse source 
Reviewed-by: chegar, michaelm
This commit is contained in:
Daniel Fuchs 2020-11-13 15:10:41 +00:00
parent 56ea7864d4
commit 1c47244b01
6 changed files with 561 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/java.net.http/share/classes/jdk/internal/net/http/Http1HeaderParser.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -26,6 +26,7 @@
package jdk.internal.net.http;
import java.net.ProtocolException;
import java.nio.BufferUnderflowException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
@ -33,6 +34,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.net.http.HttpHeaders;
import jdk.internal.net.http.common.Utils;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
import static jdk.internal.net.http.common.Utils.ACCEPT_ALL;
@ -166,9 +170,30 @@ class Http1HeaderParser {
}
}
/**
* Returns a character (char) corresponding to the next byte in the
* input, interpreted as an ISO-8859-1 encoded character.
* <p>
* The ISO-8859-1 encoding is a 8-bit character coding that
* corresponds to the first 256 Unicode characters - from U+0000 to
* U+00FF. UTF-16 is backward compatible with ISO-8859-1 - which
* means each byte in the input should be interpreted as an unsigned
* value from [0, 255] representing the character code.
*
* @param input a {@code ByteBuffer} containing a partial input
* @return the next byte in the input, interpreted as an ISO-8859-1
* encoded char
* @throws BufferUnderflowException
* if the input buffer's current position is not smaller
* than its limit
*/
private char get(ByteBuffer input) {
return (char)(input.get() & 0xFF);
}
private void readResumeStatusLine(ByteBuffer input) {
char c = 0;
while (input.hasRemaining() && (c =(char)input.get()) != CR) {
while (input.hasRemaining() && (c = get(input)) != CR) {
if (c == LF) break;
sb.append(c);
}
@ -180,7 +205,7 @@ class Http1HeaderParser {
}
private void readStatusLineFeed(ByteBuffer input) throws ProtocolException {
char c = state == State.STATUS_LINE_FOUND_LF ? LF : (char)input.get();
char c = state == State.STATUS_LINE_FOUND_LF ? LF : get(input);
if (c != LF) {
throw protocolException("Bad trailing char, \"%s\", when parsing status line, \"%s\"",
c, sb.toString());
@ -210,7 +235,7 @@ class Http1HeaderParser {
private void maybeStartHeaders(ByteBuffer input) {
assert state == State.STATUS_LINE_END;
assert sb.length() == 0;
char c = (char)input.get();
char c = get(input);
if (c == CR) {
state = State.STATUS_LINE_END_CR;
} else if (c == LF) {
@ -224,7 +249,7 @@ class Http1HeaderParser {
private void maybeEndHeaders(ByteBuffer input) throws ProtocolException {
assert state == State.STATUS_LINE_END_CR || state == State.STATUS_LINE_END_LF;
assert sb.length() == 0;
char c = state == State.STATUS_LINE_END_LF ? LF : (char)input.get();
char c = state == State.STATUS_LINE_END_LF ? LF : get(input);
if (c == LF) {
headers = HttpHeaders.of(privateMap, ACCEPT_ALL);
privateMap = null;
@ -238,7 +263,7 @@ class Http1HeaderParser {
assert state == State.HEADER;
assert input.hasRemaining();
while (input.hasRemaining()) {
char c = (char)input.get();
char c = get(input);
if (c == CR) {
state = State.HEADER_FOUND_CR;
break;
@ -253,15 +278,23 @@ class Http1HeaderParser {
}
}
private void addHeaderFromString(String headerString) {
private void addHeaderFromString(String headerString) throws ProtocolException {
assert sb.length() == 0;
int idx = headerString.indexOf(':');
if (idx == -1)
return;
String name = headerString.substring(0, idx).trim();
if (name.isEmpty())
return;
String value = headerString.substring(idx + 1, headerString.length()).trim();
String name = headerString.substring(0, idx);
// compatibility with HttpURLConnection;
if (name.isEmpty()) return;
if (!Utils.isValidName(name)) {
throw protocolException("Invalid header name \"%s\"", name);
}
String value = headerString.substring(idx + 1).trim();
if (!Utils.isValidValue(value)) {
throw protocolException("Invalid header value \"%s: %s\"", name, value);
}
privateMap.computeIfAbsent(name.toLowerCase(Locale.US),
k -> new ArrayList<>()).add(value);
@ -269,7 +302,7 @@ class Http1HeaderParser {
private void resumeOrLF(ByteBuffer input) {
assert state == State.HEADER_FOUND_CR || state == State.HEADER_FOUND_LF;
char c = state == State.HEADER_FOUND_LF ? LF : (char)input.get();
char c = state == State.HEADER_FOUND_LF ? LF : get(input);
if (c == LF) {
// header value will be flushed by
// resumeOrSecondCR if next line does not
@ -285,9 +318,9 @@ class Http1HeaderParser {
}
}
private void resumeOrSecondCR(ByteBuffer input) {
private void resumeOrSecondCR(ByteBuffer input) throws ProtocolException {
assert state == State.HEADER_FOUND_CR_LF;
char c = (char)input.get();
char c = get(input);
if (c == CR || c == LF) {
if (sb.length() > 0) {
// no continuation line - flush
@ -322,7 +355,7 @@ class Http1HeaderParser {
private void resumeOrEndHeaders(ByteBuffer input) throws ProtocolException {
assert state == State.HEADER_FOUND_CR_LF_CR;
char c = (char)input.get();
char c = get(input);
if (c == LF) {
state = State.FINISHED;
headers = HttpHeaders.of(privateMap, ACCEPT_ALL);

1
src/java.net.http/share/classes/jdk/internal/net/http/Http2Connection.java
View file

@ -801,6 +801,7 @@ class Http2Connection {
try {
decodeHeaders((HeaderFrame) frame, stream.rspHeadersConsumer());
} catch (UncheckedIOException e) {
debug.log("Error decoding headers: " + e.getMessage(), e);
protocolError(ResetFrame.PROTOCOL_ERROR, e.getMessage());
return;
}

2
src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java
View file

@ -400,7 +400,7 @@ public final class Utils {
for (char c : allowedTokenChars) {
tchar[c] = true;
}
for (char c = 0x21; c < 0xFF; c++) {
for (char c = 0x21; c <= 0xFF; c++) {
fieldvchar[c] = true;
}
fieldvchar[0x7F] = false; // a little hole (DEL) in the range

4
test/jdk/java/net/httpclient/HttpServerAdapters.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -196,7 +196,7 @@ public interface HttpServerAdapters {
/**
* A version agnostic adapter class for HTTP Server Exchange.
*/
public static abstract class HttpTestExchange {
public static abstract class HttpTestExchange implements AutoCloseable {
public abstract Version getServerVersion();
public abstract Version getExchangeVersion();
public abstract InputStream getRequestBody();

442
test/jdk/java/net/httpclient/ISO_8859_1_Test.java Normal file
View file

@ -0,0 +1,442 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8252374
* @library /test/lib http2/server
* @build jdk.test.lib.net.SimpleSSLContext HttpServerAdapters
* ReferenceTracker AggregateRequestBodyTest
* @modules java.base/sun.net.www.http
* java.net.http/jdk.internal.net.http.common
* java.net.http/jdk.internal.net.http.frame
* java.net.http/jdk.internal.net.http.hpack
* @run testng/othervm -Djdk.internal.httpclient.debug=true
* -Djdk.httpclient.HttpClient.log=requests,responses,errors
* ISO_8859_1_Test
* @summary Tests that a client is able to receive ISO-8859-1 encoded header values.
*/
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.URI;
import java.net.URL;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpRequest.BodyPublisher;
import java.net.http.HttpRequest.BodyPublishers;
import java.net.http.HttpResponse;
import java.net.http.HttpResponse.BodyHandlers;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.Flow.Subscriber;
import java.util.concurrent.Flow.Subscription;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.LongStream;
import java.util.stream.Stream;
import javax.net.ssl.SSLContext;
import com.sun.net.httpserver.HttpServer;
import com.sun.net.httpserver.HttpsConfigurator;
import com.sun.net.httpserver.HttpsServer;
import jdk.test.lib.net.SimpleSSLContext;
import org.testng.Assert;
import org.testng.ITestContext;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static java.lang.System.out;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.expectThrows;
public class ISO_8859_1_Test implements HttpServerAdapters {
SSLContext sslContext;
DummyServer http1DummyServer;
HttpServerAdapters.HttpTestServer http1TestServer; // HTTP/1.1 ( http )
HttpServerAdapters.HttpTestServer https1TestServer; // HTTPS/1.1 ( https )
HttpServerAdapters.HttpTestServer http2TestServer; // HTTP/2 ( h2c )
HttpServerAdapters.HttpTestServer https2TestServer; // HTTP/2 ( h2 )
String http1Dummy;
String http1URI;
String https1URI;
String http2URI;
String https2URI;
static final int RESPONSE_CODE = 200;
static final int ITERATION_COUNT = 4;
static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
static final Class<CompletionException> CE = CompletionException.class;
// a shared executor helps reduce the amount of threads created by the test
static final Executor executor = new TestExecutor(Executors.newCachedThreadPool());
static final ConcurrentMap<String, Throwable> FAILURES = new ConcurrentHashMap<>();
static volatile boolean tasksFailed;
static final AtomicLong serverCount = new AtomicLong();
static final AtomicLong clientCount = new AtomicLong();
static final long start = System.nanoTime();
public static String now() {
long now = System.nanoTime() - start;
long secs = now / 1000_000_000;
long mill = (now % 1000_000_000) / 1000_000;
long nan = now % 1000_000;
return String.format("[%d s, %d ms, %d ns] ", secs, mill, nan);
}
final ReferenceTracker TRACKER = ReferenceTracker.INSTANCE;
private volatile HttpClient sharedClient;
static class TestExecutor implements Executor {
final AtomicLong tasks = new AtomicLong();
Executor executor;
TestExecutor(Executor executor) {
this.executor = executor;
}
@Override
public void execute(Runnable command) {
long id = tasks.incrementAndGet();
executor.execute(() -> {
try {
command.run();
} catch (Throwable t) {
tasksFailed = true;
System.out.printf(now() + "Task %s failed: %s%n", id, t);
System.err.printf(now() + "Task %s failed: %s%n", id, t);
FAILURES.putIfAbsent("Task " + id, t);
throw t;
}
});
}
}
protected boolean stopAfterFirstFailure() {
return Boolean.getBoolean("jdk.internal.httpclient.debug");
}
@BeforeMethod
void beforeMethod(ITestContext context) {
if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
throw new RuntimeException("some tests failed");
}
}
@AfterClass
static final void printFailedTests() {
out.println("\n=========================");
try {
out.printf("%n%sCreated %d servers and %d clients%n",
now(), serverCount.get(), clientCount.get());
if (FAILURES.isEmpty()) return;
out.println("Failed tests: ");
FAILURES.entrySet().forEach((e) -> {
out.printf("\t%s: %s%n", e.getKey(), e.getValue());
e.getValue().printStackTrace(out);
e.getValue().printStackTrace();
});
if (tasksFailed) {
System.out.println("WARNING: Some tasks failed");
}
} finally {
out.println("\n=========================\n");
}
}
private String[] uris() {
return new String[] {
http1Dummy,
http1URI,
https1URI,
http2URI,
https2URI,
};
}
static AtomicLong URICOUNT = new AtomicLong();
@DataProvider(name = "variants")
public Object[][] variants(ITestContext context) {
if (stopAfterFirstFailure() && context.getFailedTests().size() > 0) {
return new Object[0][];
}
String[] uris = uris();
Object[][] result = new Object[uris.length * 2][];
int i = 0;
for (boolean sameClient : List.of(false, true)) {
for (String uri : uris()) {
result[i++] = new Object[]{uri, sameClient};
}
}
assert i == uris.length * 2;
return result;
}
private HttpClient makeNewClient() {
clientCount.incrementAndGet();
HttpClient client = HttpClient.newBuilder()
.proxy(HttpClient.Builder.NO_PROXY)
.executor(executor)
.sslContext(sslContext)
.build();
return TRACKER.track(client);
}
HttpClient newHttpClient(boolean share) {
if (!share) return makeNewClient();
HttpClient shared = sharedClient;
if (shared != null) return shared;
synchronized (this) {
shared = sharedClient;
if (shared == null) {
shared = sharedClient = makeNewClient();
}
return shared;
}
}
private static final Exception completionCause(CompletionException x) {
Throwable c = x;
while (c instanceof CompletionException
|| c instanceof ExecutionException) {
if (c.getCause() == null) break;
c = c.getCause();
}
if (c instanceof Error) throw (Error)c;
return (Exception)c;
}
@Test(dataProvider = "variants")
public void test(String uri, boolean sameClient) throws Exception {
System.out.println("Request to " + uri);
HttpClient client = newHttpClient(sameClient);
List<CompletableFuture<HttpResponse<String>>> cfs = new ArrayList<>();
for (int i = 0; i < ITERATION_COUNT; i++) {
HttpRequest request = HttpRequest.newBuilder(URI.create(uri + "/" + i))
.build();
cfs.add(client.sendAsync(request, BodyHandlers.ofString()));
}
try {
CompletableFuture.allOf(cfs.toArray(CompletableFuture[]::new)).join();
} catch (CompletionException x) {
throw completionCause(x);
}
for (CompletableFuture<HttpResponse<String>> cf : cfs) {
var response = cf.get();
System.out.println("Got: " + response);
var value = response.headers().firstValue("Header8859").orElse(null);
assertEquals(value, "U\u00ffU");
}
System.out.println("HttpClient: PASSED");
if (uri.contains("http1")) {
System.out.println("Testing with URLConnection");
var url = URI.create(uri).toURL();
var conn = url.openConnection();
conn.connect();
conn.getInputStream().readAllBytes();
var value = conn.getHeaderField("Header8859");
assertEquals(value, "U\u00ffU", "legacy stack failed");
System.out.println("URLConnection: PASSED");
}
System.out.println("test: DONE");
}
static final class DummyServer extends Thread implements AutoCloseable {
String RESP = """
HTTP/1.1 200 OK\r
Content-length: 0\r
Header8859: U\u00ffU\r
Connection: close\r
\r
""";
static final InetSocketAddress LOOPBACK =
new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
final ServerSocket socket;
final CopyOnWriteArrayList<Socket> accepted = new CopyOnWriteArrayList<Socket>();
final CompletableFuture<Void> done = new CompletableFuture();
volatile boolean closed;
DummyServer() throws IOException {
socket = new ServerSocket();
socket.bind(LOOPBACK);
}
public String serverAuthority() {
String address = socket.getInetAddress().getHostAddress();
if (address.indexOf(':') >= 0) {
address = "[" + address + "]";
}
return address + ":" + socket.getLocalPort();
}
public void run() {
try {
while (!socket.isClosed()) {
try (Socket client = socket.accept()) {
accepted.add(client);
try {
System.out.println("Accepted: " + client);
String req = "";
BufferedReader reader = new BufferedReader(
new InputStreamReader(client.getInputStream(),
StandardCharsets.ISO_8859_1));
String line = null;
while (!(line = reader.readLine()).isEmpty()) {
System.out.println("Got line: " + line);
req = req + line + "\r\n";
}
System.out.println(req);
System.out.println("Sending back " + RESP);
client.getOutputStream().write(RESP.getBytes(StandardCharsets.ISO_8859_1));
client.getOutputStream().flush();
} finally {
accepted.remove(client);
}
}
}
} catch (Throwable t) {
if (closed) {
done.complete(null);
} else {
done.completeExceptionally(t);
}
} finally {
done.complete(null);
}
}
final void close(AutoCloseable toclose) {
try { toclose.close(); } catch (Exception x) {};
}
final public void close() {
closed = true;
close(socket);
accepted.forEach(this::close);
}
}
final static class ISO88591Handler implements HttpServerAdapters.HttpTestHandler {
@Override
public void handle(HttpTestExchange t) throws IOException {
try (HttpTestExchange e = t) {
t.getRequestBody().readAllBytes();
t.getResponseHeaders().addHeader("Header8859", "U\u00ffU");
t.sendResponseHeaders(200, 0);
}
}
}
@BeforeTest
public void setup() throws Exception {
sslContext = new SimpleSSLContext().get();
if (sslContext == null)
throw new AssertionError("Unexpected null sslContext");
HttpServerAdapters.HttpTestHandler handler = new ISO88591Handler();
InetSocketAddress loopback = new InetSocketAddress(InetAddress.getLoopbackAddress(), 0);
http1DummyServer = new DummyServer();
http1Dummy = "http://" + http1DummyServer.serverAuthority() +"/http1/dummy/x";
HttpServer http1 = HttpServer.create(loopback, 0);
http1TestServer = HttpServerAdapters.HttpTestServer.of(http1);
http1TestServer.addHandler(handler, "/http1/server/");
http1URI = "http://" + http1TestServer.serverAuthority() + "/http1/server/x";
HttpsServer https1 = HttpsServer.create(loopback, 0);
https1.setHttpsConfigurator(new HttpsConfigurator(sslContext));
https1TestServer = HttpServerAdapters.HttpTestServer.of(https1);
https1TestServer.addHandler(handler, "/https1/server/");
https1URI = "https://" + https1TestServer.serverAuthority() + "/https1/server/x";
// HTTP/2
http2TestServer = HttpServerAdapters.HttpTestServer.of(new Http2TestServer("localhost", false, 0));
http2TestServer.addHandler(handler, "/http2/server/");
http2URI = "http://" + http2TestServer.serverAuthority() + "/http2/server/x";
https2TestServer = HttpServerAdapters.HttpTestServer.of(new Http2TestServer("localhost", true, sslContext));
https2TestServer.addHandler(handler, "/https2/server/");
https2URI = "https://" + https2TestServer.serverAuthority() + "/https2/server/x";
serverCount.addAndGet(5);
http1TestServer.start();
https1TestServer.start();
http2TestServer.start();
https2TestServer.start();
http1DummyServer.start();
}
@AfterTest
public void teardown() throws Exception {
String sharedClientName =
sharedClient == null ? null : sharedClient.toString();
sharedClient = null;
Thread.sleep(100);
AssertionError fail = TRACKER.check(500);
try {
http1TestServer.stop();
https1TestServer.stop();
http2TestServer.stop();
https2TestServer.stop();
http1DummyServer.close();
} finally {
if (fail != null) {
if (sharedClientName != null) {
System.err.println("Shared client name is: " + sharedClientName);
}
throw fail;
}
}
}
}

75
test/jdk/java/net/httpclient/whitebox/java.net.http/jdk/internal/net/http/Http1HeaderParserTest.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,6 +40,7 @@ import org.testng.annotations.Test;
import org.testng.annotations.DataProvider;
import static java.lang.System.out;
import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static java.util.stream.Collectors.toList;
import static org.testng.Assert.*;
@ -69,6 +70,12 @@ public class Http1HeaderParserTest {
"Content-Type: text/html; charset=UTF-8\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
"X-Header: U\u00ffU\r\n" + // value with U+00FF - Extended Latin-1
"Content-Length: 9\r\n" +
"Content-Type: text/html; charset=UTF-8\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
"Content-Length: 9\r\n" +
"Content-Type: text/html; charset=UTF-8\r\n\r\n" + // more than one SP after ':'
@ -222,13 +229,19 @@ public class Http1HeaderParserTest {
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
": no header\r\n\r\n" + // no/empty header-name, followed by header
"X-foo: bar\r\n" +
" : no header\r\n" + // fold, not a blank header-name
"Content-Length: 65\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
"Conte\r" +
" nt-Length: 9\r\n" + // fold/bad header name ???
"Content-Type: text/html; charset=UTF-8\r\n\r\n" +
"X-foo: bar\r\n" +
" \t : no header\r\n" + // fold, not a blank header-name
"Content-Length: 65\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
": no header\r\n\r\n" + // no/empty header-name, followed by header
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
@ -310,7 +323,7 @@ public class Http1HeaderParserTest {
.replace("\r", "<CR>")
.replace("\n","<LF>")
.replace("LF>", "LF>\n\t"));
byte[] bytes = respString.getBytes(US_ASCII);
byte[] bytes = respString.getBytes(ISO_8859_1);
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
MessageHeader m = new MessageHeader(bais);
Map<String,List<String>> messageHeaderMap = m.getHeaders();
@ -326,7 +339,7 @@ public class Http1HeaderParserTest {
String statusLine1 = messageHeaderMap.get(null).get(0);
String statusLine2 = decoder.statusLine();
if (statusLine1.startsWith("HTTP")) {// skip the case where MH's messes up the status-line
assertEquals(statusLine1, statusLine2, "Status-line not equal");
assertEquals(statusLine2, statusLine1, "Status-line not equal");
} else {
assertTrue(statusLine2.startsWith("HTTP/1."), "Status-line not HTTP/1.");
}
@ -384,7 +397,53 @@ public class Http1HeaderParserTest {
"HTTP/1.1 -22\r\n",
"HTTP/1.1 -20 \r\n"
"HTTP/1.1 -20 \r\n",
"HTTP/1.1 200 OK\r\n" +
"X-fo\u00ffo: foo\r\n" + // invalid char in name
"Content-Length: 5\r\n" +
"Content-Type: text/html; charset=UTF-8\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
"HTTP/1.1 200 OK\r\n" +
"X-foo : bar\r\n" + // trim space after name
"Content-Length: 5\r\n" +
"Content-Type: text/html; charset=UTF-8\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
" X-foo: bar\r\n" + // trim space before name
"Content-Length: 5\r\n" +
"Content-Type: text/html; charset=UTF-8\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
"X foo: bar\r\n" + // invalid space in name
"Content-Length: 5\r\n" +
"Content-Type: text/html; charset=UTF-8\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
"Content-Length: 5\r\n" +
"Content Type: text/html; charset=UTF-8\r\n\r\n" + // invalid space in name
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
"Conte\r" +
" nt-Length: 9\r\n" + // fold results in space in header name
"Content-Type: text/html; charset=UTF-8\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
" : no header\r\n" + // all blank header-name (not fold)
"Content-Length: 65\r\n\r\n" +
"XXXXX",
"HTTP/1.1 200 OK\r\n" +
" \t : no header\r\n" + // all blank header-name (not fold)
"Content-Length: 65\r\n\r\n" +
"XXXXX",
};
Arrays.stream(bad).forEach(responses::add);