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

Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12-static-pathInContext 

# Conflicts:
#	jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
This commit is contained in:
Greg Wilkins 2022-10-25 09:11:40 +11:00
parent 31e4a8234f 660093ff3a
commit 6c9d34c26a
11 changed files with 284 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ConnectionMetaData.java
View File

@ -78,83 +78,81 @@ public interface ConnectionMetaData extends Attributes
class Wrapper extends Attributes.Wrapper implements ConnectionMetaData
{
private final ConnectionMetaData _wrapped;
public Wrapper(ConnectionMetaData wrapped)
{
super(wrapped);
_wrapped = wrapped;
}
protected ConnectionMetaData getWrappedConnectionMetaData()
@Override
public ConnectionMetaData getWrapped()
{
return _wrapped;
return (ConnectionMetaData)super.getWrapped();
}
@Override
public String getId()
{
return _wrapped.getId();
return getWrapped().getId();
}
@Override
public HttpConfiguration getHttpConfiguration()
{
return _wrapped.getHttpConfiguration();
return getWrapped().getHttpConfiguration();
}
@Override
public HttpVersion getHttpVersion()
{
return _wrapped.getHttpVersion();
return getWrapped().getHttpVersion();
}
@Override
public String getProtocol()
{
return _wrapped.getProtocol();
return getWrapped().getProtocol();
}
@Override
public Connection getConnection()
{
return _wrapped.getConnection();
return getWrapped().getConnection();
}
@Override
public Connector getConnector()
{
return _wrapped.getConnector();
return getWrapped().getConnector();
}
@Override
public boolean isPersistent()
{
return _wrapped.isPersistent();
return getWrapped().isPersistent();
}
@Override
public boolean isSecure()
{
return _wrapped.isSecure();
return getWrapped().isSecure();
}
@Override
public SocketAddress getRemoteSocketAddress()
{
return _wrapped.getRemoteSocketAddress();
return getWrapped().getRemoteSocketAddress();
}
@Override
public SocketAddress getLocalSocketAddress()
{
return _wrapped.getLocalSocketAddress();
return getWrapped().getLocalSocketAddress();
}
@Override
public HostPort getServerAuthority()
{
return _wrapped.getServerAuthority();
return getWrapped().getServerAuthority();
}
}
}

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

@ -597,7 +597,7 @@ public class ForwardedRequestCustomizer implements HttpConfiguration.Customizer
getId(),
remote,
authority,
getWrappedConnectionMetaData()
getWrapped()
);
}
};

71
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpTransport.java
View File

@ -1,71 +0,0 @@
//
// ========================================================================
// Copyright (c) 1995-2022 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.server;
import java.nio.ByteBuffer;
import org.eclipse.jetty.http.MetaData;
import org.eclipse.jetty.util.Callback;
/**
* Abstraction of the outbound HTTP transport.
*/
public interface HttpTransport
{
String UPGRADE_CONNECTION_ATTRIBUTE = HttpTransport.class.getName() + ".UPGRADE";
/**
* Asynchronous call to send a response (or part) over the transport
*
* @param request True if the response if for a HEAD request (and the data should not be sent).
* @param response The header info to send, or null if just sending more data.
* The first call to send for a response must have a non null info.
* @param content A buffer of content to be sent.
* @param lastContent True if the content is the last content for the current response.
* @param callback The Callback instance that success or failure of the send is notified on
*/
void send(MetaData.Request request, MetaData.Response response, ByteBuffer content, boolean lastContent, Callback callback);
/**
* @return true if responses can be pushed over this transport
*/
boolean isPushSupported();
/**
* @param request A request to use as the basis for generating a pushed response.
*/
void push(MetaData.Request request);
/**
* Called to indicated the end of the current request/response cycle (which may be
* some time after the last content is sent).
*/
void onCompleted();
/**
* Aborts this transport.
* <p>
* This method should terminate the transport in a way that
* can indicate an abnormal response to the client, for example
* by abruptly close the connection.
* <p>
* This method is called when an error response needs to be sent,
* but the response is already committed, or when a write failure
* is detected. If abort is called, {@link #onCompleted()} is not
* called
*
* @param failure the failure that caused the abort.
*/
void abort(Throwable failure);
}

4
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorProcessor.java
View File

@ -110,7 +110,7 @@ public class ErrorProcessor implements Request.Processor
try
{
generateAcceptableResponse(request, response, code, message, cause, callback);
generateResponse(request, response, code, message, cause, callback);
}
catch (Throwable x)
{
@ -120,7 +120,7 @@ public class ErrorProcessor implements Request.Processor
}
}
protected void generateAcceptableResponse(Request request, Response response, int code, String message, Throwable cause, Callback callback) throws IOException
protected void generateResponse(Request request, Response response, int code, String message, Throwable cause, Callback callback) throws IOException
{
List<String> acceptable = request.getHeaders().getQualityCSV(HttpHeader.ACCEPT, QuotedQualityCSV.MOST_SPECIFIC_MIME_ORDERING);
if (acceptable.isEmpty())

138
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ReHandlingErrorProcessor.java Normal file
View File

@ -0,0 +1,138 @@
//
// ========================================================================
// Copyright (c) 1995-2022 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.server.handler;
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.ExceptionUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* An ErrorProcessor that can re-handle a request at an error page location.
*/
public abstract class ReHandlingErrorProcessor extends ErrorProcessor
{
private static final Logger LOG = LoggerFactory.getLogger(ReHandlingErrorProcessor.class);
private final Handler _handler;
protected ReHandlingErrorProcessor(Handler handler)
{
_handler = handler;
}
@Override
public InvocationType getInvocationType()
{
return _handler.getInvocationType();
}
@Override
protected void generateResponse(Request request, Response response, int code, String message, Throwable cause, Callback callback) throws IOException
{
if (request.getAttribute(ReHandlingErrorProcessor.class.getName()) == null)
{
String pathInContext = getReHandlePathInContext(request, code, cause);
if (pathInContext != null)
{
request.setAttribute(ReHandlingErrorProcessor.class.getName(), pathInContext);
HttpURI uri = Request.updateHttpURI(request, pathInContext);
Request.Wrapper wrapper = new ReHandleRequestWrapper(request, uri);
try
{
Request.Processor processor = _handler.handle(wrapper);
if (processor != null)
{
response.setStatus(200);
processor.process(wrapper, response, callback);
return;
}
}
catch (Exception e)
{
if (LOG.isDebugEnabled())
LOG.debug("Unable to process error {}", wrapper, e);
if (cause != null && ExceptionUtil.areNotAssociated(cause, e))
cause.addSuppressed(e);
response.setStatus(code);
}
}
}
super.generateResponse(request, response, code, message, cause, callback);
}
protected abstract String getReHandlePathInContext(Request request, int code, Throwable cause);
/**
* An ErrorPageErrorProcessor that uses a map of error codes to select a page.
*/
public static class ByHttpStatus extends ReHandlingErrorProcessor
{
private final Map<Integer, String> _statusMap = new ConcurrentHashMap<>();
public ByHttpStatus(Handler handler)
{
super(handler);
}
@Override
protected String getReHandlePathInContext(Request request, int code, Throwable cause)
{
return get(code);
}
public String put(int code, String pathInContext)
{
return _statusMap.put(code, pathInContext);
}
public String get(int code)
{
return _statusMap.get(code);
}
public String remove(int code)
{
return _statusMap.remove(code);
}
}
private static class ReHandleRequestWrapper extends Request.Wrapper
{
private final HttpURI _uri;
public ReHandleRequestWrapper(Request request, HttpURI uri)
{
super(request);
_uri = uri;
}
@Override
public HttpURI getHttpURI()
{
return _uri;
}
}
}

8
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java
View File

@ -796,7 +796,7 @@ public class HttpChannelState implements HttpChannel, Components
return _loggedRequest == null ? this : _loggedRequest;
}
HttpStream getStream()
HttpStream getHttpStream()
{
return getHttpChannel()._stream;
}
@ -1007,7 +1007,7 @@ public class HttpChannelState implements HttpChannel, Components
@Override
public void push(MetaData.Request request)
{
getStream().push(request);
getHttpStream().push(request);
}
@Override
@ -1041,7 +1041,7 @@ public class HttpChannelState implements HttpChannel, Components
@Override
public TunnelSupport getTunnelSupport()
{
return getStream().getTunnelSupport();
return getHttpStream().getTunnelSupport();
}
@Override
@ -1462,7 +1462,7 @@ public class HttpChannelState implements HttpChannel, Components
public InvocationType getInvocationType()
{
// TODO review this as it is probably not correct
return _request.getStream().getInvocationType();
return _request.getHttpStream().getInvocationType();
}
}

111
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ErrorProcessorTest.java
View File

@ -25,11 +25,13 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.eclipse.jetty.http.BadMessageException;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpTester;
import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.io.QuietException;
import org.eclipse.jetty.logging.StacklessLogging;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.ErrorProcessor;
import org.eclipse.jetty.server.handler.ReHandlingErrorProcessor;
import org.eclipse.jetty.server.internal.HttpChannelState;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
@ -111,6 +113,17 @@ public class ErrorProcessorTest
throw new TestException(message);
}
// 200 response
if (Request.getPathInContext(request).startsWith("/ok/"))
{
Content.Sink.write(
response,
true,
"%s Error %s : %s%n".formatted(Request.getPathInContext(request), request.getAttribute(ErrorProcessor.ERROR_STATUS), request.getAttribute(ErrorProcessor.ERROR_MESSAGE)),
callback);
return;
}
Response.writeError(request, response, callback, 404);
}
});
@ -689,6 +702,104 @@ public class ErrorProcessorTest
assertThat(response, containsString("Server Error"));
}
@Test
public void testRootReHandlingErrorProcessor() throws Exception
{
ReHandlingErrorProcessor.ByHttpStatus errorProcessor = new ReHandlingErrorProcessor.ByHttpStatus(server);
errorProcessor.put(400, "/ok/badMessage");
server.setErrorProcessor(errorProcessor);
String rawResponse = connector.getResponse("""
GET /no/host HTTP/1.1
""");
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(200));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), containsString("/ok/badMessage Error 400 : No Host"));
}
@Test
public void testRootReHandlingErrorProcessorLoop() throws Exception
{
ReHandlingErrorProcessor.ByHttpStatus errorProcessor = new ReHandlingErrorProcessor.ByHttpStatus(server);
errorProcessor.put(404, "/not/found");
server.setErrorProcessor(errorProcessor);
String rawResponse = connector.getResponse("""
GET /not/found HTTP/1.1
Host: localhost
""");
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(404));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), containsString("<title>Error 404 Not Found</title>"));
}
@Test
public void testRootReHandlingErrorProcessorExceptionLoop() throws Exception
{
ReHandlingErrorProcessor.ByHttpStatus errorProcessor = new ReHandlingErrorProcessor.ByHttpStatus(server);
errorProcessor.put(444, "/badmessage/444");
server.setErrorProcessor(errorProcessor);
String rawResponse = connector.getResponse("""
GET /badmessage/444 HTTP/1.1
Host: localhost
""");
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(444));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), containsString("<title>Error 444</title>"));
}
@Test
public void testContextReHandlingErrorProcessor() throws Exception
{
server.stop();
ContextHandler context = new ContextHandler("/ctx");
context.setHandler(server.getHandler());
ContextHandlerCollection contexts = new ContextHandlerCollection();
contexts.addHandler(context);
server.setHandler(contexts);
server.setErrorProcessor(new ErrorProcessor()
{
@Override
public void process(Request request, Response response, Callback callback)
{
throw new UnsupportedOperationException();
}
});
server.start();
ReHandlingErrorProcessor.ByHttpStatus errorProcessor = new ReHandlingErrorProcessor.ByHttpStatus(context);
errorProcessor.put(444, "/ok/badMessage");
context.setErrorProcessor(errorProcessor);
String rawResponse = connector.getResponse("""
GET /ctx/badmessage/444 HTTP/1.1
Host: localhost
""");
HttpTester.Response response = HttpTester.parseResponse(rawResponse);
assertThat(response.getStatus(), is(200));
assertThat(response.getField(HttpHeader.CONTENT_LENGTH).getIntValue(), greaterThan(0));
assertThat(response.getContent(), containsString("/ok/badMessage Error 444"));
}
static class TestException extends RuntimeException implements QuietException
{
public TestException(String message)

91
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/DefaultServlet.java
View File

@ -54,19 +54,13 @@ import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpHeaderValue;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.http.MetaData;
import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.io.ByteBufferInputStream;
import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.server.Components;
import org.eclipse.jetty.server.ConnectionMetaData;
import org.eclipse.jetty.server.Context;
import org.eclipse.jetty.server.HttpStream;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.ResourceContentFactory;
import org.eclipse.jetty.server.ResourceService;
import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.server.TunnelSupport;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.util.Blocker;
import org.eclipse.jetty.util.BufferUtil;
@ -373,7 +367,7 @@ public class DefaultServlet extends HttpServlet
if (coreResponse.isCommitted())
{
if (LOG.isDebugEnabled())
LOG.debug("Response already committed for {}", coreRequest._request.getHttpURI());
LOG.debug("Response already committed for {}", coreRequest.getHttpURI());
return;
}
@ -420,20 +414,19 @@ public class DefaultServlet extends HttpServlet
doGet(req, resp);
}
private static class ServletCoreRequest implements Request
private static class ServletCoreRequest extends Request.Wrapper
{
// TODO fully implement this class and move it to the top level
// TODO Some methods are directed to core that probably should be intercepted
private final HttpServletRequest _servletRequest;
private final Request _request;
private final HttpURI _uri;
private final HttpFields _httpFields;
private final HttpURI _uri;
ServletCoreRequest(HttpServletRequest request)
{
super(ServletContextRequest.getServletContextRequest(request));
_servletRequest = request;
_request = ServletContextRequest.getServletContextRequest(request);
HttpFields.Mutable fields = HttpFields.build();
@ -449,10 +442,9 @@ public class DefaultServlet extends HttpServlet
}
}
_httpFields = fields.asImmutable();
_uri = (request.getDispatcherType() == DispatcherType.REQUEST)
? _request.getHttpURI()
: Request.updateHttpURI(_request, URIUtil.addPaths(_servletRequest.getServletPath(), _servletRequest.getPathInfo()));
? getWrapped().getHttpURI()
: Request.updateHttpURI(getWrapped(), URIUtil.addPaths(_servletRequest.getServletPath(), _servletRequest.getPathInfo()));
}
@Override
@ -461,102 +453,36 @@ public class DefaultServlet extends HttpServlet
return _httpFields;
}
@Override
public HttpFields getTrailers()
{
return _request.getTrailers();
}
@Override
public HttpURI getHttpURI()
{
return _uri;
}
@Override
public void demand(Runnable demandCallback)
{
_request.demand(demandCallback);
}
@Override
public void fail(Throwable failure)
{
_request.fail(failure);
}
@Override
public String getId()
{
return _servletRequest.getRequestId();
}
@Override
public Components getComponents()
{
return _request.getComponents();
}
@Override
public ConnectionMetaData getConnectionMetaData()
{
return _request.getConnectionMetaData();
}
@Override
public String getMethod()
{
return _servletRequest.getMethod();
}
@Override
public Context getContext()
{
return _request.getContext();
}
@Override
public long getTimeStamp()
{
return _request.getTimeStamp();
}
@Override
public boolean isSecure()
{
return _servletRequest.isSecure();
}
@Override
public Content.Chunk read()
{
return _request.read();
}
@Override
public boolean isPushSupported()
{
return _request.isPushSupported();
}
@Override
public void push(MetaData.Request request)
{
this._request.push(request);
}
@Override
public boolean addErrorListener(Predicate<Throwable> onError)
{
return false;
}
@Override
public TunnelSupport getTunnelSupport()
{
return _request.getTunnelSupport();
}
@Override
public void addHttpStreamWrapper(Function<HttpStream, HttpStream.Wrapper> wrapper)
{
@ -962,7 +888,8 @@ public class DefaultServlet extends HttpServlet
return null;
}
String requestTarget = isPathInfoOnly() ? request.getPathInfo() : Request.getPathInContext(coreRequest);
String pathInContext = Request.getPathInContext(coreRequest);
String requestTarget = isPathInfoOnly() ? request.getPathInfo() : pathInContext;
String welcomeServlet = null;
Resource base = _baseResource.resolve(requestTarget);
@ -971,7 +898,7 @@ public class DefaultServlet extends HttpServlet
for (String welcome : welcomes)
{
Resource welcomePath = base.resolve(welcome);
String welcomeInContext = URIUtil.addPaths(Request.getPathInContext(coreRequest), welcome);
String welcomeInContext = URIUtil.addPaths(pathInContext, welcome);
if (Resources.isReadableFile(welcomePath))
return welcomeInContext;

2
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletChannel.java
View File

@ -838,8 +838,6 @@ public class ServletChannel implements Runnable
/**
* If a write or similar operation to this channel fails,
* then this method should be called.
* <p>
* The standard implementation calls {@code HttpTransport#abort(Throwable)}.
*
* @param failure the failure that caused the abort.
*/

9
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannel.java
View File

@ -65,13 +65,8 @@ import org.slf4j.LoggerFactory;
import static org.eclipse.jetty.util.thread.Invocable.InvocationType.NON_BLOCKING;
/**
* HttpChannel represents a single endpoint for HTTP semantic processing.
* The HttpChannel is both an HttpParser.RequestHandler, where it passively receives events from
* an incoming HTTP request, and a Runnable, where it actively takes control of the request/response
* life cycle and calls the application (perhaps suspending and resuming with multiple calls to run).
* The HttpChannel signals the switch from passive mode to active mode by returning true to one of the
* HttpParser.RequestHandler callbacks. The completion of the active phase is signalled by a call to
* HttpTransport.completed().
* <p>The state machine that processes a request/response
* cycle interpreting the HTTP and Servlet semantic.</p>
*/
public class HttpChannel implements Runnable, HttpOutput.Interceptor
{

8
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/PushBuilderImpl.java
View File

@ -35,15 +35,15 @@ import org.slf4j.LoggerFactory;
public class PushBuilderImpl implements PushBuilder
{
private static final Logger LOG = LoggerFactory.getLogger(PushBuilderImpl.class);
private static final HttpField JETTY_PUSH = new HttpField("x-http2-push", "PushBuilder");
private static EnumSet<HttpMethod> UNSAFE_METHODS = EnumSet.of(
private static final EnumSet<HttpMethod> UNSAFE_METHODS = EnumSet.of(
HttpMethod.POST,
HttpMethod.PUT,
HttpMethod.DELETE,
HttpMethod.CONNECT,
HttpMethod.OPTIONS,
HttpMethod.TRACE);
HttpMethod.TRACE
);
private final Request _request;
private final HttpFields.Mutable _fields;
@ -51,7 +51,6 @@ public class PushBuilderImpl implements PushBuilder
private String _queryString;
private String _sessionId;
private String _path;
private String _lastModified;
public PushBuilderImpl(Request request, HttpFields fields, String method, String queryString, String sessionId)
{
@ -190,6 +189,5 @@ public class PushBuilderImpl implements PushBuilder
_request.getHttpChannel().getCoreRequest().push(push);
_path = null;
_lastModified = null;
}
}