Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

implement servlet upgrade for ee10 and ee11 

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
This commit is contained in:
Lachlan Roberts 2024-08-21 23:42:50 +10:00
parent a72ae7007b
commit a9d391079c
No known key found for this signature in database
GPG Key ID: 5663FB7A8FF7E348
29 changed files with 904 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
View File

@ -2018,8 +2018,8 @@ public class HttpParser
public void servletUpgrade()
{
setState(State.CONTENT);
_endOfContent = EndOfContent.UNKNOWN_CONTENT;
setState(State.EOF_CONTENT);
_endOfContent = EndOfContent.EOF_CONTENT;
_contentLength = -1;
}

2
jetty-core/jetty-http2/jetty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/HTTP2CServerTest.java
View File

@ -42,9 +42,9 @@ import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.RetainableByteBuffer;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.Utf8StringBuilder;

1
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
View File

@ -37,7 +37,6 @@ import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.RetainableByteBuffer;
import org.eclipse.jetty.io.ssl.SslConnection;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.ProcessorUtils;
import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.annotation.ManagedAttribute;

1
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java
View File

@ -29,7 +29,6 @@ import org.eclipse.jetty.http.HttpScheme;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.http.QuotedCSVParser;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.Attributes;
import org.eclipse.jetty.util.HostPort;
import org.eclipse.jetty.util.Index;

13
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java → jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
View File

@ -11,7 +11,7 @@
// ========================================================================
//
package org.eclipse.jetty.server.internal;
package org.eclipse.jetty.server;
import java.io.IOException;
import java.nio.ByteBuffer;
@ -53,16 +53,7 @@ import org.eclipse.jetty.io.EofException;
import org.eclipse.jetty.io.RetainableByteBuffer;
import org.eclipse.jetty.io.RuntimeIOException;
import org.eclipse.jetty.io.ssl.SslConnection;
import org.eclipse.jetty.server.AbstractMetaDataConnection;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.ConnectionMetaData;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpChannel;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpStream;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.TunnelSupport;
import org.eclipse.jetty.server.internal.HttpChannelState;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.HostPort;

1
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnectionFactory.java
View File

@ -19,7 +19,6 @@ import org.eclipse.jetty.http.ComplianceViolation;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.annotation.Name;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

1
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/DelayedServerTest.java
View File

@ -19,7 +19,6 @@ import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.http.MetaData;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.Callback;
import org.junit.jupiter.api.BeforeEach;

1
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java
View File

@ -25,7 +25,6 @@ import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.ManagedSelector;
import org.eclipse.jetty.io.SocketChannelEndPoint;
import org.eclipse.jetty.server.internal.HttpChannelState;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.NanoTime;

1
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java
View File

@ -26,7 +26,6 @@ import org.eclipse.jetty.http.HttpCompliance;
import org.eclipse.jetty.http.HttpTester;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.Callback;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;

1
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
View File

@ -46,7 +46,6 @@ import org.eclipse.jetty.http.UriCompliance;
import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.logging.StacklessLogging;
import org.eclipse.jetty.server.handler.DumpHandler;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.NanoTime;

1
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
View File

@ -48,7 +48,6 @@ import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.logging.StacklessLogging;
import org.eclipse.jetty.server.handler.EchoHandler;
import org.eclipse.jetty.server.handler.HelloHandler;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.Blocker;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;

1
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseCompleteTest.java
View File

@ -26,7 +26,6 @@ import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.logging.StacklessLogging;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.component.LifeCycle;

1
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ServerTest.java
View File

@ -29,7 +29,6 @@ import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.io.QuietException;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.internal.HttpChannelState;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.Blocker;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.Jetty;

1
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/SlowClientWithPipelinedRequestTest.java
View File

@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.Callback;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;

1
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/StopTest.java
View File

@ -31,7 +31,6 @@ import org.eclipse.jetty.server.LocalConnector.LocalEndPoint;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.StatisticsHandler;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.FutureCallback;

4
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DelayedHandlerTest.java
View File

@ -298,7 +298,7 @@ public class DelayedHandlerTest
ByteArrayOutputStream out = new ByteArrayOutputStream(8192);
new Throwable().printStackTrace(new PrintStream(out));
String stack = out.toString(StandardCharsets.ISO_8859_1);
assertThat(stack, containsString("org.eclipse.jetty.server.internal.HttpConnection.onFillable"));
assertThat(stack, containsString("org.eclipse.jetty.server.HttpConnection.onFillable"));
assertThat(stack, containsString("org.eclipse.jetty.server.handler.DelayedHandler.handle"));
// Check the content is available
@ -469,7 +469,7 @@ public class DelayedHandlerTest
ByteArrayOutputStream out = new ByteArrayOutputStream(8192);
new Throwable().printStackTrace(new PrintStream(out));
String stack = out.toString(StandardCharsets.ISO_8859_1);
assertThat(stack, containsString("org.eclipse.jetty.server.internal.HttpConnection.onFillable"));
assertThat(stack, containsString("org.eclipse.jetty.server.HttpConnection.onFillable"));
assertThat(stack, containsString("org.eclipse.jetty.server.handler.DelayedHandler.handle"));
Fields fields = FormFields.from(request).get(1, TimeUnit.NANOSECONDS);

4
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java
View File

@ -494,8 +494,8 @@ public class SniSslConnectionFactoryTest
assertEquals("customize connector class org.eclipse.jetty.io.ssl.SslConnection,false", history.poll());
assertEquals("customize ssl class org.eclipse.jetty.io.ssl.SslConnection,false", history.poll());
assertEquals("customize connector class org.eclipse.jetty.server.internal.HttpConnection,true", history.poll());
assertEquals("customize http class org.eclipse.jetty.server.internal.HttpConnection,true", history.poll());
assertEquals("customize connector class org.eclipse.jetty.server.HttpConnection,true", history.poll());
assertEquals("customize http class org.eclipse.jetty.server.HttpConnection,true", history.poll());
assertEquals(0, history.size());
}

4
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslConnectionFactoryTest.java
View File

@ -178,8 +178,8 @@ public class SslConnectionFactoryTest
assertEquals("customize connector class org.eclipse.jetty.io.ssl.SslConnection,false", history.poll());
assertEquals("customize ssl class org.eclipse.jetty.io.ssl.SslConnection,false", history.poll());
assertEquals("customize connector class org.eclipse.jetty.server.internal.HttpConnection,true", history.poll());
assertEquals("customize http class org.eclipse.jetty.server.internal.HttpConnection,true", history.poll());
assertEquals("customize connector class org.eclipse.jetty.server.HttpConnection,true", history.poll());
assertEquals("customize http class org.eclipse.jetty.server.HttpConnection,true", history.poll());
assertEquals(0, history.size());
}

2
jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/ConnectionPoolTest.java
View File

@ -24,7 +24,7 @@ import org.eclipse.jetty.http2.server.internal.HTTP2ServerConnection;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.ssl.SslConnection;
import org.eclipse.jetty.quic.server.ServerQuicConnection;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.server.HttpConnection;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

258
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java
View File

@ -41,15 +41,18 @@ import java.util.concurrent.ExecutionException;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ReadListener;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletRequestAttributeEvent;
import jakarta.servlet.ServletRequestAttributeListener;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.WriteListener;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletMapping;
import jakarta.servlet.http.HttpServletRequest;
@ -58,7 +61,10 @@ import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
import jakarta.servlet.http.PushBuilder;
import jakarta.servlet.http.WebConnection;
import org.eclipse.jetty.ee10.servlet.ServletContextHandler.ServletRequestInfo;
import org.eclipse.jetty.ee10.servlet.util.ServletInputStreamWrapper;
import org.eclipse.jetty.ee10.servlet.util.ServletOutputStreamWrapper;
import org.eclipse.jetty.http.BadMessageException;
import org.eclipse.jetty.http.CookieCompliance;
import org.eclipse.jetty.http.HttpCookie;
@ -79,6 +85,7 @@ import org.eclipse.jetty.security.UserIdentity;
import org.eclipse.jetty.server.ConnectionMetaData;
import org.eclipse.jetty.server.CookieCache;
import org.eclipse.jetty.server.FormFields;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.HttpCookieUtils;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
@ -737,8 +744,250 @@ public class ServletApiRequest implements HttpServletRequest
@Override
public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException
{
// Not implemented. Throw ServletException as per spec.
throw new ServletException("Not implemented");
Response response = _servletContextRequest.getServletContextResponse();
if (response.getStatus() != HttpStatus.SWITCHING_PROTOCOLS_101)
throw new IllegalStateException("Response status should be 101");
if (response.getHeaders().get("Upgrade") == null)
throw new IllegalStateException("Missing Upgrade header");
if (!"Upgrade".equalsIgnoreCase(response.getHeaders().get("Connection")))
throw new IllegalStateException("Invalid Connection header");
if (response.isCommitted())
throw new IllegalStateException("Cannot upgrade committed response");
if (_servletChannel.getConnectionMetaData().getHttpVersion() != HttpVersion.HTTP_1_1)
throw new IllegalStateException("Only requests over HTTP/1.1 can be upgraded");
CompletableFuture<Void> outputStreamComplete = new CompletableFuture<>();
CompletableFuture<Void> inputStreamComplete = new CompletableFuture<>();
ServletOutputStream outputStream = new ServletOutputStreamWrapper(_servletContextRequest.getHttpOutput())
{
@Override
public void write(int b) throws IOException
{
try
{
super.write(b);
}
catch (Throwable t)
{
outputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void write(byte[] b) throws IOException
{
try
{
super.write(b);
}
catch (Throwable t)
{
outputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void write(byte[] b, int off, int len) throws IOException
{
try
{
super.write(b, off, len);
}
catch (Throwable t)
{
outputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void close() throws IOException
{
try
{
super.close();
outputStreamComplete.complete(null);
}
catch (Throwable t)
{
outputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void setWriteListener(WriteListener writeListener)
{
super.setWriteListener(new WriteListener()
{
@Override
public void onWritePossible() throws IOException
{
writeListener.onWritePossible();
}
@Override
public void onError(Throwable t)
{
writeListener.onError(t);
outputStreamComplete.completeExceptionally(t);
}
});
}
};
ServletInputStream inputStream = new ServletInputStreamWrapper(_servletContextRequest.getHttpInput())
{
@Override
public int read() throws IOException
{
try
{
int read = super.read();
if (read == -1)
inputStreamComplete.complete(null);
return read;
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public int read(byte[] b) throws IOException
{
try
{
int read = super.read(b);
if (read == -1)
inputStreamComplete.complete(null);
return read;
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public int read(byte[] b, int off, int len) throws IOException
{
try
{
int read = super.read(b, off, len);
if (read == -1)
inputStreamComplete.complete(null);
return read;
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void close() throws IOException
{
try
{
super.close();
inputStreamComplete.complete(null);
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void setReadListener(ReadListener readListener)
{
super.setReadListener(new ReadListener()
{
@Override
public void onDataAvailable() throws IOException
{
readListener.onDataAvailable();
}
@Override
public void onAllDataRead() throws IOException
{
try
{
readListener.onAllDataRead();
inputStreamComplete.complete(null);
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void onError(Throwable t)
{
readListener.onError(t);
inputStreamComplete.completeExceptionally(t);
}
});
}
};
T upgradeHandler;
try
{
upgradeHandler = handlerClass.getDeclaredConstructor().newInstance();
}
catch (Exception e)
{
throw new ServletException("Unable to instantiate handler class", e);
}
HttpConnection httpConnection = (HttpConnection)_servletContextRequest.getConnectionMetaData().getConnection();
httpConnection.getParser().servletUpgrade();
AsyncContext asyncContext = forceStartAsync(); // force the servlet in async mode
outputStream.flush(); // commit the 101 response
httpConnection.getGenerator().servletUpgrade(); // tell the generator it can send data as-is
CompletableFuture.allOf(inputStreamComplete, outputStreamComplete).whenComplete((result, failure) ->
{
upgradeHandler.destroy();
asyncContext.complete();
});
WebConnection webConnection = new WebConnection()
{
@Override
public void close() throws Exception
{
IO.close(inputStream);
IO.close(outputStream);
}
@Override
public ServletInputStream getInputStream()
{
return inputStream;
}
@Override
public ServletOutputStream getOutputStream()
{
return outputStream;
}
};
upgradeHandler.init(webConnection);
return upgradeHandler;
}
@Override
@ -1374,6 +1623,11 @@ public class ServletApiRequest implements HttpServletRequest
{
if (!isAsyncSupported())
throw new IllegalStateException("Async Not Supported");
return forceStartAsync();
}
private AsyncContext forceStartAsync()
{
ServletChannelState state = getServletRequestInfo().getState();
if (_async == null)
_async = new AsyncContextState(state);

114
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/util/ServletInputStreamWrapper.java Normal file
View File

@ -0,0 +1,114 @@
//
// ========================================================================
// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.ee10.servlet.util;
import java.io.IOException;
import java.io.OutputStream;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletInputStream;
public class ServletInputStreamWrapper extends ServletInputStream
{
private final ServletInputStream _servletInputStream;
public ServletInputStreamWrapper(ServletInputStream servletInputStream)
{
_servletInputStream = servletInputStream;
}
@Override
public boolean isFinished()
{
return _servletInputStream.isFinished();
}
@Override
public boolean isReady()
{
return _servletInputStream.isReady();
}
@Override
public void setReadListener(ReadListener readListener)
{
_servletInputStream.setReadListener(readListener);
}
@Override
public int read() throws IOException
{
return _servletInputStream.read();
}
@Override
public int read(byte[] b) throws IOException
{
return _servletInputStream.read(b);
}
@Override
public int read(byte[] b, int off, int len) throws IOException
{
return _servletInputStream.read(b, off, len);
}
@Override
public long skip(long n) throws IOException
{
return _servletInputStream.skip(n);
}
@Override
public void skipNBytes(long n) throws IOException
{
_servletInputStream.skipNBytes(n);
}
@Override
public int available() throws IOException
{
return _servletInputStream.available();
}
@Override
public void close() throws IOException
{
_servletInputStream.close();
}
@Override
public void mark(int readlimit)
{
_servletInputStream.mark(readlimit);
}
@Override
public void reset() throws IOException
{
_servletInputStream.reset();
}
@Override
public boolean markSupported()
{
return _servletInputStream.markSupported();
}
@Override
public long transferTo(OutputStream out) throws IOException
{
return _servletInputStream.transferTo(out);
}
}

96
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/util/ServletOutputStreamWrapper.java
View File

@ -14,7 +14,6 @@
package org.eclipse.jetty.ee10.servlet.util;
import java.io.IOException;
import java.io.OutputStream;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.WriteListener;
@ -28,96 +27,6 @@ public class ServletOutputStreamWrapper extends ServletOutputStream
_outputStream = outputStream;
}
@Override
public void print(String s) throws IOException
{
_outputStream.print(s);
}
@Override
public void print(boolean b) throws IOException
{
_outputStream.print(b);
}
@Override
public void print(char c) throws IOException
{
_outputStream.print(c);
}
@Override
public void print(int i) throws IOException
{
_outputStream.print(i);
}
@Override
public void print(long l) throws IOException
{
_outputStream.print(l);
}
@Override
public void print(float f) throws IOException
{
_outputStream.print(f);
}
@Override
public void print(double d) throws IOException
{
_outputStream.print(d);
}
@Override
public void println() throws IOException
{
_outputStream.println();
}
@Override
public void println(String s) throws IOException
{
_outputStream.println(s);
}
@Override
public void println(boolean b) throws IOException
{
_outputStream.println(b);
}
@Override
public void println(char c) throws IOException
{
_outputStream.println(c);
}
@Override
public void println(int i) throws IOException
{
_outputStream.println(i);
}
@Override
public void println(long l) throws IOException
{
_outputStream.println(l);
}
@Override
public void println(float f) throws IOException
{
_outputStream.println(f);
}
@Override
public void println(double d) throws IOException
{
_outputStream.println(d);
}
@Override
public boolean isReady()
{
@ -130,11 +39,6 @@ public class ServletOutputStreamWrapper extends ServletOutputStream
_outputStream.setWriteListener(writeListener);
}
public static OutputStream nullOutputStream()
{
return OutputStream.nullOutputStream();
}
@Override
public void write(int b) throws IOException
{

221
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletUpgradeTest.java
View File

@ -17,6 +17,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletException;
@ -29,16 +32,18 @@ import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.WebConnection;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.Utf8StringBuilder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.eclipse.jetty.util.StringUtil.CRLF;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ServletUpgradeTest
@ -47,10 +52,13 @@ public class ServletUpgradeTest
private Server server;
private int port;
private static CountDownLatch destroyLatch;
@BeforeEach
public void setUp() throws Exception
{
destroyLatch = new CountDownLatch(1);
server = new Server();
ServerConnector connector = new ServerConnector(server);
@ -72,130 +80,64 @@ public class ServletUpgradeTest
server.stop();
}
@Disabled
@Test
public void upgradeTest() throws Exception
{
boolean passed1 = false;
boolean passed2 = false;
boolean passed3 = false;
String expectedResponse1 = "TCKHttpUpgradeHandler.init";
String expectedResponse2 = "onDataAvailable|Hello";
String expectedResponse3 = "onDataAvailable|World";
Socket socket = new Socket("localhost", port);
socket.setSoTimeout(0);
InputStream input = socket.getInputStream();
OutputStream output = socket.getOutputStream();
InputStream input = null;
OutputStream output = null;
Socket s = null;
String request = "POST /TestServlet HTTP/1.1" + CRLF +
"Host: localhost:" + port + CRLF +
"Upgrade: YES" + CRLF +
"Connection: Upgrade" + CRLF +
CRLF;
try
output.write(request.getBytes());
writeChunk(output, "Hello");
writeChunk(output, "World");
output.flush();
socket.shutdownOutput();
CompletableFuture<String> futureContent = new CompletableFuture<>();
new Thread(() ->
{
s = new Socket("localhost", port);
output = s.getOutputStream();
StringBuilder reqStr = new StringBuilder()
.append("POST /TestServlet HTTP/1.1").append(CRLF)
.append("User-Agent: Java/1.6.0_33").append(CRLF)
.append("Host: localhost:").append(port).append(CRLF)
.append("Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2").append(CRLF)
.append("Upgrade: YES").append(CRLF)
.append("Connection: Upgrade").append(CRLF)
.append("Content-type: application/x-www-form-urlencoded").append(CRLF)
.append(CRLF);
LOG.info("REQUEST=========" + reqStr.toString());
output.write(reqStr.toString().getBytes());
LOG.info("Writing first chunk");
writeChunk(output, "Hello");
LOG.info("Writing second chunk");
writeChunk(output, "World");
LOG.info("Consuming the response from the server");
// Consume the response from the server
input = s.getInputStream();
int len;
byte[] b = new byte[1024];
boolean receivedFirstMessage = false;
boolean receivedSecondMessage = false;
boolean receivedThirdMessage = false;
StringBuilder sb = new StringBuilder();
while ((len = input.read(b)) != -1)
{
String line = new String(b, 0, len);
sb.append(line);
LOG.info("==============Read from server:" + CRLF + sb + CRLF);
if (passed1 = compareString(expectedResponse1, sb.toString()))
{
LOG.info("==============Received first expected response!" + CRLF);
receivedFirstMessage = true;
}
if (passed2 = compareString(expectedResponse2, sb.toString()))
{
LOG.info("==============Received second expected response!" + CRLF);
receivedSecondMessage = true;
}
if (passed3 = compareString(expectedResponse3, sb.toString()))
{
LOG.info("==============Received third expected response!" + CRLF);
receivedThirdMessage = true;
}
LOG.info("receivedFirstMessage : " + receivedFirstMessage);
LOG.info("receivedSecondMessage : " + receivedSecondMessage);
LOG.info("receivedThirdMessage : " + receivedThirdMessage);
if (receivedFirstMessage && receivedSecondMessage && receivedThirdMessage)
{
break;
}
}
}
finally
{
Utf8StringBuilder sb = new Utf8StringBuilder();
try
{
if (input != null)
while (true)
{
LOG.info("Closing input...");
input.close();
LOG.info("Input closed.");
int read = input.read();
if (read == -1)
break;
sb.append((byte)read);
}
futureContent.complete(sb.toCompleteString());
}
catch (Exception ex)
catch (Throwable t)
{
LOG.error("Failed to close input:" + ex.getMessage(), ex);
LOG.warn("failed with content: " + sb, t);
futureContent.completeExceptionally(t);
}
try
{
if (output != null)
{
LOG.info("Closing output...");
output.close();
LOG.info("Output closed .");
}
}
catch (Exception ex)
{
LOG.error("Failed to close output:" + ex.getMessage(), ex);
}
}).start();
try
{
if (s != null)
{
LOG.info("Closing socket..." + CRLF);
s.close();
LOG.info("Socked closed.");
}
}
catch (Exception ex)
{
LOG.error("Failed to close socket:" + ex.getMessage(), ex);
}
}
String content = futureContent.get(5, TimeUnit.SECONDS);
String expectedContent = """
TCKHttpUpgradeHandler.init\r
=onDataAvailable\r
HelloWorld\r
=onAllDataRead\r
""";
assertThat(content, startsWith("HTTP/1.1 101 Switching Protocols"));
assertThat(content, endsWith(expectedContent));
assertTrue(passed1 && passed2 && passed3);
input.close();
output.close();
socket.close();
assertTrue(destroyLatch.await(5, TimeUnit.SECONDS));
}
private static class TestServlet extends HttpServlet
@ -227,7 +169,7 @@ public class ServletUpgradeTest
@Override
public void destroy()
{
LOG.debug("===============destroy");
destroyLatch.countDown();
}
@Override
@ -237,9 +179,9 @@ public class ServletUpgradeTest
{
ServletInputStream input = wc.getInputStream();
ServletOutputStream output = wc.getOutputStream();
TestReadListener readListener = new TestReadListener("/", input, output);
TestReadListener readListener = new TestReadListener(input, output);
input.setReadListener(readListener);
output.println("===============TCKHttpUpgradeHandler.init");
output.println("TCKHttpUpgradeHandler.init");
output.flush();
}
catch (Exception ex)
@ -253,20 +195,20 @@ public class ServletUpgradeTest
{
private final ServletInputStream input;
private final ServletOutputStream output;
private final String delimiter;
private boolean outputOnDataAvailable = false;
TestReadListener(String del, ServletInputStream in, ServletOutputStream out)
TestReadListener(ServletInputStream in, ServletOutputStream out)
{
input = in;
output = out;
delimiter = del;
}
@Override
public void onAllDataRead()
{
try
{
output.println("=onAllDataRead");
output.println("\r\n=onAllDataRead");
output.close();
}
catch (Exception ex)
@ -275,11 +217,17 @@ public class ServletUpgradeTest
}
}
@Override
public void onDataAvailable()
{
try
{
output.println("=onDataAvailable");
if (!outputOnDataAvailable)
{
outputOnDataAvailable = true;
output.println("=onDataAvailable");
}
StringBuilder sb = new StringBuilder();
int len;
byte[] b = new byte[1024];
@ -288,7 +236,7 @@ public class ServletUpgradeTest
String data = new String(b, 0, len);
sb.append(data);
}
output.println(delimiter + sb.toString());
output.print(sb.toString());
output.flush();
}
catch (Exception ex)
@ -297,50 +245,13 @@ public class ServletUpgradeTest
}
}
@Override
public void onError(final Throwable t)
{
LOG.error("TestReadListener error", t);
}
}
private static boolean compareString(String expected, String actual)
{
String[] listExpected = expected.split("[|]");
boolean found = true;
for (int i = 0, n = listExpected.length, startIdx = 0, bodyLength = actual.length(); i < n; i++)
{
String search = listExpected[i];
if (startIdx >= bodyLength)
{
startIdx = bodyLength;
}
int searchIdx = actual.toLowerCase().indexOf(search.toLowerCase(), startIdx);
LOG.debug("[ServletTestUtil] Scanning response for " + "search string: '" + search + "' starting at index " + "location: " + startIdx);
if (searchIdx < 0)
{
found = false;
String s = "[ServletTestUtil] Unable to find the following " +
"search string in the server's " +
"response: '" + search + "' at index: " +
startIdx +
"\n[ServletTestUtil] Server's response:\n" +
"-------------------------------------------\n" +
actual +
"\n-------------------------------------------\n";
LOG.debug(s);
break;
}
LOG.debug("[ServletTestUtil] Found search string: '" + search + "' at index '" + searchIdx + "' in the server's " + "response");
// the new searchIdx is the old index plus the lenght of the
// search string.
startIdx = searchIdx + search.length();
}
return found;
}
private static void writeChunk(OutputStream out, String data) throws IOException
{
if (data != null)

2
jetty-ee10/jetty-ee10-tests/jetty-ee10-test-integration/src/test/java/org/eclipse/jetty/ee10/test/GzipWithSendErrorTest.java
View File

@ -44,10 +44,10 @@ import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
import org.eclipse.jetty.ee10.servlet.ServletContextRequest;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.IO;

258
jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiRequest.java
View File

@ -41,15 +41,18 @@ import java.util.concurrent.ExecutionException;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ReadListener;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletRequestAttributeEvent;
import jakarta.servlet.ServletRequestAttributeListener;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.WriteListener;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletMapping;
import jakarta.servlet.http.HttpServletRequest;
@ -58,7 +61,10 @@ import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
import jakarta.servlet.http.PushBuilder;
import jakarta.servlet.http.WebConnection;
import org.eclipse.jetty.ee11.servlet.ServletContextHandler.ServletRequestInfo;
import org.eclipse.jetty.ee11.servlet.util.ServletInputStreamWrapper;
import org.eclipse.jetty.ee11.servlet.util.ServletOutputStreamWrapper;
import org.eclipse.jetty.http.BadMessageException;
import org.eclipse.jetty.http.CookieCompliance;
import org.eclipse.jetty.http.HttpCookie;
@ -79,6 +85,7 @@ import org.eclipse.jetty.security.UserIdentity;
import org.eclipse.jetty.server.ConnectionMetaData;
import org.eclipse.jetty.server.CookieCache;
import org.eclipse.jetty.server.FormFields;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.HttpCookieUtils;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
@ -737,8 +744,250 @@ public class ServletApiRequest implements HttpServletRequest
@Override
public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException
{
// Not implemented. Throw ServletException as per spec.
throw new ServletException("Not implemented");
Response response = _servletContextRequest.getServletContextResponse();
if (response.getStatus() != HttpStatus.SWITCHING_PROTOCOLS_101)
throw new IllegalStateException("Response status should be 101");
if (response.getHeaders().get("Upgrade") == null)
throw new IllegalStateException("Missing Upgrade header");
if (!"Upgrade".equalsIgnoreCase(response.getHeaders().get("Connection")))
throw new IllegalStateException("Invalid Connection header");
if (response.isCommitted())
throw new IllegalStateException("Cannot upgrade committed response");
if (_servletChannel.getConnectionMetaData().getHttpVersion() != HttpVersion.HTTP_1_1)
throw new IllegalStateException("Only requests over HTTP/1.1 can be upgraded");
CompletableFuture<Void> outputStreamComplete = new CompletableFuture<>();
CompletableFuture<Void> inputStreamComplete = new CompletableFuture<>();
ServletOutputStream outputStream = new ServletOutputStreamWrapper(_servletContextRequest.getHttpOutput())
{
@Override
public void write(int b) throws IOException
{
try
{
super.write(b);
}
catch (Throwable t)
{
outputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void write(byte[] b) throws IOException
{
try
{
super.write(b);
}
catch (Throwable t)
{
outputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void write(byte[] b, int off, int len) throws IOException
{
try
{
super.write(b, off, len);
}
catch (Throwable t)
{
outputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void close() throws IOException
{
try
{
super.close();
outputStreamComplete.complete(null);
}
catch (Throwable t)
{
outputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void setWriteListener(WriteListener writeListener)
{
super.setWriteListener(new WriteListener()
{
@Override
public void onWritePossible() throws IOException
{
writeListener.onWritePossible();
}
@Override
public void onError(Throwable t)
{
writeListener.onError(t);
outputStreamComplete.completeExceptionally(t);
}
});
}
};
ServletInputStream inputStream = new ServletInputStreamWrapper(_servletContextRequest.getHttpInput())
{
@Override
public int read() throws IOException
{
try
{
int read = super.read();
if (read == -1)
inputStreamComplete.complete(null);
return read;
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public int read(byte[] b) throws IOException
{
try
{
int read = super.read(b);
if (read == -1)
inputStreamComplete.complete(null);
return read;
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public int read(byte[] b, int off, int len) throws IOException
{
try
{
int read = super.read(b, off, len);
if (read == -1)
inputStreamComplete.complete(null);
return read;
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void close() throws IOException
{
try
{
super.close();
inputStreamComplete.complete(null);
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void setReadListener(ReadListener readListener)
{
super.setReadListener(new ReadListener()
{
@Override
public void onDataAvailable() throws IOException
{
readListener.onDataAvailable();
}
@Override
public void onAllDataRead() throws IOException
{
try
{
readListener.onAllDataRead();
inputStreamComplete.complete(null);
}
catch (Throwable t)
{
inputStreamComplete.completeExceptionally(t);
throw t;
}
}
@Override
public void onError(Throwable t)
{
readListener.onError(t);
inputStreamComplete.completeExceptionally(t);
}
});
}
};
T upgradeHandler;
try
{
upgradeHandler = handlerClass.getDeclaredConstructor().newInstance();
}
catch (Exception e)
{
throw new ServletException("Unable to instantiate handler class", e);
}
HttpConnection httpConnection = (HttpConnection)_servletContextRequest.getConnectionMetaData().getConnection();
httpConnection.getParser().servletUpgrade();
AsyncContext asyncContext = forceStartAsync(); // force the servlet in async mode
outputStream.flush(); // commit the 101 response
httpConnection.getGenerator().servletUpgrade(); // tell the generator it can send data as-is
CompletableFuture.allOf(inputStreamComplete, outputStreamComplete).whenComplete((result, failure) ->
{
upgradeHandler.destroy();
asyncContext.complete();
});
WebConnection webConnection = new WebConnection()
{
@Override
public void close() throws Exception
{
IO.close(inputStream);
IO.close(outputStream);
}
@Override
public ServletInputStream getInputStream()
{
return inputStream;
}
@Override
public ServletOutputStream getOutputStream()
{
return outputStream;
}
};
upgradeHandler.init(webConnection);
return upgradeHandler;
}
@Override
@ -1382,6 +1631,11 @@ public class ServletApiRequest implements HttpServletRequest
{
if (!isAsyncSupported())
throw new IllegalStateException("Async Not Supported");
return forceStartAsync();
}
private AsyncContext forceStartAsync()
{
ServletChannelState state = getServletRequestInfo().getState();
if (_async == null)
_async = new AsyncContextState(state);

131
jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/util/ServletInputStreamWrapper.java Normal file
View File

@ -0,0 +1,131 @@
package org.eclipse.jetty.ee11.servlet.util;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletInputStream;
public class ServletInputStreamWrapper extends ServletInputStream
{
private final ServletInputStream _servletInputStream;
public ServletInputStreamWrapper(ServletInputStream servletInputStream)
{
_servletInputStream = servletInputStream;
}
@Override
public int readLine(byte[] b, int off, int len) throws IOException
{
return _servletInputStream.readLine(b, off, len);
}
@Override
public boolean isFinished()
{
return _servletInputStream.isFinished();
}
@Override
public boolean isReady()
{
return _servletInputStream.isReady();
}
@Override
public void setReadListener(ReadListener readListener)
{
_servletInputStream.setReadListener(readListener);
}
public static InputStream nullInputStream()
{
return InputStream.nullInputStream();
}
@Override
public int read() throws IOException
{
return _servletInputStream.read();
}
@Override
public int read(byte[] b) throws IOException
{
return _servletInputStream.read(b);
}
@Override
public int read(byte[] b, int off, int len) throws IOException
{
return _servletInputStream.read(b, off, len);
}
@Override
public byte[] readAllBytes() throws IOException
{
return _servletInputStream.readAllBytes();
}
@Override
public byte[] readNBytes(int len) throws IOException
{
return _servletInputStream.readNBytes(len);
}
@Override
public int readNBytes(byte[] b, int off, int len) throws IOException
{
return _servletInputStream.readNBytes(b, off, len);
}
@Override
public long skip(long n) throws IOException
{
return _servletInputStream.skip(n);
}
@Override
public void skipNBytes(long n) throws IOException
{
_servletInputStream.skipNBytes(n);
}
@Override
public int available() throws IOException
{
return _servletInputStream.available();
}
@Override
public void close() throws IOException
{
_servletInputStream.close();
}
@Override
public void mark(int readlimit)
{
_servletInputStream.mark(readlimit);
}
@Override
public void reset() throws IOException
{
_servletInputStream.reset();
}
@Override
public boolean markSupported()
{
return _servletInputStream.markSupported();
}
@Override
public long transferTo(OutputStream out) throws IOException
{
return _servletInputStream.transferTo(out);
}
}

221
jetty-ee11/jetty-ee11-servlet/src/test/java/org/eclipse/jetty/ee11/servlet/ServletUpgradeTest.java
View File

@ -17,6 +17,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletException;
@ -29,16 +32,18 @@ import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.WebConnection;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.Utf8StringBuilder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.eclipse.jetty.util.StringUtil.CRLF;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ServletUpgradeTest
@ -47,10 +52,13 @@ public class ServletUpgradeTest
private Server server;
private int port;
private static CountDownLatch destroyLatch;
@BeforeEach
public void setUp() throws Exception
{
destroyLatch = new CountDownLatch(1);
server = new Server();
ServerConnector connector = new ServerConnector(server);
@ -72,130 +80,64 @@ public class ServletUpgradeTest
server.stop();
}
@Disabled
@Test
public void upgradeTest() throws Exception
{
boolean passed1 = false;
boolean passed2 = false;
boolean passed3 = false;
String expectedResponse1 = "TCKHttpUpgradeHandler.init";
String expectedResponse2 = "onDataAvailable|Hello";
String expectedResponse3 = "onDataAvailable|World";
Socket socket = new Socket("localhost", port);
socket.setSoTimeout(0);
InputStream input = socket.getInputStream();
OutputStream output = socket.getOutputStream();
InputStream input = null;
OutputStream output = null;
Socket s = null;
String request = "POST /TestServlet HTTP/1.1" + CRLF +
"Host: localhost:" + port + CRLF +
"Upgrade: YES" + CRLF +
"Connection: Upgrade" + CRLF +
CRLF;
try
output.write(request.getBytes());
writeChunk(output, "Hello");
writeChunk(output, "World");
output.flush();
socket.shutdownOutput();
CompletableFuture<String> futureContent = new CompletableFuture<>();
new Thread(() ->
{
s = new Socket("localhost", port);
output = s.getOutputStream();
StringBuilder reqStr = new StringBuilder()
.append("POST /TestServlet HTTP/1.1").append(CRLF)
.append("User-Agent: Java/1.6.0_33").append(CRLF)
.append("Host: localhost:").append(port).append(CRLF)
.append("Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2").append(CRLF)
.append("Upgrade: YES").append(CRLF)
.append("Connection: Upgrade").append(CRLF)
.append("Content-type: application/x-www-form-urlencoded").append(CRLF)
.append(CRLF);
LOG.info("REQUEST=========" + reqStr.toString());
output.write(reqStr.toString().getBytes());
LOG.info("Writing first chunk");
writeChunk(output, "Hello");
LOG.info("Writing second chunk");
writeChunk(output, "World");
LOG.info("Consuming the response from the server");
// Consume the response from the server
input = s.getInputStream();
int len;
byte[] b = new byte[1024];
boolean receivedFirstMessage = false;
boolean receivedSecondMessage = false;
boolean receivedThirdMessage = false;
StringBuilder sb = new StringBuilder();
while ((len = input.read(b)) != -1)
{
String line = new String(b, 0, len);
sb.append(line);
LOG.info("==============Read from server:" + CRLF + sb + CRLF);
if (passed1 = compareString(expectedResponse1, sb.toString()))
{
LOG.info("==============Received first expected response!" + CRLF);
receivedFirstMessage = true;
}
if (passed2 = compareString(expectedResponse2, sb.toString()))
{
LOG.info("==============Received second expected response!" + CRLF);
receivedSecondMessage = true;
}
if (passed3 = compareString(expectedResponse3, sb.toString()))
{
LOG.info("==============Received third expected response!" + CRLF);
receivedThirdMessage = true;
}
LOG.info("receivedFirstMessage : " + receivedFirstMessage);
LOG.info("receivedSecondMessage : " + receivedSecondMessage);
LOG.info("receivedThirdMessage : " + receivedThirdMessage);
if (receivedFirstMessage && receivedSecondMessage && receivedThirdMessage)
{
break;
}
}
}
finally
{
Utf8StringBuilder sb = new Utf8StringBuilder();
try
{
if (input != null)
while (true)
{
LOG.info("Closing input...");
input.close();
LOG.info("Input closed.");
int read = input.read();
if (read == -1)
break;
sb.append((byte)read);
}
futureContent.complete(sb.toCompleteString());
}
catch (Exception ex)
catch (Throwable t)
{
LOG.error("Failed to close input:" + ex.getMessage(), ex);
LOG.warn("failed with content: " + sb, t);
futureContent.completeExceptionally(t);
}
try
{
if (output != null)
{
LOG.info("Closing output...");
output.close();
LOG.info("Output closed .");
}
}
catch (Exception ex)
{
LOG.error("Failed to close output:" + ex.getMessage(), ex);
}
}).start();
try
{
if (s != null)
{
LOG.info("Closing socket..." + CRLF);
s.close();
LOG.info("Socked closed.");
}
}
catch (Exception ex)
{
LOG.error("Failed to close socket:" + ex.getMessage(), ex);
}
}
String content = futureContent.get(5, TimeUnit.SECONDS);
String expectedContent = """
TCKHttpUpgradeHandler.init\r
=onDataAvailable\r
HelloWorld\r
=onAllDataRead\r
""";
assertThat(content, startsWith("HTTP/1.1 101 Switching Protocols"));
assertThat(content, endsWith(expectedContent));
assertTrue(passed1 && passed2 && passed3);
input.close();
output.close();
socket.close();
assertTrue(destroyLatch.await(5, TimeUnit.SECONDS));
}
private static class TestServlet extends HttpServlet
@ -227,7 +169,7 @@ public class ServletUpgradeTest
@Override
public void destroy()
{
LOG.debug("===============destroy");
destroyLatch.countDown();
}
@Override
@ -237,9 +179,9 @@ public class ServletUpgradeTest
{
ServletInputStream input = wc.getInputStream();
ServletOutputStream output = wc.getOutputStream();
TestReadListener readListener = new TestReadListener("/", input, output);
TestReadListener readListener = new TestReadListener(input, output);
input.setReadListener(readListener);
output.println("===============TCKHttpUpgradeHandler.init");
output.println("TCKHttpUpgradeHandler.init");
output.flush();
}
catch (Exception ex)
@ -253,20 +195,20 @@ public class ServletUpgradeTest
{
private final ServletInputStream input;
private final ServletOutputStream output;
private final String delimiter;
private boolean outputOnDataAvailable = false;
TestReadListener(String del, ServletInputStream in, ServletOutputStream out)
TestReadListener(ServletInputStream in, ServletOutputStream out)
{
input = in;
output = out;
delimiter = del;
}
@Override
public void onAllDataRead()
{
try
{
output.println("=onAllDataRead");
output.println("\r\n=onAllDataRead");
output.close();
}
catch (Exception ex)
@ -275,11 +217,17 @@ public class ServletUpgradeTest
}
}
@Override
public void onDataAvailable()
{
try
{
output.println("=onDataAvailable");
if (!outputOnDataAvailable)
{
outputOnDataAvailable = true;
output.println("=onDataAvailable");
}
StringBuilder sb = new StringBuilder();
int len;
byte[] b = new byte[1024];
@ -288,7 +236,7 @@ public class ServletUpgradeTest
String data = new String(b, 0, len);
sb.append(data);
}
output.println(delimiter + sb.toString());
output.print(sb.toString());
output.flush();
}
catch (Exception ex)
@ -297,50 +245,13 @@ public class ServletUpgradeTest
}
}
@Override
public void onError(final Throwable t)
{
LOG.error("TestReadListener error", t);
}
}
private static boolean compareString(String expected, String actual)
{
String[] listExpected = expected.split("[|]");
boolean found = true;
for (int i = 0, n = listExpected.length, startIdx = 0, bodyLength = actual.length(); i < n; i++)
{
String search = listExpected[i];
if (startIdx >= bodyLength)
{
startIdx = bodyLength;
}
int searchIdx = actual.toLowerCase().indexOf(search.toLowerCase(), startIdx);
LOG.debug("[ServletTestUtil] Scanning response for " + "search string: '" + search + "' starting at index " + "location: " + startIdx);
if (searchIdx < 0)
{
found = false;
String s = "[ServletTestUtil] Unable to find the following " +
"search string in the server's " +
"response: '" + search + "' at index: " +
startIdx +
"\n[ServletTestUtil] Server's response:\n" +
"-------------------------------------------\n" +
actual +
"\n-------------------------------------------\n";
LOG.debug(s);
break;
}
LOG.debug("[ServletTestUtil] Found search string: '" + search + "' at index '" + searchIdx + "' in the server's " + "response");
// the new searchIdx is the old index plus the lenght of the
// search string.
startIdx = searchIdx + search.length();
}
return found;
}
private static void writeChunk(OutputStream out, String data) throws IOException
{
if (data != null)

2
jetty-ee11/jetty-ee11-tests/jetty-ee11-test-integration/src/test/java/org/eclipse/jetty/ee11/test/GzipWithSendErrorTest.java
View File

@ -44,10 +44,10 @@ import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
import org.eclipse.jetty.ee11.servlet.ServletContextRequest;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.IO;

3
jetty-ee9/jetty-ee9-tests/jetty-ee9-test-integration/src/test/java/org/eclipse/jetty/ee9/test/GzipWithSendErrorTest.java
View File

@ -41,11 +41,10 @@ import org.eclipse.jetty.ee9.nested.Request;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
import org.eclipse.jetty.server.internal.HttpChannelState;
import org.eclipse.jetty.server.internal.HttpConnection;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.IO;