Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support missing Content-Length header #5673

Merged
merged 1 commit into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ public ClientResponse apply(final ClientRequest clientRequest) throws Processing
final HttpEntity entity = response.getEntity();

if (entity != null) {
if (headers.get(HttpHeaders.CONTENT_LENGTH) == null) {
if (headers.get(HttpHeaders.CONTENT_LENGTH) == null && entity.getContentLength() >= 0) {
headers.add(HttpHeaders.CONTENT_LENGTH, String.valueOf(entity.getContentLength()));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,15 @@ private void decideTransferEncoding() throws ParseException {
}

return;
} else if (httpResponse.getHasContent()) {
// missing Content-Length
transferEncodingParser = TransferEncodingParser
.createFixedLengthParser(httpResponse.getBodyStream(), Long.MAX_VALUE);
return;
}



// TODO what now? Expect no content or fail loudly?
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ boolean parse(ByteBuffer input) throws ParseException {
responseBody.notifyDataAvailable(parsed);
consumedLength += data.length;

return consumedLength == expectedLength;
return consumedLength == expectedLength || expectedLength == Long.MAX_VALUE /* unknown at the beginning */;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ public void channelInactive(ChannelHandlerContext ctx) {

if (readTimedOut) {
responseDone.completeExceptionally(new TimeoutException("Stream closed: read timeout"));
} else if (jerseyRequest.isCancelled()) {
responseDone.completeExceptionally(new CancellationException());
} else {
responseDone.completeExceptionally(new IOException("Stream closed"));
}
Expand Down Expand Up @@ -186,21 +188,10 @@ public String getReasonPhrase() {
}

// request entity handling.
if ((response.headers().contains(HttpHeaders.CONTENT_LENGTH) && HttpUtil.getContentLength(response) > 0)
|| HttpUtil.isTransferEncodingChunked(response)) {

nis = new NettyInputStream();
responseDone.whenComplete((_r, th) -> nis.complete(th));

jerseyResponse.setEntityStream(nis);
} else {
jerseyResponse.setEntityStream(new InputStream() {
@Override
public int read() throws IOException {
return -1;
}
});
}
nis = new NettyInputStream();
responseDone.whenComplete((_r, th) -> nis.complete(th));

jerseyResponse.setEntityStream(nis);
}
if (msg instanceof HttpContent) {

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
/*
* Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the
* Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
* version 2 with the GNU Classpath Exception, which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

package org.glassfish.jersey.tests.e2e.client.connector;

import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
import org.glassfish.jersey.apache5.connector.Apache5ConnectorProvider;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
import org.glassfish.jersey.client.spi.ConnectorProvider;
import org.glassfish.jersey.grizzly.connector.GrizzlyConnectorProvider;
import org.glassfish.jersey.jdk.connector.JdkConnectorProvider;
import org.glassfish.jersey.jetty.connector.JettyConnectorProvider;
import org.glassfish.jersey.netty.connector.NettyConnectorProvider;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.UncheckedIOException;
import java.net.ServerSocket;
import java.net.Socket;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

public class NoContentLengthTest {

private static final String MSG = "12345678901234567890123456789012345678901234567890";

private static int port;
private static AtomicBoolean running = new AtomicBoolean(false);

@BeforeEach
void beforeEach() {
while (!running.compareAndSet(false, true)) {
try {
Thread.sleep(1000L);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
Runnable runnable = new Runnable() {
@Override
public void run() {
try {
String _port = System.getProperty("jersey.config.test.container.port");
port = Integer.parseInt(_port == null || _port.isEmpty() ? "8080" : _port);
ServerSocket serverSocket = new ServerSocket(port);
System.err.println("Starting server on port : " + port);

Socket clientSocket = serverSocket.accept();

BufferedReader in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
BufferedWriter out = new BufferedWriter(new OutputStreamWriter(clientSocket.getOutputStream()));

String s;
while ((s = in.readLine()) != null) {
// System.out.println(s);
if (s.isEmpty()) {
break;
}
}

out.write("HTTP/1.0 200 OK\r\n");
out.write("Content-Type: text/plain\r\n");
out.write("\r\n");
out.write(MSG);

out.close();
in.close();
clientSocket.close();
serverSocket.close();
} catch (IOException e) {
throw new UncheckedIOException(e);
} finally {
running.set(false);
}
}
};
Thread newThread = new Thread(runnable);
newThread.start();
}

public static List<ConnectorProvider> providers() {
return Arrays.asList(
new ApacheConnectorProvider(),
new Apache5ConnectorProvider(),
new HttpUrlConnectorProvider(),
new NettyConnectorProvider(),
new JettyConnectorProvider(),
new GrizzlyConnectorProvider(),
new JdkConnectorProvider()
);
}

@ParameterizedTest
@MethodSource("providers")
public void testNoContentLength(ConnectorProvider connectorProvider) {
try (Response r = target(connectorProvider).request().get()) {
MatcherAssert.assertThat(r.getStatus(), Matchers.is(200));
MatcherAssert.assertThat(r.getHeaderString(HttpHeaders.CONTENT_LENGTH), Matchers.nullValue());
MatcherAssert.assertThat(r.hasEntity(), Matchers.is(true));
MatcherAssert.assertThat(r.readEntity(String.class), Matchers.is(MSG));
}
}

private WebTarget target(ConnectorProvider connectorProvider) {
ClientConfig config = new ClientConfig();
config.connectorProvider(connectorProvider);
return ClientBuilder.newClient(config).target("http://localhost:" + port);
}
}