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.

Sign up for GitHub

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

Fix 100 continues persistence #12548

Merged
merged 6 commits into from
Nov 20, 2024
Merged

Fix 100 continues persistence #12548

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33397fa
Fix 100 Continue issues
gregw Nov 19, 2024
e5e7864
Fix 100 Continue issues
gregw Nov 19, 2024
f83d187
Merge remote-tracking branch 'origin/jetty-12.1.x' into fix/9206/100C…
gregw Nov 19, 2024
b9779bc
fix checkstyle
olamy Nov 20, 2024
d3b6521
Improve module deprecation (#12547)
gregw Nov 19, 2024
e3756f7
checkstyle
olamy Nov 20, 2024
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
2 changes: 2 additions & 0 deletions jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,9 @@ else if (status == HttpStatus.NO_CONTENT_204 || status == HttpStatus.NOT_MODIFIE

case COMPLETING_1XX:
{
Boolean persistent = _persistent;
reset();
_persistent = persistent;
return Result.DONE;
}

Expand Down
143 changes: 103 additions & 40 deletions ...ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/rfcs/RFC2616BaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
package org.eclipse.jetty.ee10.test.rfcs;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.Calendar;
Expand Down Expand Up @@ -46,7 +49,9 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down Expand Up @@ -665,7 +670,6 @@ public void test81() throws Exception
*
* @see <a href="http://tools.ietf.org/html/rfc2616#section-8.2">RFC 2616 (section 8.2)</a>
*/
@Disabled //TODO https://github.com/jetty/jetty.project/issues/9206
@Test
public void test82ExpectInvalid() throws Exception
{
Expand All @@ -690,7 +694,6 @@ public void test82ExpectInvalid() throws Exception
*
* @see <a href="http://tools.ietf.org/html/rfc2616#section-8.2">RFC 2616 (section 8.2)</a>
*/
@Disabled //TODO https://github.com/jetty/jetty.project/issues/9206
@Test
public void test82ExpectWithBody() throws Exception
{
Expand Down Expand Up @@ -719,49 +722,83 @@ public void test82ExpectWithBody() throws Exception
* @throws Exception failure
* @see <a href="http://tools.ietf.org/html/rfc2616#section-8.2">RFC 2616 (section 8.2)</a>
*/
@Disabled //TODO https://github.com/jetty/jetty.project/issues/9206
@Test
public void test82UnexpectWithBody() throws Exception
{
// Expect with body

StringBuffer req3 = new StringBuffer();
req3.append("GET /redirect/R1 HTTP/1.1\n");
req3.append("Host: localhost\n");
req3.append("Expect: 100-continue\n"); // Valid Expect header.
req3.append("Content-Type: text/plain\n");
req3.append("Content-Length: 8\n");
req3.append("\n");
req3.append("123456\r\n");
req3.append("GET /echo/R1 HTTP/1.1\n");
req3.append("Host: localhost\n");
req3.append("Content-Type: text/plain\n");
req3.append("Content-Length: 8\n");
req3.append("Connection: close\n");
req3.append("\n");
req3.append("87654321"); // Body
String request1 = """
GET /redirect/R1 HTTP/1.1\r
Host: localhost\r
Expect: 100-continue\r
Content-Type: text/plain\r
Content-Length: 8\r
\r
""";

String bodyAndRequest2 = """
123456\r
GET /echo/R1 HTTP/1.1\r
Host: localhost\r
Content-Type: text/plain\r
Content-Length: 8\r
Connection: close\r
\r
87654321
""";

try(Socket socket = http.open())
{
InputStream in = socket.getInputStream();
OutputStream out = socket.getOutputStream();

List<HttpTester.Response> responses = http.requests(req3);
out.write(request1.getBytes(StandardCharsets.ISO_8859_1));
out.flush();

HttpTester.Response response = responses.get(0);
byte[] raw = new byte[8192];
int offset = 0;
int length = raw.length;
while (true)
{
int len = in.read(raw, offset, length);
assertThat(len, greaterThan(0));
offset += len;
length -= len;
String response = new String(raw, 0, offset, StandardCharsets.ISO_8859_1);
if (response.contains("HTTP/1.1 302 Found\r\n"))
break;
}

assertEquals(302, response.getStatus(), "8.2.3 ignored no 100");
assertEquals("close", response.get("Connection"));
assertEquals(1, responses.size());
out.write(bodyAndRequest2.getBytes(StandardCharsets.ISO_8859_1));
out.flush();

while (true)
{
int len = in.read(raw, offset, length);
if (len < 0)
break;
offset += len;
length -= len;
}

String response = new String(raw, 0, offset, StandardCharsets.ISO_8859_1);
assertThat(response, containsString("Connection: close"));
assertThat(response, not(containsString(" 200 OK")));
assertThat(response, not(containsString("87654321")));
}
}

/**
* Test Message Transmission Requirements
*
* @see <a href="http://tools.ietf.org/html/rfc2616#section-8.2">RFC 2616 (section 8.2)</a>
*/
@Disabled //TODO review Expect/Continue-100 handling
@Test
public void test82ExpectNormal() throws Exception
{
// Expect 100

StringBuffer req4 = new StringBuffer();
StringBuilder req4 = new StringBuilder();
req4.append("GET /echo/R1 HTTP/1.1\n");
req4.append("Host: localhost\n");
req4.append("Connection: close\n");
Expand All @@ -770,24 +807,50 @@ public void test82ExpectNormal() throws Exception
req4.append("Content-Length: 7\n");
req4.append("\n"); // No body

Socket sock = http.open();
try
http.setTimeoutMillis(1000000);
try (Socket sock = http.open())
{
http.send(sock, req4);

http.setTimeoutMillis(2000);
HttpTester.Response response = http.readAvailable(sock);
assertThat("8.2.3 expect 100", response.getStatus(), is(HttpStatus.CONTINUE_100));
InputStream in = sock.getInputStream();
OutputStream out = sock.getOutputStream();
out.write(req4.toString().getBytes(StandardCharsets.ISO_8859_1));
out.flush();

byte[] raw = new byte[8192];
int offset = 0;
int length = raw.length;
while (true)
{
int len = in.read(raw, offset, length);
assertThat(len, greaterThan(0));
offset += len;
length -= len;
String response = new String(raw, 0, offset, StandardCharsets.ISO_8859_1);
if (response.equals("HTTP/1.1 100 Continue\r\n\r\n"))
break;
}

http.send(sock, "654321\n"); // Now send the data
response = http.read(sock);
out.write("6543210".getBytes(StandardCharsets.ISO_8859_1));
out.flush();

assertThat("8.2.3 expect 100", response.getStatus(), is(HttpStatus.OK_200));
assertThat("8.2.3 expect 100", response.getContent(), Matchers.containsString("654321\n"));
}
finally
{
http.close(sock);
while (true)
{
int len = in.read(raw, offset, length);
if (len > 0)
{
offset += len;
length -= len;
}
else if (len == 0)
{
throw new IllegalStateException();
}
else
{
String response = new String(raw, 0, offset, StandardCharsets.ISO_8859_1);
if (response.contains("HTTP/1.1 200 OK\r\n") && response.contains("6543210"))
break;
}
}
}
}

Expand Down
Loading
Loading