* Food is declared as part of WebSocketScope, and as such, only 1 instance of it can exist.
+ * @throws Exception on test failure
*/
@Test
public void testScopeBehavior() throws Exception
diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml
index 279de82909d..b1cd311412e 100644
--- a/jetty-cdi/pom.xml
+++ b/jetty-cdi/pom.xml
@@ -2,7 +2,7 @@
Processes a new connection making it idle or active depending on whether requests are waiting to be sent. A new connection is created when a request needs to be executed; it is possible that the request that
- * triggered the request creation is executed by another connection that was just released, so the new connection
- * may become idle. If a request is waiting to be executed, it will be dequeued and executed by the new connection. A {@link ConnectionPool} that validates connections before
+ * A connection pool that validates connections before
* making them available for use. Connections that have just been opened are not validated.
* Connections that are {@link #release(Connection) released} will
@@ -56,7 +56,7 @@ import org.eclipse.jetty.util.thread.Scheduler;
* tuning the idle timeout of the servers to be larger than
* that of the client.
Example usage:
+ *
+ * MultiPartContentProvider multiPart = new MultiPartContentProvider();
+ * multiPart.addFieldPart("field", new StringContentProvider("foo"), null);
+ * multiPart.addFilePart("icon", "img.png", new PathContentProvider(Paths.get("/tmp/img.png")), null);
+ * multiPart.close();
+ * ContentResponse response = client.newRequest("localhost", connector.getLocalPort())
+ * .method(HttpMethod.POST)
+ * .content(multiPart)
+ * .send();
+ *
+ * The above example would be the equivalent of submitting this form:
+ *+ * <form method="POST" enctype="multipart/form-data" accept-charset="UTF-8"> + * <input type="text" name="field" value="foo" /> + * <input type="file" name="icon" /> + * </form> + *+ */ +public class MultiPartContentProvider extends AbstractTypedContentProvider implements AsyncContentProvider, Closeable +{ + private static final Logger LOG = Log.getLogger(MultiPartContentProvider.class); + private static final byte[] COLON_SPACE_BYTES = new byte[]{':', ' '}; + private static final byte[] CR_LF_BYTES = new byte[]{'\r', '\n'}; + + private final List
Adds a field part with the given {@code name} as field name, and the given + * {@code content} as part content.
+ *The {@code Content-Type} of this part will be obtained from:
+ *Adds a file part with the given {@code name} as field name, the given + * {@code fileName} as file name, and the given {@code content} as part content.
+ *The {@code Content-Type} of this part will be obtained from:
+ *
+ * struct begin_request_body {
+ * ushort role;
+ * ubyte flags;
+ * ubyte[5] reserved;
+ * }
+ *
+ */
public class BeginRequestContentParser extends ContentParser
{
private final ServerParser.Listener listener;
diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
index b8173bf4948..dc07bd544ec 100644
--- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
+++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/EndRequestContentParser.java
@@ -20,6 +20,16 @@ package org.eclipse.jetty.fcgi.parser;
import java.nio.ByteBuffer;
+/**
+ * Parser for the END_REQUEST frame body.
+ *
+ * struct end_request_body {
+ * uint applicationStatus;
+ * ubyte protocolStatus;
+ * ubyte[3] reserved;
+ * }
+ *
+ */
public class EndRequestContentParser extends ContentParser
{
private final Parser.Listener listener;
@@ -80,7 +90,7 @@ public class EndRequestContentParser extends ContentParser
}
else
{
- state = State.APPLICATION_BYTES;
+ state = State.RESERVED_BYTES;
cursor = 0;
break;
}
@@ -88,7 +98,7 @@ public class EndRequestContentParser extends ContentParser
case RESERVED_BYTES:
{
buffer.get();
- if (++cursor == 0)
+ if (++cursor == 3)
{
onEnd();
reset();
diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
index 078105a9f37..7d431125694 100644
--- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
+++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/HeaderParser.java
@@ -21,9 +21,28 @@ package org.eclipse.jetty.fcgi.parser;
import java.nio.ByteBuffer;
import org.eclipse.jetty.fcgi.FCGI;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+/**
+ * Parser for FastCGI frame headers.
+ *
+ * struct frame_header {
+ * ubyte version;
+ * ubyte type;
+ * ushort requestId;
+ * ushort contentLength;
+ * ubyte paddingLength;
+ * ubyte reserved;
+ * }
+ *
+ *
+ * @see Parser
+ */
public class HeaderParser
{
+ private static final Logger LOG = Log.getLogger(Parser.class);
+
private State state = State.VERSION;
private int cursor;
private int version;
@@ -109,6 +128,8 @@ public class HeaderParser
case RESERVED:
{
buffer.get();
+ if (LOG.isDebugEnabled())
+ LOG.debug("Parsed request {} header {} length={}", getRequest(), getFrameType(), getContentLength());
return true;
}
default:
diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
index 4678ad5ebe6..dcf34fefc8a 100644
--- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
+++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ParamsContentParser.java
@@ -20,11 +20,44 @@ package org.eclipse.jetty.fcgi.parser;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.eclipse.jetty.http.HttpField;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
+/**
+ * Parser for the PARAMS frame body.
+ *
+ * struct small_name_small_value_params_body {
+ * ubyte nameLength;
+ * ubyte valueLength;
+ * ubyte[] nameBytes;
+ * ubyte[] valueBytes;
+ * }
+ *
+ * struct small_name_large_value_params_body {
+ * ubyte nameLength;
+ * uint valueLength;
+ * ubyte[] nameBytes;
+ * ubyte[] valueBytes;
+ * }
+ *
+ * struct large_name_small_value_params_body {
+ * uint nameLength;
+ * ubyte valueLength;
+ * ubyte[] nameBytes;
+ * ubyte[] valueBytes;
+ * }
+ *
+ * struct large_name_large_value_params_body {
+ * uint nameLength;
+ * uint valueLength;
+ * ubyte[] nameBytes;
+ * ubyte[] valueBytes;
+ * }
+ *
+ */
public class ParamsContentParser extends ContentParser
{
private static final Logger LOG = Log.getLogger(ParamsContentParser.class);
@@ -179,7 +212,7 @@ public class ParamsContentParser extends ContentParser
}
case PARAM:
{
- Charset utf8 = Charset.forName("UTF-8");
+ Charset utf8 = StandardCharsets.UTF_8;
onParam(new String(nameBytes, utf8), new String(valueBytes, utf8));
partialReset();
if (length == 0)
diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
index cb86d660a6f..be2ac480c6a 100644
--- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
+++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/Parser.java
@@ -22,9 +22,33 @@ import java.nio.ByteBuffer;
import org.eclipse.jetty.fcgi.FCGI;
import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
+/**
+ * The FastCGI protocol exchanges frames.
+ *
+ * struct frame {
+ * ubyte version;
+ * ubyte type;
+ * ushort requestId;
+ * ushort contentLength;
+ * ubyte paddingLength;
+ * ubyte reserved;
+ * ubyte[] content;
+ * ubyte[] padding;
+ * }
+ *
+ * Depending on the {@code type}, the content may have a different format, + * so there are specialized content parsers.
+ * + * @see HeaderParser + * @see ContentParser + */ public abstract class Parser { + private static final Logger LOG = Log.getLogger(Parser.class); + protected final HeaderParser headerParser = new HeaderParser(); private State state = State.HEADER; private int padding; @@ -56,6 +80,9 @@ public abstract class Parser else { ContentParser.Result result = contentParser.parse(buffer); + if (LOG.isDebugEnabled()) + LOG.debug("Parsed request {} content {} result={}", headerParser.getRequest(), headerParser.getFrameType(), result); + if (result == ContentParser.Result.PENDING) { // Not enough data, signal to read/parse more. diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java index a31ad2d5233..6d0fefae64f 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java @@ -18,11 +18,13 @@ package org.eclipse.jetty.fcgi.parser; +import java.io.EOFException; import java.nio.ByteBuffer; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jetty.fcgi.FCGI; +import org.eclipse.jetty.http.BadMessageException; import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; @@ -32,6 +34,14 @@ import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; +/** + *The parser for STDOUT type frame bodies.
+ *STDOUT frame bodies contain both the HTTP headers (but not the response line) + * and the HTTP content (either Content-Length delimited or chunked).
+ *For this reason, a special HTTP parser is used to parse the frames body. + * This special HTTP parser is configured to skip the response line, and to + * parse HTTP headers and HTTP content.
+ */ public class ResponseContentParser extends StreamContentParser { private static final Logger LOG = Log.getLogger(ResponseContentParser.class); @@ -89,12 +99,12 @@ public class ResponseContentParser extends StreamContentParser public boolean parse(ByteBuffer buffer) { - if (LOG.isDebugEnabled()) - LOG.debug("Response {} {} content {} {}", request, FCGI.StreamType.STD_OUT, state, buffer); - int remaining = buffer.remaining(); while (remaining > 0) { + if (LOG.isDebugEnabled()) + LOG.debug("Response {} {}, state {} {}", request, FCGI.StreamType.STD_OUT, state, buffer); + switch (state) { case HEADERS: @@ -245,12 +255,12 @@ public class ResponseContentParser extends StreamContentParser { if (!seenResponseCode) { - // No Status header but we have other headers, assume 200 OK + // No Status header but we have other headers, assume 200 OK. notifyBegin(200, "OK"); notifyHeaders(fields); } notifyHeaders(); - // Return from parsing so that we can parse the content + // Return from HTTP parsing so that we can parse the content. return true; } @@ -277,21 +287,34 @@ public class ResponseContentParser extends StreamContentParser @Override public boolean messageComplete() { - // Return from parsing so that we can parse the next headers or the raw content. - // No need to notify the listener because it will be done by FCGI_END_REQUEST. - return true; + // No need to notify the end of the response to the + // listener because it will be done by FCGI_END_REQUEST. + return false; } @Override public void earlyEOF() { - // TODO + fail(new EOFException()); } @Override public void badMessage(int status, String reason) { - // TODO + fail(new BadMessageException(status, reason)); + } + + protected void fail(Throwable failure) + { + try + { + listener.onFailure(request, failure); + } + catch (Throwable x) + { + if (LOG.isDebugEnabled()) + LOG.debug("Exception while invoking listener " + listener, x); + } } } diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java index a341013c2e0..70602a626a7 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/StreamContentParser.java @@ -24,6 +24,10 @@ import org.eclipse.jetty.fcgi.FCGI; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; +/** + *A stream content parser parses frame bodies of type STDIN, STDOUT and STDERR.
+ *STDOUT frame bodies are handled specially by {@link ResponseContentParser}.
+ */
public class StreamContentParser extends ContentParser
{
private static final Logger LOG = Log.getLogger(StreamContentParser.class);
diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml
index cbad4c07f2b..271ef70033b 100644
--- a/jetty-fcgi/fcgi-server/pom.xml
+++ b/jetty-fcgi/fcgi-server/pom.xml
@@ -3,7 +3,7 @@
Removes the given {@code stream}. Enqueues the given frames to be written to the connection. Sends the given PRIORITY {@code frame}. If the {@code frame} references a {@code streamId} that does not exist
+ * (for example {@code 0}), then a new {@code streamId} will be allocated, to
+ * support unused anchor streams that act as parent for other streams. Sends the given SETTINGS {@code frame} to configure the session. Callback method invoked when the preface has been received. Callback method invoked: Creates a new {@code HEADERS} frame with an unspecified stream {@code id}. The stream {@code id} will be generated by the implementation while sending
+ * this frame to the other peer. Creates a new {@code HEADERS} frame with the specified stream {@code id}. {@code HEADERS} frames with a specific stream {@code id} are typically used
+ * in responses to request {@code HEADERS} frames. The standard HTTP/1.1 upgrade path. This is not thread safe and may only be called by 1 thread at a time
+ * This is not thread safe and may only be called by 1 thread at a time.
+ *
+ *
+ *
+ * @param session
+ * @return
+ */
+ private Key makeKey (String id, ContextId context)
+ {
+ String key = context.getCanonicalContextPath()+"_"+context.getVhost()+"_"+id;
+ return _keyFactory.newKey(key);
+ }
+
+
+ /**
+ * Generate a gcloud datastore Entity from SessionData
+ * @param session
+ * @param key
+ * @return
+ * @throws Exception
+ */
+ private Entity entityFromSession (SessionData session, Key key) throws Exception
+ {
+ if (session == null)
+ return null;
+
+ Entity entity = null;
+
+ //serialize the attribute map
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(session.getAllAttributes());
+ oos.flush();
+
+ //turn a session into an entity
+ entity = Entity.builder(key)
+ .set(ID, session.getId())
+ .set(CONTEXTPATH, session.getContextPath())
+ .set(VHOST, session.getVhost())
+ .set(ACCESSED, session.getAccessed())
+ .set(LASTACCESSED, session.getLastAccessed())
+ .set(CREATETIME, session.getCreated())
+ .set(COOKIESETTIME, session.getCookieSet())
+ .set(LASTNODE,session.getLastNode())
+ .set(EXPIRY, session.getExpiry())
+ .set(MAXINACTIVE, session.getMaxInactiveMs())
+ .set(ATTRIBUTES, Blob.copyFrom(baos.toByteArray())).build();
+
+ return entity;
+ }
+
+ /**
+ * Generate SessionData from an Entity retrieved from gcloud datastore.
+ * @param entity
+ * @return
+ * @throws Exception
+ */
+ private SessionData sessionFromEntity (Entity entity) throws Exception
+ {
+ if (entity == null)
+ return null;
+
+ final AtomicReference
+ *
*
* @param session the session
* @return a (possibly empty or null) map containing SETTINGS configuration
- * options that are sent after the preface.
+ * options to send.
*/
public Map
true if there are bytes remaining to be read from the encoded input
@@ -390,15 +340,14 @@ public class ByteArrayEndPoint extends AbstractEndPoint
public int fill(ByteBuffer buffer) throws IOException
{
int filled=0;
- boolean close=false;
try(Locker.Lock lock = _locker.lock())
{
while(true)
{
- if (_closed)
+ if (!isOpen())
throw new EofException("CLOSED");
- if (_ishut)
+ if (isInputShutdown())
return -1;
if (_inQ.isEmpty())
@@ -407,9 +356,6 @@ public class ByteArrayEndPoint extends AbstractEndPoint
ByteBuffer in= _inQ.peek();
if (in==EOF)
{
- _ishut=true;
- if (_oshut)
- close=_closed=true;
filled=-1;
break;
}
@@ -425,10 +371,10 @@ public class ByteArrayEndPoint extends AbstractEndPoint
}
}
- if (close)
- super.close();
if (filled>0)
notIdle();
+ else if (filled<0)
+ shutdownInput();
return filled;
}
@@ -439,9 +385,9 @@ public class ByteArrayEndPoint extends AbstractEndPoint
@Override
public boolean flush(ByteBuffer... buffers) throws IOException
{
- if (_closed)
+ if (!isOpen())
throw new IOException("CLOSED");
- if (_oshut)
+ if (isOutputShutdown())
throw new IOException("OSHUT");
boolean flushed=true;
@@ -483,13 +429,12 @@ public class ByteArrayEndPoint extends AbstractEndPoint
*/
public void reset()
{
- getFillInterest().onClose();
- getWriteFlusher().onClose();
- _ishut=false;
- _oshut=false;
- _closed=false;
- _inQ.clear();
+ try(Locker.Lock lock = _locker.lock())
+ {
+ _inQ.clear();
+ }
BufferUtil.clear(_out);
+ super.reset();
}
/* ------------------------------------------------------------ */
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
index 306e74fb0e2..f51e038c576 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
@@ -19,37 +19,104 @@
package org.eclipse.jetty.io;
import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
import java.nio.ByteBuffer;
import java.nio.channels.ByteChannel;
-import java.nio.channels.SocketChannel;
+import java.nio.channels.CancelledKeyException;
+import java.nio.channels.GatheringByteChannel;
+import java.nio.channels.SelectionKey;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
+import org.eclipse.jetty.util.thread.Locker;
import org.eclipse.jetty.util.thread.Scheduler;
/**
* Channel End Point.
* Holds the channel and socket for an NIO endpoint.
*/
-public class ChannelEndPoint extends AbstractEndPoint
+public abstract class ChannelEndPoint extends AbstractEndPoint implements ManagedSelector.Selectable
{
private static final Logger LOG = Log.getLogger(ChannelEndPoint.class);
- private final SocketChannel _channel;
- private final Socket _socket;
- private volatile boolean _ishut;
- private volatile boolean _oshut;
+ private final Locker _locker = new Locker();
+ private final ByteChannel _channel;
+ private final GatheringByteChannel _gather;
+ protected final ManagedSelector _selector;
+ protected final SelectionKey _key;
- public ChannelEndPoint(Scheduler scheduler,SocketChannel channel)
+ private boolean _updatePending;
+
+ /**
+ * The current value for {@link SelectionKey#interestOps()}.
+ */
+ protected int _currentInterestOps;
+
+ /**
+ * The desired value for {@link SelectionKey#interestOps()}.
+ */
+ protected int _desiredInterestOps;
+
+
+ private abstract class RunnableTask implements Runnable
{
- super(scheduler,
- (InetSocketAddress)channel.socket().getLocalSocketAddress(),
- (InetSocketAddress)channel.socket().getRemoteSocketAddress());
+ final String _operation;
+ RunnableTask(String op)
+ {
+ _operation=op;
+ }
+
+ @Override
+ public String toString()
+ {
+ return ChannelEndPoint.this.toString()+":"+_operation;
+ }
+ }
+
+ private final Runnable _runUpdateKey = new RunnableTask("runUpdateKey")
+ {
+ @Override
+ public void run()
+ {
+ updateKey();
+ }
+ };
+
+ private final Runnable _runFillable = new RunnableTask("runFillable")
+ {
+ @Override
+ public void run()
+ {
+ getFillInterest().fillable();
+ }
+ };
+
+ private final Runnable _runCompleteWrite = new RunnableTask("runCompleteWrite")
+ {
+ @Override
+ public void run()
+ {
+ getWriteFlusher().completeWrite();
+ }
+ };
+
+ private final Runnable _runFillableCompleteWrite = new RunnableTask("runFillableCompleteWrite")
+ {
+ @Override
+ public void run()
+ {
+ getFillInterest().fillable();
+ getWriteFlusher().completeWrite();
+ }
+ };
+
+ public ChannelEndPoint(ByteChannel channel, ManagedSelector selector, SelectionKey key, Scheduler scheduler)
+ {
+ super(scheduler);
_channel=channel;
- _socket=channel.socket();
+ _selector=selector;
+ _key=key;
+ _gather=(channel instanceof GatheringByteChannel)?(GatheringByteChannel)channel:null;
}
@Override
@@ -64,60 +131,11 @@ public class ChannelEndPoint extends AbstractEndPoint
return _channel.isOpen();
}
- protected void shutdownInput()
+ @Override
+ public void doClose()
{
if (LOG.isDebugEnabled())
- LOG.debug("ishut {}", this);
- _ishut=true;
- if (_oshut)
- close();
- }
-
- @Override
- public void shutdownOutput()
- {
- if (LOG.isDebugEnabled())
- LOG.debug("oshut {}", this);
- _oshut = true;
- if (_channel.isOpen())
- {
- try
- {
- if (!_socket.isOutputShutdown())
- _socket.shutdownOutput();
- }
- catch (IOException e)
- {
- LOG.debug(e);
- }
- finally
- {
- if (_ishut)
- {
- close();
- }
- }
- }
- }
-
- @Override
- public boolean isOutputShutdown()
- {
- return _oshut || !_channel.isOpen() || _socket.isOutputShutdown();
- }
-
- @Override
- public boolean isInputShutdown()
- {
- return _ishut || !_channel.isOpen() || _socket.isInputShutdown();
- }
-
- @Override
- public void close()
- {
- super.close();
- if (LOG.isDebugEnabled())
- LOG.debug("close {}", this);
+ LOG.debug("doClose {}", this);
try
{
_channel.close();
@@ -128,15 +146,29 @@ public class ChannelEndPoint extends AbstractEndPoint
}
finally
{
- _ishut=true;
- _oshut=true;
+ super.doClose();
}
}
+
+ @Override
+ public void onClose()
+ {
+ try
+ {
+ super.onClose();
+ }
+ finally
+ {
+ if (_selector!=null)
+ _selector.onClose(this);
+ }
+ }
+
@Override
public int fill(ByteBuffer buffer) throws IOException
{
- if (_ishut)
+ if (isInputShutdown())
return -1;
int pos=BufferUtil.flipToFill(buffer);
@@ -173,8 +205,8 @@ public class ChannelEndPoint extends AbstractEndPoint
{
if (buffers.length==1)
flushed=_channel.write(buffers[0]);
- else if (buffers.length>1)
- flushed=_channel.write(buffers,0,buffers.length);
+ else if (_gather!=null && buffers.length>1)
+ flushed=_gather.write(buffers,0,buffers.length);
else
{
for (ByteBuffer b : buffers)
@@ -218,20 +250,160 @@ public class ChannelEndPoint extends AbstractEndPoint
return _channel;
}
- public Socket getSocket()
+
+ @Override
+ protected void needsFillInterest()
{
- return _socket;
+ changeInterests(SelectionKey.OP_READ);
}
@Override
protected void onIncompleteFlush()
{
- throw new UnsupportedOperationException();
+ changeInterests(SelectionKey.OP_WRITE);
}
@Override
- protected void needsFillInterest() throws IOException
+ public Runnable onSelected()
{
- throw new UnsupportedOperationException();
+ /**
+ * This method may run concurrently with {@link #changeInterests(int)}.
+ */
+
+ int readyOps = _key.readyOps();
+ int oldInterestOps;
+ int newInterestOps;
+ try (Locker.Lock lock = _locker.lock())
+ {
+ _updatePending = true;
+ // Remove the readyOps, that here can only be OP_READ or OP_WRITE (or both).
+ oldInterestOps = _desiredInterestOps;
+ newInterestOps = oldInterestOps & ~readyOps;
+ _desiredInterestOps = newInterestOps;
+ }
+
+
+ boolean readable = (readyOps & SelectionKey.OP_READ) != 0;
+ boolean writable = (readyOps & SelectionKey.OP_WRITE) != 0;
+
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("onSelected {}->{} r={} w={} for {}", oldInterestOps, newInterestOps, readable, writable, this);
+
+ // Run non-blocking code immediately.
+ // This producer knows that this non-blocking code is special
+ // and that it must be run in this thread and not fed to the
+ // ExecutionStrategy, which could not have any thread to run these
+ // tasks (or it may starve forever just after having run them).
+ if (readable && getFillInterest().isCallbackNonBlocking())
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("Direct readable run {}",this);
+ _runFillable.run();
+ readable = false;
+ }
+ if (writable && getWriteFlusher().isCallbackNonBlocking())
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("Direct writable run {}",this);
+ _runCompleteWrite.run();
+ writable = false;
+ }
+
+ // return task to complete the job
+ Runnable task= readable ? (writable ? _runFillableCompleteWrite : _runFillable)
+ : (writable ? _runCompleteWrite : null);
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("task {}",task);
+ return task;
}
+
+ @Override
+ public void updateKey()
+ {
+ /**
+ * This method may run concurrently with {@link #changeInterests(int)}.
+ */
+
+ try
+ {
+ int oldInterestOps;
+ int newInterestOps;
+ try (Locker.Lock lock = _locker.lock())
+ {
+ _updatePending = false;
+ oldInterestOps = _currentInterestOps;
+ newInterestOps = _desiredInterestOps;
+ if (oldInterestOps != newInterestOps)
+ {
+ _currentInterestOps = newInterestOps;
+ _key.interestOps(newInterestOps);
+ }
+ }
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("Key interests updated {} -> {} on {}", oldInterestOps, newInterestOps, this);
+ }
+ catch (CancelledKeyException x)
+ {
+ LOG.debug("Ignoring key update for concurrently closed channel {}", this);
+ close();
+ }
+ catch (Throwable x)
+ {
+ LOG.warn("Ignoring key update for " + this, x);
+ close();
+ }
+ }
+
+ private void changeInterests(int operation)
+ {
+ /**
+ * This method may run concurrently with
+ * {@link #updateKey()} and {@link #onSelected()}.
+ */
+
+ int oldInterestOps;
+ int newInterestOps;
+ boolean pending;
+ try (Locker.Lock lock = _locker.lock())
+ {
+ pending = _updatePending;
+ oldInterestOps = _desiredInterestOps;
+ newInterestOps = oldInterestOps | operation;
+ if (newInterestOps != oldInterestOps)
+ _desiredInterestOps = newInterestOps;
+ }
+
+ if (LOG.isDebugEnabled())
+ LOG.debug("changeInterests p={} {}->{} for {}", pending, oldInterestOps, newInterestOps, this);
+
+ if (!pending && _selector!=null)
+ _selector.submit(_runUpdateKey);
+ }
+
+
+ @Override
+ public String toString()
+ {
+ // We do a best effort to print the right toString() and that's it.
+ try
+ {
+ boolean valid = _key != null && _key.isValid();
+ int keyInterests = valid ? _key.interestOps() : -1;
+ int keyReadiness = valid ? _key.readyOps() : -1;
+ return String.format("%s{io=%d/%d,kio=%d,kro=%d}",
+ super.toString(),
+ _currentInterestOps,
+ _desiredInterestOps,
+ keyInterests,
+ keyReadiness);
+ }
+ catch (Throwable x)
+ {
+ return String.format("%s{io=%s,kio=-2,kro=-2}", super.toString(), _desiredInterestOps);
+ }
+ }
+
}
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnectionFactory.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnectionFactory.java
index 4a761d653d9..f0f87cc35d4 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnectionFactory.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ClientConnectionFactory.java
@@ -19,12 +19,8 @@
package org.eclipse.jetty.io;
import java.io.IOException;
-import java.nio.ByteBuffer;
import java.util.Map;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
-
/**
* Factory for client-side {@link Connection} instances.
*/
@@ -38,53 +34,4 @@ public interface ClientConnectionFactory
* @throws IOException if the connection cannot be created
*/
public Connection newConnection(EndPoint endPoint, Map
- * The {@code oldConnection} will be closed by invoking {@link org.eclipse.jetty.io.Connection#onClose()}
- * and the {@code newConnection} will be opened by invoking {@link org.eclipse.jetty.io.Connection#onOpen()}.
- * @param oldConnection the old connection to replace
- * @param newConnection the new connection replacement
- */
- public static void replaceConnection(Connection oldConnection, Connection newConnection)
- {
- close(oldConnection);
- oldConnection.getEndPoint().setConnection(newConnection);
- open(newConnection);
- }
-
- private static void open(Connection connection)
- {
- try
- {
- connection.onOpen();
- }
- catch (Throwable x)
- {
- LOG.debug(x);
- }
- }
-
- private static void close(Connection connection)
- {
- try
- {
- connection.onClose();
- }
- catch (Throwable x)
- {
- LOG.debug(x);
- }
- }
- }
}
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
index a0f7a5d29df..b47c59058e8 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
@@ -63,7 +63,7 @@ public interface Connection extends Closeable
public long getBytesOut();
public long getCreatedTimeStamp();
- public interface UpgradeFrom extends Connection
+ public interface UpgradeFrom
{
/* ------------------------------------------------------------ */
/** Take the input buffer from the connection on upgrade.
@@ -75,7 +75,7 @@ public interface Connection extends Closeable
ByteBuffer onUpgradeFrom();
}
- public interface UpgradeTo extends Connection
+ public interface UpgradeTo
{
/**
* Callback method invoked when this {@link Connection} is upgraded. Registers a server channel for accept operations.
* When a {@link SocketChannel} is accepted from the given {@link ServerSocketChannel}
- * then the {@link #accepted(SocketChannel)} method is called, which must be
+ * then the {@link #accepted(SelectableChannel)} method is called, which must be
* overridden by a derivation of this class to handle the accepted channel
*
* @param server the server channel to register
*/
- public void acceptor(ServerSocketChannel server)
+ public void acceptor(SelectableChannel server)
{
final ManagedSelector selector = chooseSelector(null);
selector.submit(selector.new Acceptor(server));
@@ -231,14 +236,14 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
/**
* Callback method when a channel is accepted from the {@link ServerSocketChannel}
- * passed to {@link #acceptor(ServerSocketChannel)}.
+ * passed to {@link #acceptor(SelectableChannel)}.
* The default impl throws an {@link UnsupportedOperationException}, so it must
* be overridden by subclasses if a server channel is provided.
*
* @param channel the
* @throws IOException if unable to accept channel
*/
- protected void accepted(SocketChannel channel) throws IOException
+ protected void accepted(SelectableChannel channel) throws IOException
{
throw new UnsupportedOperationException();
}
@@ -292,7 +297,6 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
*/
protected void endPointClosed(EndPoint endpoint)
{
- endpoint.onClose();
}
/**
@@ -332,10 +336,21 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
}
}
- protected boolean finishConnect(SocketChannel channel) throws IOException
+ protected boolean doFinishConnect(SelectableChannel channel) throws IOException
{
- return channel.finishConnect();
+ return ((SocketChannel)channel).finishConnect();
}
+
+ protected boolean isConnectionPending(SelectableChannel channel)
+ {
+ return ((SocketChannel)channel).isConnectionPending();
+ }
+
+ protected SelectableChannel doAccept(SelectableChannel server) throws IOException
+ {
+ return ((ServerSocketChannel)server).accept();
+ }
+
/**
* Callback method invoked when a non-blocking connect cannot be completed. Factory method to create {@link EndPoint}. This method is invoked as a result of the registration of a channel via {@link #connect(SocketChannel, Object)}
- * or {@link #accept(SocketChannel)}. This method is invoked as a result of the registration of a channel via {@link #connect(SelectableChannel, Object)}
+ * or {@link #accept(SelectableChannel)}. Factory method to create {@link Connection}.
@@ -199,9 +221,7 @@ public class LdapLoginModule extends AbstractLoginModule
pwdCredential = convertCredentialLdapToJetty(pwdCredential);
Credential credential = Credential.getCredential(pwdCredential);
- ListEndPoint is bound, or null
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java b/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
index 4eff032a8ab..8639ee8c91c 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
@@ -131,6 +131,8 @@ public abstract class FillInterest
public void onClose()
{
Callback callback = _interested.get();
+ if (LOG.isDebugEnabled())
+ LOG.debug("{} onClose {}",this,callback);
if (callback != null && _interested.compareAndSet(callback, null))
callback.failed(new ClosedChannelException());
}
@@ -138,7 +140,13 @@ public abstract class FillInterest
@Override
public String toString()
{
- return String.format("FillInterest@%x{%b,%s}", hashCode(), _interested.get(), _interested.get());
+ return String.format("FillInterest@%x{%b,%s}", hashCode(), _interested.get()!=null, _interested.get());
+ }
+
+
+ public String toStateString()
+ {
+ return _interested.get()==null?"-":"FI";
}
/**
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
index d2a33bff575..30d670c91af 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
@@ -23,10 +23,9 @@ import java.io.IOException;
import java.net.ConnectException;
import java.net.SocketTimeoutException;
import java.nio.channels.CancelledKeyException;
+import java.nio.channels.SelectableChannel;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collections;
@@ -77,12 +76,7 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
protected void doStart() throws Exception
{
super.doStart();
- _selector = newSelector();
- }
-
- protected Selector newSelector() throws IOException
- {
- return Selector.open();
+ _selector = _selectorManager.newSelector();
}
public int size()
@@ -137,10 +131,10 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
}
/**
- * A {@link SelectableEndPoint} is an {@link EndPoint} that wish to be
+ * A {@link Selectable} is an {@link EndPoint} that wish to be
* notified of non-blocking events by the {@link ManagedSelector}.
*/
- public interface SelectableEndPoint extends EndPoint
+ public interface Selectable
{
/**
* Callback method invoked when a read or write events has been
@@ -264,12 +258,14 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
if (key.isValid())
{
Object attachment = key.attachment();
+ if (LOG.isDebugEnabled())
+ LOG.debug("selected {} {} ",key,attachment);
try
{
- if (attachment instanceof SelectableEndPoint)
+ if (attachment instanceof Selectable)
{
// Try to produce a task
- Runnable task = ((SelectableEndPoint)attachment).onSelected();
+ Runnable task = ((Selectable)attachment).onSelected();
if (task != null)
return task;
}
@@ -323,8 +319,8 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
private void updateKey(SelectionKey key)
{
Object attachment = key.attachment();
- if (attachment instanceof SelectableEndPoint)
- ((SelectableEndPoint)attachment).updateKey();
+ if (attachment instanceof Selectable)
+ ((Selectable)attachment).updateKey();
}
}
@@ -334,11 +330,11 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
private Runnable processConnect(SelectionKey key, final Connect connect)
{
- SocketChannel channel = (SocketChannel)key.channel();
+ SelectableChannel channel = (SelectableChannel)key.channel();
try
{
key.attach(connect.attachment);
- boolean connected = _selectorManager.finishConnect(channel);
+ boolean connected = _selectorManager.doFinishConnect(channel);
if (LOG.isDebugEnabled())
LOG.debug("Connected {} {}", connected, channel);
if (connected)
@@ -375,14 +371,13 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
private void processAccept(SelectionKey key)
{
- ServerSocketChannel server = (ServerSocketChannel)key.channel();
- SocketChannel channel = null;
+ SelectableChannel server = key.channel();
+ SelectableChannel channel = null;
try
{
- while ((channel = server.accept()) != null)
- {
+ channel = _selectorManager.doAccept(server);
+ if (channel!=null)
_selectorManager.accepted(channel);
- }
}
catch (Throwable x)
{
@@ -404,7 +399,7 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
}
}
- private EndPoint createEndPoint(SocketChannel channel, SelectionKey selectionKey) throws IOException
+ private EndPoint createEndPoint(SelectableChannel channel, SelectionKey selectionKey) throws IOException
{
EndPoint endPoint = _selectorManager.newEndPoint(channel, this, selectionKey);
_selectorManager.endPointOpened(endPoint);
@@ -417,7 +412,7 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
return endPoint;
}
- public void destroyEndPoint(final EndPoint endPoint)
+ public void onClose(final EndPoint endPoint)
{
final Connection connection = endPoint.getConnection();
submit(new Product()
@@ -517,9 +512,9 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
class Acceptor implements Runnable
{
- private final ServerSocketChannel _channel;
+ private final SelectableChannel _channel;
- public Acceptor(ServerSocketChannel channel)
+ public Acceptor(SelectableChannel channel)
{
this._channel = channel;
}
@@ -543,10 +538,10 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
class Accept implements Runnable
{
- private final SocketChannel channel;
+ private final SelectableChannel channel;
private final Object attachment;
- Accept(SocketChannel channel, Object attachment)
+ Accept(SelectableChannel channel, Object attachment)
{
this.channel = channel;
this.attachment = attachment;
@@ -570,10 +565,10 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
private class CreateEndPoint implements Product
{
- private final SocketChannel channel;
+ private final SelectableChannel channel;
private final SelectionKey key;
- public CreateEndPoint(SocketChannel channel, SelectionKey key)
+ public CreateEndPoint(SelectableChannel channel, SelectionKey key)
{
this.channel = channel;
this.key = key;
@@ -603,11 +598,11 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
class Connect implements Runnable
{
private final AtomicBoolean failed = new AtomicBoolean();
- private final SocketChannel channel;
+ private final SelectableChannel channel;
private final Object attachment;
private final Scheduler.Task timeout;
- Connect(SocketChannel channel, Object attachment)
+ Connect(SelectableChannel channel, Object attachment)
{
this.channel = channel;
this.attachment = attachment;
@@ -650,8 +645,8 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
@Override
public void run()
{
- SocketChannel channel = connect.channel;
- if (channel.isConnectionPending())
+ SelectableChannel channel = connect.channel;
+ if (_selectorManager.isConnectionPending(channel))
{
if (LOG.isDebugEnabled())
LOG.debug("Channel {} timed out while connecting, closing it", channel);
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java
index d26f8d43288..3490c1c2bef 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java
@@ -108,9 +108,7 @@ public abstract class NegotiatingClientConnection extends AbstractConnection
EndPoint endPoint = getEndPoint();
try
{
- Connection oldConnection = endPoint.getConnection();
- Connection newConnection = connectionFactory.newConnection(endPoint, context);
- ClientConnectionFactory.Helper.replaceConnection(oldConnection, newConnection);
+ endPoint.upgrade(connectionFactory.newConnection(endPoint, context));
}
catch (Throwable x)
{
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
index b45c39b80e2..52473d7aef8 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
@@ -18,285 +18,24 @@
package org.eclipse.jetty.io;
-import java.nio.channels.CancelledKeyException;
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
-import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.util.thread.Locker;
import org.eclipse.jetty.util.thread.Scheduler;
/**
* An ChannelEndpoint that can be scheduled by {@link SelectorManager}.
*/
-public class SelectChannelEndPoint extends ChannelEndPoint implements ManagedSelector.SelectableEndPoint
+@Deprecated
+public class SelectChannelEndPoint extends SocketChannelEndPoint implements ManagedSelector.Selectable
{
public static final Logger LOG = Log.getLogger(SelectChannelEndPoint.class);
- private final Locker _locker = new Locker();
- private boolean _updatePending;
-
- /**
- * true if {@link ManagedSelector#destroyEndPoint(EndPoint)} has not been called
- */
- private final AtomicBoolean _open = new AtomicBoolean();
- private final ManagedSelector _selector;
- private final SelectionKey _key;
- /**
- * The current value for {@link SelectionKey#interestOps()}.
- */
- private int _currentInterestOps;
- /**
- * The desired value for {@link SelectionKey#interestOps()}.
- */
- private int _desiredInterestOps;
-
- private final Runnable _runUpdateKey = new Runnable()
- {
- @Override
- public void run()
- {
- updateKey();
- }
-
- @Override
- public String toString()
- {
- return SelectChannelEndPoint.this.toString()+":runUpdateKey";
- }
- };
- private final Runnable _runFillable = new Runnable()
- {
- @Override
- public void run()
- {
- getFillInterest().fillable();
- }
-
- @Override
- public String toString()
- {
- return SelectChannelEndPoint.this.toString()+":runFillable";
- }
- };
- private final Runnable _runCompleteWrite = new Runnable()
- {
- @Override
- public void run()
- {
- getWriteFlusher().completeWrite();
- }
-
- @Override
- public String toString()
- {
- return SelectChannelEndPoint.this.toString()+":runCompleteWrite";
- }
- };
- private final Runnable _runFillableCompleteWrite = new Runnable()
- {
- @Override
- public void run()
- {
- getFillInterest().fillable();
- getWriteFlusher().completeWrite();
- }
-
- @Override
- public String toString()
- {
- return SelectChannelEndPoint.this.toString()+":runFillableCompleteWrite";
- }
- };
-
public SelectChannelEndPoint(SocketChannel channel, ManagedSelector selector, SelectionKey key, Scheduler scheduler, long idleTimeout)
{
- super(scheduler, channel);
- _selector = selector;
- _key = key;
+ super(channel,selector,key,scheduler);
setIdleTimeout(idleTimeout);
}
-
- @Override
- protected void needsFillInterest()
- {
- changeInterests(SelectionKey.OP_READ);
- }
-
- @Override
- protected void onIncompleteFlush()
- {
- changeInterests(SelectionKey.OP_WRITE);
- }
-
- @Override
- public Runnable onSelected()
- {
- /**
- * This method may run concurrently with {@link #changeInterests(int)}.
- */
-
- int readyOps = _key.readyOps();
- int oldInterestOps;
- int newInterestOps;
- try (Locker.Lock lock = _locker.lock())
- {
- _updatePending = true;
- // Remove the readyOps, that here can only be OP_READ or OP_WRITE (or both).
- oldInterestOps = _desiredInterestOps;
- newInterestOps = oldInterestOps & ~readyOps;
- _desiredInterestOps = newInterestOps;
- }
-
-
- boolean readable = (readyOps & SelectionKey.OP_READ) != 0;
- boolean writable = (readyOps & SelectionKey.OP_WRITE) != 0;
-
-
- if (LOG.isDebugEnabled())
- LOG.debug("onSelected {}->{} r={} w={} for {}", oldInterestOps, newInterestOps, readable, writable, this);
-
- // Run non-blocking code immediately.
- // This producer knows that this non-blocking code is special
- // and that it must be run in this thread and not fed to the
- // ExecutionStrategy, which could not have any thread to run these
- // tasks (or it may starve forever just after having run them).
- if (readable && getFillInterest().isCallbackNonBlocking())
- {
- if (LOG.isDebugEnabled())
- LOG.debug("Direct readable run {}",this);
- _runFillable.run();
- readable = false;
- }
- if (writable && getWriteFlusher().isCallbackNonBlocking())
- {
- if (LOG.isDebugEnabled())
- LOG.debug("Direct writable run {}",this);
- _runCompleteWrite.run();
- writable = false;
- }
-
- // return task to complete the job
- Runnable task= readable ? (writable ? _runFillableCompleteWrite : _runFillable)
- : (writable ? _runCompleteWrite : null);
-
- if (LOG.isDebugEnabled())
- LOG.debug("task {}",task);
- return task;
- }
-
- @Override
- public void updateKey()
- {
- /**
- * This method may run concurrently with {@link #changeInterests(int)}.
- */
-
- try
- {
- int oldInterestOps;
- int newInterestOps;
- try (Locker.Lock lock = _locker.lock())
- {
- _updatePending = false;
- oldInterestOps = _currentInterestOps;
- newInterestOps = _desiredInterestOps;
- if (oldInterestOps != newInterestOps)
- {
- _currentInterestOps = newInterestOps;
- _key.interestOps(newInterestOps);
- }
- }
-
- if (LOG.isDebugEnabled())
- LOG.debug("Key interests updated {} -> {} on {}", oldInterestOps, newInterestOps, this);
- }
- catch (CancelledKeyException x)
- {
- LOG.debug("Ignoring key update for concurrently closed channel {}", this);
- close();
- }
- catch (Throwable x)
- {
- LOG.warn("Ignoring key update for " + this, x);
- close();
- }
- }
-
- private void changeInterests(int operation)
- {
- /**
- * This method may run concurrently with
- * {@link #updateKey()} and {@link #onSelected()}.
- */
-
- int oldInterestOps;
- int newInterestOps;
- boolean pending;
- try (Locker.Lock lock = _locker.lock())
- {
- pending = _updatePending;
- oldInterestOps = _desiredInterestOps;
- newInterestOps = oldInterestOps | operation;
- if (newInterestOps != oldInterestOps)
- _desiredInterestOps = newInterestOps;
- }
-
- if (LOG.isDebugEnabled())
- LOG.debug("changeInterests p={} {}->{} for {}", pending, oldInterestOps, newInterestOps, this);
-
- if (!pending)
- _selector.submit(_runUpdateKey);
- }
-
-
- @Override
- public void close()
- {
- if (_open.compareAndSet(true, false))
- {
- super.close();
- _selector.destroyEndPoint(this);
- }
- }
-
- @Override
- public boolean isOpen()
- {
- // We cannot rely on super.isOpen(), because there is a race between calls to close() and isOpen():
- // a thread may call close(), which flips the boolean but has not yet called super.close(), and
- // another thread calls isOpen() which would return true - wrong - if based on super.isOpen().
- return _open.get();
- }
-
- @Override
- public void onOpen()
- {
- if (_open.compareAndSet(false, true))
- super.onOpen();
- }
-
- @Override
- public String toString()
- {
- // We do a best effort to print the right toString() and that's it.
- try
- {
- boolean valid = _key != null && _key.isValid();
- int keyInterests = valid ? _key.interestOps() : -1;
- int keyReadiness = valid ? _key.readyOps() : -1;
- return String.format("%s{io=%d/%d,kio=%d,kro=%d}",
- super.toString(),
- _currentInterestOps,
- _desiredInterestOps,
- keyInterests,
- keyReadiness);
- }
- catch (Throwable x)
- {
- return String.format("%s{io=%s,kio=-2,kro=-2}", super.toString(), _desiredInterestOps);
- }
- }
}
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
index 9dfe8db4d5e..fe170f7f7c9 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
@@ -22,7 +22,9 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
+import java.nio.channels.SelectableChannel;
import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
import java.util.concurrent.Executor;
@@ -133,7 +135,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
return _selectors.length;
}
- private ManagedSelector chooseSelector(SocketChannel channel)
+ private ManagedSelector chooseSelector(SelectableChannel channel)
{
// Ideally we would like to have all connections from the same client end
// up on the same selector (to try to avoid smearing the data from a single
@@ -145,14 +147,17 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
{
try
{
- SocketAddress remote = channel.getRemoteAddress();
- if (remote instanceof InetSocketAddress)
+ if (channel instanceof SocketChannel)
{
- byte[] addr = ((InetSocketAddress)remote).getAddress().getAddress();
- if (addr != null)
+ SocketAddress remote = ((SocketChannel)channel).getRemoteAddress();
+ if (remote instanceof InetSocketAddress)
{
- int s = addr[addr.length - 1] & 0xFF;
- candidate1 = _selectors[s % getSelectorCount()];
+ byte[] addr = ((InetSocketAddress)remote).getAddress().getAddress();
+ if (addr != null)
+ {
+ int s = addr[addr.length - 1] & 0xFF;
+ candidate1 = _selectors[s % getSelectorCount()];
+ }
}
}
}
@@ -182,9 +187,9 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
*
* @param channel the channel to register
* @param attachment the attachment object
- * @see #accept(SocketChannel, Object)
+ * @see #accept(SelectableChannel, Object)
*/
- public void connect(SocketChannel channel, Object attachment)
+ public void connect(SelectableChannel channel, Object attachment)
{
ManagedSelector set = chooseSelector(channel);
set.submit(set.new Connect(channel, attachment));
@@ -192,9 +197,9 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
/**
* @param channel the channel to accept
- * @see #accept(SocketChannel, Object)
+ * @see #accept(SelectableChannel, Object)
*/
- public void accept(SocketChannel channel)
+ public void accept(SelectableChannel channel)
{
accept(channel, null);
}
@@ -209,7 +214,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
* @param channel the channel to register
* @param attachment the attachment object
*/
- public void accept(SocketChannel channel, Object attachment)
+ public void accept(SelectableChannel channel, Object attachment)
{
final ManagedSelector selector = chooseSelector(channel);
selector.submit(selector.new Accept(channel, attachment));
@@ -218,12 +223,12 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
/**
*
Utility class that implement transparent proxy functionalities.
*Configuration parameters:
diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncMiddleManServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncMiddleManServlet.java index 796da806601..6fbb9d87a92 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncMiddleManServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncMiddleManServlet.java @@ -138,6 +138,7 @@ public class AsyncMiddleManServlet extends AbstractProxyServlet return new ProxyWriter(clientRequest, proxyResponse); } + @Override protected Response.CompleteListener newProxyResponseListener(HttpServletRequest clientRequest, HttpServletResponse proxyResponse) { return new ProxyResponseListener(clientRequest, proxyResponse); diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java index 71a75bc8994..7b196626f37 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java @@ -18,9 +18,11 @@ package org.eclipse.jetty.proxy; +import java.io.Closeable; import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; +import java.nio.channels.SelectableChannel; import java.nio.channels.SelectionKey; import java.nio.channels.SocketChannel; import java.util.HashSet; @@ -44,6 +46,7 @@ import org.eclipse.jetty.io.ManagedSelector; import org.eclipse.jetty.io.MappedByteBufferPool; import org.eclipse.jetty.io.SelectChannelEndPoint; import org.eclipse.jetty.io.SelectorManager; +import org.eclipse.jetty.io.SocketChannelEndPoint; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.HttpConnection; import org.eclipse.jetty.server.HttpTransport; @@ -51,6 +54,7 @@ import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.HandlerWrapper; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; +import org.eclipse.jetty.util.Promise; import org.eclipse.jetty.util.TypeUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; @@ -160,21 +164,17 @@ public class ConnectHandler extends HandlerWrapper protected void doStart() throws Exception { if (executor == null) - { - setExecutor(getServer().getThreadPool()); - } + executor = getServer().getThreadPool(); + if (scheduler == null) - { - setScheduler(new ScheduledExecutorScheduler()); - addBean(getScheduler()); - } + addBean(scheduler = new ScheduledExecutorScheduler()); + if (bufferPool == null) - { - setByteBufferPool(new MappedByteBufferPool()); - addBean(getByteBufferPool()); - } + addBean(bufferPool = new MappedByteBufferPool()); + addBean(selector = newSelectorManager()); selector.setConnectTimeout(getConnectTimeout()); + super.doStart(); } @@ -191,16 +191,8 @@ public class ConnectHandler extends HandlerWrapper String serverAddress = request.getRequestURI(); if (LOG.isDebugEnabled()) LOG.debug("CONNECT request for {}", serverAddress); - try - { - handleConnect(baseRequest, request, response, serverAddress); - } - catch (Exception x) - { - // TODO - LOG.warn("ConnectHandler " + baseRequest.getHttpURI() + " " + x); - LOG.debug(x); - } + + handleConnect(baseRequest, request, response, serverAddress); } else { @@ -249,32 +241,40 @@ public class ConnectHandler extends HandlerWrapper return; } - SocketChannel channel = SocketChannel.open(); - channel.socket().setTcpNoDelay(true); - channel.configureBlocking(false); - - AsyncContext asyncContext = request.startAsync(); - asyncContext.setTimeout(0); - HttpTransport transport = baseRequest.getHttpChannel().getHttpTransport(); - // TODO Handle CONNECT over HTTP2! if (!(transport instanceof HttpConnection)) { if (LOG.isDebugEnabled()) - LOG.debug("CONNECT forbidden for {}", transport); + LOG.debug("CONNECT not supported for {}", transport); sendConnectResponse(request, response, HttpServletResponse.SC_FORBIDDEN); return; } - InetSocketAddress address = newConnectAddress(host, port); + AsyncContext asyncContext = request.startAsync(); + asyncContext.setTimeout(0); + if (LOG.isDebugEnabled()) - LOG.debug("Connecting to {}", address); - ConnectContext connectContext = new ConnectContext(request, response, asyncContext, (HttpConnection)transport); - if (channel.connect(address)) - selector.accept(channel, connectContext); - else - selector.connect(channel, connectContext); + LOG.debug("Connecting to {}:{}", host, port); + + connectToServer(request, host, port, new Promise
* If DIGEST Authentication is used, the password must be in a recoverable format, either plain text or OBF:.
*/
-public class HashLoginService extends MappedLoginService implements UserListener
+public class HashLoginService extends AbstractLoginService
{
private static final Logger LOG = Log.getLogger(HashLoginService.class);
- private PropertyUserStore _propertyUserStore;
- private String _config;
- private Resource _configResource;
- private Scanner _scanner;
- private boolean hotReload = false; // default is not to reload
+ protected PropertyUserStore _propertyUserStore;
+ protected String _config;
+ protected Resource _configResource;
+ protected boolean hotReload = false; // default is not to reload
+
/* ------------------------------------------------------------ */
public HashLoginService()
@@ -127,41 +130,45 @@ public class HashLoginService extends MappedLoginService implements UserListener
this.hotReload = enable;
}
- /* ------------------------------------------------------------ */
- /**
- * sets the refresh interval (in seconds)
- * @param sec the refresh interval
- * @deprecated use {@link #setHotReload(boolean)} instead
- */
- @Deprecated
- public void setRefreshInterval(int sec)
- {
- }
-
- /* ------------------------------------------------------------ */
- /**
- * @return refresh interval in seconds for how often the properties file should be checked for changes
- * @deprecated use {@link #isHotReload()} instead
- */
- @Deprecated
- public int getRefreshInterval()
- {
- return (hotReload)?1:0;
- }
+
/* ------------------------------------------------------------ */
@Override
- protected UserIdentity loadUser(String username)
+ protected String[] loadRoleInfo(UserPrincipal user)
{
+ UserIdentity id = _propertyUserStore.getUserIdentity(user.getName());
+ if (id == null)
+ return null;
+
+
+ Set
* An example properties file for configuration is in
- * $JETTY_HOME/etc/jdbcRealm.properties
- *
- * @version $Id: JDBCLoginService.java 4792 2009-03-18 21:55:52Z gregw $
- *
- *
- *
- *
+ * Sends an error 500, performing a special logic to detect whether the request is suspended,
* to avoid concurrent writes from the application.
- * While this class is-a Runnable, it should never be dispatched in it's own thread. It is a
+ * While this class is-a Runnable, it should never be dispatched in it's own thread. It is a
* runnable only so that the calling thread can use {@link ContextHandler#handle(Runnable)}
* to setup classloaders etc.
* This factory can be placed in front of any other connection factory
- * to process the proxy line before the normal protocol handling${jetty.home}/etc/jdbcRealm.properties
*/
-
-public class JDBCLoginService extends MappedLoginService
+public class JDBCLoginService extends AbstractLoginService
{
private static final Logger LOG = Log.getLogger(JDBCLoginService.class);
@@ -71,12 +64,30 @@ public class JDBCLoginService extends MappedLoginService
protected String _userTableKey;
protected String _userTablePasswordField;
protected String _roleTableRoleField;
- protected int _cacheTime;
- protected long _lastHashPurge;
protected Connection _con;
protected String _userSql;
protected String _roleSql;
+
+ /**
+ * JDBCKnownUser
+ */
+ public class JDBCUserPrincipal extends UserPrincipal
+ {
+ int _userKey;
+
+ public JDBCUserPrincipal(String name, Credential credential, int key)
+ {
+ super(name, credential);
+ _userKey = key;
+ }
+
+
+ public int getUserKey ()
+ {
+ return _userKey;
+ }
+ }
/* ------------------------------------------------------------ */
public JDBCLoginService()
@@ -110,9 +121,6 @@ public class JDBCLoginService extends MappedLoginService
/* ------------------------------------------------------------ */
- /**
- * @see org.eclipse.jetty.security.MappedLoginService#doStart()
- */
@Override
protected void doStart() throws Exception
{
@@ -136,20 +144,18 @@ public class JDBCLoginService extends MappedLoginService
String _userRoleTable = properties.getProperty("userroletable");
String _userRoleTableUserKey = properties.getProperty("userroletableuserkey");
String _userRoleTableRoleKey = properties.getProperty("userroletablerolekey");
- _cacheTime = new Integer(properties.getProperty("cachetime"));
+
if (_jdbcDriver == null || _jdbcDriver.equals("")
|| _url == null
|| _url.equals("")
|| _userName == null
|| _userName.equals("")
- || _password == null
- || _cacheTime < 0)
+ || _password == null)
{
LOG.warn("UserRealm " + getName() + " has not been properly configured");
}
- _cacheTime *= 1000;
- _lastHashPurge = 0;
+
_userSql = "select " + _userTableKey + "," + _userTablePasswordField + " from " + _userTable + " where " + _userTableUserField + " = ?";
_roleSql = "select r." + _roleTableRoleField
+ " from "
@@ -164,7 +170,7 @@ public class JDBCLoginService extends MappedLoginService
+ " = u."
+ _userRoleTableRoleKey;
- Loader.loadClass(this.getClass(), _jdbcDriver).newInstance();
+ Loader.loadClass(_jdbcDriver).newInstance();
super.doStart();
}
@@ -209,30 +215,11 @@ public class JDBCLoginService extends MappedLoginService
}
}
- /* ------------------------------------------------------------ */
- @Override
- public UserIdentity login(String username, Object credentials, ServletRequest request)
- {
- long now = System.currentTimeMillis();
- if (now - _lastHashPurge > _cacheTime || _cacheTime == 0)
- {
- _users.clear();
- _lastHashPurge = now;
- closeConnection();
- }
-
- return super.login(username,credentials, request);
- }
+
+
/* ------------------------------------------------------------ */
- @Override
- protected void loadUsers()
- {
- }
-
- /* ------------------------------------------------------------ */
- @Override
- protected UserIdentity loadUser(String username)
+ public UserPrincipal loadUserInfo (String username)
{
try
{
@@ -251,18 +238,8 @@ public class JDBCLoginService extends MappedLoginService
{
int key = rs1.getInt(_userTableKey);
String credentials = rs1.getString(_userTablePasswordField);
- List
A PushBuilder is obtained by calling {@link
+ * Request#getPushBuilder()} (Eventually HttpServletRequest.getPushBuilder()).
+ * Each call to this method will
+ * return a new instance of a PushBuilder based off the current {@code
+ * HttpServletRequest}. Any mutations to the returned PushBuilder are
+ * not reflected on future returns.
The instance is initialized as follows:
+ * *A PushBuilder can be customized by chained calls to mutator methods before the - * {@link #push()} method is called to initiate a push request with the current state - * of the builder. After the call to {@link #push()}, the builder may be reused for - * another push, however the {@link #path(String)}, {@link #etag(String)} and - * {@link #lastModified(String)} values will have been nulled. All other - * values are retained over calls to {@link #push()}. + * + *
The {@link #path} method must be called on the {@code PushBuilder} + * instance before the call to {@link #push}. Failure to do so must + * cause an exception to be thrown from {@link + * #push}, as specified in that method.
+ * + *A PushBuilder can be customized by chained calls to mutator + * methods before the {@link #push()} method is called to initiate an + * asynchronous push request with the current state of the builder. + * After the call to {@link #push()}, the builder may be reused for + * another push, however the implementation must make it so the {@link + * #path(String)}, {@link #etag(String)} and {@link + * #lastModified(String)} values are cleared before returning from + * {@link #push}. All other values are retained over calls to {@link + * #push()}. + * + * @since 4.0 */ public interface PushBuilder { - /** Set the method to be used for the push. - * Defaults to GET. + /** + *
Set the method to be used for the push.
+ * + *Any non-empty String may be used for the method.
+ * * @param method the method to be used for the push. * @return this builder. + * @throws NullPointerException if the argument is {@code null} + * @throws IllegalArgumentException if the argument is the empty String */ public abstract PushBuilder method(String method); /** Set the query string to be used for the push. - * Defaults to the requests query string. - * Will be appended to any query String included in a call to {@link #path(String)}. This - * method should be used instead of a query in {@link #path(String)} when multiple - * {@link #push()} calls are to be made with the same query string, or to remove a - * query string obtained from the associated request. + * + * Will be appended to any query String included in a call to {@link + * #path(String)}. Any duplicate parameters must be preserved. This + * method should be used instead of a query in {@link #path(String)} + * when multiple {@link #push()} calls are to be made with the same + * query string. * @param queryString the query string to be used for the push. * @return this builder. */ @@ -108,33 +144,55 @@ public interface PushBuilder */ public abstract PushBuilder conditional(boolean conditional); - /** Set a header to be used for the push. + /** + *Set a header to be used for the push. If the builder has an + * existing header with the same name, its value is overwritten.
+ * * @param name The header name to set * @param value The header value to set * @return this builder. */ public abstract PushBuilder setHeader(String name, String value); + - /** Add a header to be used for the push. + /** + *Add a header to be used for the push.
* @param name The header name to add * @param value The header value to add * @return this builder. */ public abstract PushBuilder addHeader(String name, String value); + + + /** + *Remove the named header. If the header does not exist, take + * no action.
+ * + * @param name The name of the header to remove + * @return this builder. + */ + public abstract PushBuilder removeHeader(String name); + - /** Set the URI path to be used for the push. - * The path may start with "/" in which case it is treated as an - * absolute path, otherwise it is relative to the context path of - * the associated request. - * There is no path default and {@link #path(String)} must be called - * before every call to {@link #push()} + + /** + * Set the URI path to be used for the push. The path may start + * with "/" in which case it is treated as an absolute path, + * otherwise it is relative to the context path of the associated + * request. There is no path default and {@link #path(String)} must + * be called before every call to {@link #push()}. If a query + * string is present in the argument {@code path}, its contents must + * be merged with the contents previously passed to {@link + * #queryString}, preserving duplicates. + * * @param path the URI path to be used for the push, which may include a * query string. * @return this builder. */ public abstract PushBuilder path(String path); - /** Set the etag to be used for conditional pushes. + /** + * Set the etag to be used for conditional pushes. * The etag will be used only if {@link #isConditional()} is true. * Defaults to no etag. The value is nulled after every call to * {@link #push()} @@ -143,33 +201,44 @@ public interface PushBuilder */ public abstract PushBuilder etag(String etag); - /** Set the last modified date to be used for conditional pushes. - * The last modified date will be used only if {@link #isConditional()} is true. - * Defaults to no date. The value is nulled after every call to - * {@link #push()} + /** + * Set the last modified date to be used for conditional pushes. + * The last modified date will be used only if {@link + * #isConditional()} is true. Defaults to no date. The value is + * nulled after every call to {@link #push()} * @param lastModified the last modified date to be used for the push. * @return this builder. - * */ + */ public abstract PushBuilder lastModified(String lastModified); - /** Push a resource. - * Push a resource based on the current state of the PushBuilder. If {@link #isConditional()} - * is true and an etag or lastModified value is provided, then an appropriate conditional header - * will be generated. If both an etag and lastModified value are provided only an If-None-Match header - * will be generated. If the builder has a session ID, then the pushed request - * will include the session ID either as a Cookie or as a URI parameter as appropriate. The builders - * query string is merged with any passed query string. - * After initiating the push, the builder has its path, etag and lastModified fields nulled. All - * other fields are left as is for possible reuse in another push. - * @throws IllegalArgumentException if the method set expects a request body (eg POST) + /** Push a resource given the current state of the builder, + * returning immediately without blocking. + * + *Push a resource based on the current state of the PushBuilder. + * If {@link #isConditional()} is true and an etag or lastModified + * value is provided, then an appropriate conditional header will be + * generated. If both an etag and lastModified value are provided + * only an If-None-Match header will be generated. If the builder + * has a session ID, then the pushed request will include the + * session ID either as a Cookie or as a URI parameter as + * appropriate. The builders query string is merged with any passed + * query string.
+ * + *Before returning from this method, the builder has its path, + * etag and lastModified fields nulled. All other fields are left as + * is for possible reuse in another push.
+ * + * @throws IllegalArgumentException if the method set expects a + * request body (eg POST) + * + * @throws IllegalStateException if there was no call to {@link + * #path} on this instance either between its instantiation or the + * last call to {@code push()} that did not throw an + * IllegalStateException. */ public abstract void push(); - - - - public abstract String getMethod(); public abstract String getQueryString(); public abstract String getSessionId(); @@ -179,7 +248,4 @@ public interface PushBuilder public abstract String getPath(); public abstract String getEtag(); public abstract String getLastModified(); - - - } \ No newline at end of file diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java b/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java index f39cffa878d..def6bed8880 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/PushBuilderImpl.java @@ -32,14 +32,14 @@ import org.eclipse.jetty.util.log.Logger; /* ------------------------------------------------------------ */ -/** +/** */ public class PushBuilderImpl implements PushBuilder -{ +{ private static final Logger LOG = Log.getLogger(PushBuilderImpl.class); private final static HttpField JettyPush = new HttpField("x-http2-push","PushBuilder"); - + private final Request _request; private final HttpFields _fields; private String _method; @@ -49,7 +49,7 @@ public class PushBuilderImpl implements PushBuilder private String _path; private String _etag; private String _lastModified; - + public PushBuilderImpl(Request request, HttpFields fields, String method, String queryString, String sessionId, boolean conditional) { super(); @@ -65,124 +65,88 @@ public class PushBuilderImpl implements PushBuilder } /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getMethod() - */ @Override public String getMethod() { return _method; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#method(java.lang.String) - */ @Override public PushBuilder method(String method) { _method = method; return this; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getQueryString() - */ @Override public String getQueryString() { return _queryString; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#queryString(java.lang.String) - */ @Override public PushBuilder queryString(String queryString) { _queryString = queryString; return this; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getSessionId() - */ @Override public String getSessionId() { return _sessionId; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#sessionId(java.lang.String) - */ @Override public PushBuilder sessionId(String sessionId) { _sessionId = sessionId; return this; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#isConditional() - */ @Override public boolean isConditional() { return _conditional; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#conditional(boolean) - */ @Override public PushBuilder conditional(boolean conditional) { _conditional = conditional; return this; } - + /* ------------------------------------------------------------ */ - /** - * @see org.eclipse.jetty.server.PushBuilder#getHeaderNames() - */ @Override public SetEach call to getPushBuilder() will return a new instance
* of a PushBuilder based off this Request. Any mutations to the
* returned PushBuilder are not reflected on future returns.
@@ -268,12 +269,12 @@ public class Request implements HttpServletRequest
{
if (!isPushSupported())
throw new IllegalStateException();
-
+
HttpFields fields = new HttpFields(getHttpFields().size()+5);
boolean conditional=false;
UserIdentity user_identity=null;
Authentication authentication=null;
-
+
for (HttpField field : getHttpFields())
{
HttpHeader header = field.getHeader();
@@ -291,7 +292,7 @@ public class Request implements HttpServletRequest
case REFERER:
case COOKIE:
continue;
-
+
case AUTHORIZATION:
user_identity=getUserIdentity();
authentication=_authentication;
@@ -301,13 +302,13 @@ public class Request implements HttpServletRequest
case IF_MODIFIED_SINCE:
conditional=true;
continue;
-
+
default:
fields.add(field);
}
}
}
-
+
String id=null;
try
{
@@ -324,13 +325,13 @@ public class Request implements HttpServletRequest
{
id=getRequestedSessionId();
}
-
+
PushBuilder builder = new PushBuilderImpl(this,fields,getMethod(),getQueryString(),id,conditional);
builder.addHeader("referer",getRequestURL().toString());
-
+
// TODO process any set cookies
// TODO process any user_identity
-
+
return builder;
}
@@ -418,7 +419,7 @@ public class Request implements HttpServletRequest
}
}
}
-
+
}
/* ------------------------------------------------------------ */
@@ -508,7 +509,7 @@ public class Request implements HttpServletRequest
HttpChannelState state = getHttpChannelState();
if (_async==null || !state.isAsyncStarted())
throw new IllegalStateException(state.getStatusString());
-
+
return _async;
}
@@ -647,7 +648,7 @@ public class Request implements HttpServletRequest
{
return _input.getContentConsumed();
}
-
+
/* ------------------------------------------------------------ */
/*
* @see javax.servlet.ServletRequest#getContentType()
@@ -696,7 +697,7 @@ public class Request implements HttpServletRequest
{
if (_cookies == null || _cookies.getCookies().length == 0)
return null;
-
+
return _cookies.getCookies();
}
@@ -720,7 +721,7 @@ public class Request implements HttpServletRequest
//Javadoc for Request.getCookies() stipulates null for no cookies
if (_cookies == null || _cookies.getCookies().length == 0)
return null;
-
+
return _cookies.getCookies();
}
@@ -824,7 +825,7 @@ public class Request implements HttpServletRequest
{
if (_metadata==null)
return Locale.getDefault();
-
+
Enumeration Problem accessing ");
- writer.write(uri);
- writer.write(". Reason:\npathInContext, or a new entry
+ * if no matching entry was found. If the content exists but is not cachable,
+ * then a {@link ResourceHttpContent} instance is return. If
+ * the resource does not exist, then null is returned.
+ * @throws IOException Problem loading the resource
+ */
+ @Override
+ public HttpContent getContent(String pathInContext)
+ throws IOException
+ {
+
+ // try loading the content from our factory.
+ Resource resource=_factory.getResource(pathInContext);
+ HttpContent loaded = load(pathInContext,resource);
+ return loaded;
+ }
+
+
+ /* ------------------------------------------------------------ */
+ private HttpContent load(String pathInContext, Resource resource)
+ throws IOException
+ {
+ if (resource==null || !resource.exists())
+ return null;
+
+ if (resource.isDirectory())
+ return new ResourceHttpContent(resource,_mimeTypes.getMimeByExtension(resource.toString()),_maxBufferSize);
+
+ // Look for a gzip resource or content
+ String mt = _mimeTypes.getMimeByExtension(pathInContext);
+ if (_gzip)
+ {
+ // Is there a gzip resource?
+ String pathInContextGz=pathInContext+".gz";
+ Resource resourceGz=_factory.getResource(pathInContextGz);
+ if (resourceGz.exists() && resourceGz.lastModified()>=resource.lastModified() && resourceGz.length()HTTP ERROR: ");
- writer.write(Integer.toString(code));
- writer.write("
\n ");
- writer.write(message);
- writer.write("");
- writer.write("
* This servers executore is made available via a context attributed "org.eclipse.jetty.server.Executor". *
- * By default, the context is created with alias checkers for {@link AllowSymLinkAliasChecker} (unix only) and {@link ApproveNonExistentDirectoryAliases}.
+ * By default, the context is created with alias checkers for {@link AllowSymLinkAliasChecker} (unix only) and {@link ApproveNonExistentDirectoryAliases}.
* If these alias checkers are not required, then {@link #clearAliasChecks()} or {@link #setAliasChecks(List)} should be called.
*/
@ManagedObject("URI Context")
@@ -126,7 +126,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
private static final ThreadLocalsetBaseResource(newResource(resourceBase));
*/
public void setResourceBase(String resourceBase)
@@ -1643,7 +1673,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
return null;
if (_classLoader == null)
- return Loader.loadClass(this.getClass(),className);
+ return Loader.loadClass(className);
return _classLoader.loadClass(className);
}
@@ -1685,9 +1715,9 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
}
/* ------------------------------------------------------------ */
- /**
+ /**
* Get all of the locale encodings
- *
+ *
* @return a map of all the locale encodings: key is name of the locale and value is the char encoding
*/
public Map
An ErrorHandler is registered with {@link ContextHandler#setErrorHandler(ErrorHandler)} or + * {@link org.eclipse.jetty.server.Server#addBean(Object)}.
+ *It is called by {@link HttpServletResponse#sendError(int)} to write an error page via + * {@link #handle(String, Request, HttpServletRequest, HttpServletResponse)} + * or via {@link #badMessageError(int, String, HttpFields)} for bad requests for which a + * dispatch cannot be done.
*/ public class ErrorHandler extends AbstractHandler -{ +{ private static final Logger LOG = Log.getLogger(ErrorHandler.class); - public final static String ERROR_PAGE="org.eclipse.jetty.server.error_page"; - - boolean _showStacks=true; - boolean _showMessageInTitle=true; - String _cacheControl="must-revalidate,no-cache,no-store"; - /* ------------------------------------------------------------ */ - /* - * @see org.eclipse.jetty.server.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) - */ + private boolean _showStacks = true; + private boolean _showMessageInTitle = true; + private String _cacheControl = "must-revalidate,no-cache,no-store"; + @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -74,139 +72,151 @@ public class ErrorHandler extends AbstractHandler baseRequest.setHandled(true); return; } - + if (this instanceof ErrorPageMapper) { - String error_page=((ErrorPageMapper)this).getErrorPage(request); - if (error_page!=null && request.getServletContext()!=null) - { - String old_error_page=(String)request.getAttribute(ERROR_PAGE); - if (old_error_page==null || !old_error_page.equals(error_page)) - { - request.setAttribute(ERROR_PAGE, error_page); + String error_page = ((ErrorPageMapper)this).getErrorPage(request); - Dispatcher dispatcher = (Dispatcher) request.getServletContext().getRequestDispatcher(error_page); + ServletContext context = request.getServletContext(); + if (context == null) + { + AsyncContextEvent event = baseRequest.getHttpChannelState().getAsyncContextEvent(); + context = event == null ? null : event.getServletContext(); + } + + if (error_page != null && context != null) + { + Dispatcher dispatcher = (Dispatcher)context.getRequestDispatcher(error_page); + if (dispatcher != null) + { try { - if(dispatcher!=null) - { - dispatcher.error(request, response); - return; - } - LOG.warn("No error page "+error_page); - } - catch (ServletException e) - { - LOG.warn(Log.EXCEPTION, e); + dispatcher.error(request, response); return; } + catch (ServletException x) + { + throw new IOException(x); + } + } + else + { + LOG.warn("Could not dispatch to error page: {}", error_page); + // Fall through to provide the default error page. } } } - + baseRequest.setHandled(true); - response.setContentType(MimeTypes.Type.TEXT_HTML_8859_1.asString()); - if (_cacheControl!=null) - response.setHeader(HttpHeader.CACHE_CONTROL.asString(), _cacheControl); - ByteArrayISO8859Writer writer= new ByteArrayISO8859Writer(4096); - String reason=(response instanceof Response)?((Response)response).getReason():null; - handleErrorPage(request, writer, response.getStatus(), reason); - writer.flush(); - response.setContentLength(writer.size()); - writer.writeTo(response.getOutputStream()); - writer.destroy(); + + HttpOutput out = baseRequest.getResponse().getHttpOutput(); + if (!out.isAsync()) + { + response.setContentType(MimeTypes.Type.TEXT_HTML_8859_1.asString()); + String cacheHeader = getCacheControl(); + if (cacheHeader != null) + response.setHeader(HttpHeader.CACHE_CONTROL.asString(), cacheHeader); + ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(4096); + String reason = (response instanceof Response) ? ((Response)response).getReason() : null; + handleErrorPage(request, writer, response.getStatus(), reason); + writer.flush(); + response.setContentLength(writer.size()); + writer.writeTo(response.getOutputStream()); + writer.destroy(); + } } /* ------------------------------------------------------------ */ protected void handleErrorPage(HttpServletRequest request, Writer writer, int code, String message) - throws IOException + throws IOException { - writeErrorPage(request, writer, code, message, _showStacks); + writeErrorPage(request, writer, code, message, isShowStacks()); } /* ------------------------------------------------------------ */ protected void writeErrorPage(HttpServletRequest request, Writer writer, int code, String message, boolean showStacks) - throws IOException + throws IOException { if (message == null) - message=HttpStatus.getMessage(code); + message = HttpStatus.getMessage(code); writer.write("\n\n"); - writeErrorPageHead(request,writer,code,message); + writeErrorPageHead(request, writer, code, message); writer.write("\n"); - writeErrorPageBody(request,writer,code,message,showStacks); + writeErrorPageBody(request, writer, code, message, showStacks); writer.write("\n\n\n"); } /* ------------------------------------------------------------ */ protected void writeErrorPageHead(HttpServletRequest request, Writer writer, int code, String message) - throws IOException - { + throws IOException + { writer.write("\n"); writer.write("Problem accessing "); - write(writer,uri); + write(writer, uri); writer.write(". Reason:\n
");
- write(writer,message);
+ write(writer, message);
writer.write("");
}
/* ------------------------------------------------------------ */
protected void writeErrorPageStacks(HttpServletRequest request, Writer writer)
- throws IOException
+ throws IOException
{
Throwable th = (Throwable)request.getAttribute("javax.servlet.error.exception");
- while(th!=null)
+ while (th != null)
{
writer.write("");
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
th.printStackTrace(pw);
pw.flush();
- write(writer,sw.getBuffer().toString());
+ write(writer, sw.getBuffer().toString());
writer.write("\n");
- th =th.getCause();
+ th = th.getCause();
}
}
/* ------------------------------------------------------------ */
- /** Bad Message Error body
- * Generate a error response body to be sent for a bad message. - * In this case there is something wrong with the request, so either + /** + *
Generate a error response body to be sent for a bad message.
+ *In this case there is something wrong with the request, so either * a request cannot be built, or it is not safe to build a request. - * This method allows for a simple error page body to be returned - * and some response headers to be set. + * This method allows for a simple error page body to be returned + * and some response headers to be set.
+ * * @param status The error code that will be sent * @param reason The reason for the error code (may be null) * @param fields The header fields that will be sent with the response. @@ -214,14 +224,14 @@ public class ErrorHandler extends AbstractHandler */ public ByteBuffer badMessageError(int status, String reason, HttpFields fields) { - if (reason==null) - reason=HttpStatus.getMessage(status); - fields.put(HttpHeader.CONTENT_TYPE,MimeTypes.Type.TEXT_HTML_8859_1.asString()); + if (reason == null) + reason = HttpStatus.getMessage(status); + fields.put(HttpHeader.CONTENT_TYPE, MimeTypes.Type.TEXT_HTML_8859_1.asString()); return BufferUtil.toBuffer("reason: " + reason + ""); - } - + } + /* ------------------------------------------------------------ */ - /** Get the cacheControl. + /** * @return the cacheControl header to set on error responses. */ public String getCacheControl() @@ -230,7 +240,7 @@ public class ErrorHandler extends AbstractHandler } /* ------------------------------------------------------------ */ - /** Set the cacheControl. + /** * @param cacheControl the cacheControl header to set on error responses. */ public void setCacheControl(String cacheControl) @@ -240,7 +250,7 @@ public class ErrorHandler extends AbstractHandler /* ------------------------------------------------------------ */ /** - * @return True if stack traces are shown in the error pages + * @return whether stack traces are shown in the error pages */ public boolean isShowStacks() { @@ -249,7 +259,7 @@ public class ErrorHandler extends AbstractHandler /* ------------------------------------------------------------ */ /** - * @param showStacks True if stack traces are shown in the error pages + * @param showStacks whether stack traces are shown in the error pages */ public void setShowStacks(boolean showStacks) { @@ -258,25 +268,27 @@ public class ErrorHandler extends AbstractHandler /* ------------------------------------------------------------ */ /** - * @param showMessageInTitle if true, the error message appears in page title + * @return whether the error message appears in page title */ - public void setShowMessageInTitle(boolean showMessageInTitle) - { - _showMessageInTitle = showMessageInTitle; - } - - - /* ------------------------------------------------------------ */ public boolean getShowMessageInTitle() { return _showMessageInTitle; } /* ------------------------------------------------------------ */ - protected void write(Writer writer,String string) - throws IOException + /** + * @param showMessageInTitle whether the error message appears in page title + */ + public void setShowMessageInTitle(boolean showMessageInTitle) { - if (string==null) + _showMessageInTitle = showMessageInTitle; + } + + /* ------------------------------------------------------------ */ + protected void write(Writer writer, String string) + throws IOException + { + if (string == null) return; writer.write(StringUtil.sanitizeXmlString(string)); @@ -291,11 +303,22 @@ public class ErrorHandler extends AbstractHandler /* ------------------------------------------------------------ */ public static ErrorHandler getErrorHandler(Server server, ContextHandler context) { - ErrorHandler error_handler=null; - if (context!=null) - error_handler=context.getErrorHandler(); - if (error_handler==null && server!=null) - error_handler = server.getBean(ErrorHandler.class); + ErrorHandler error_handler = null; + if (context != null) + error_handler = context.getErrorHandler(); + if (error_handler == null) + { + synchronized (ErrorHandler.class) + { + error_handler = server.getBean(ErrorHandler.class); + if (error_handler == null) + { + error_handler = new ErrorHandler(); + error_handler.setServer(server); + server.addManaged(error_handler); + } + } + } return error_handler; } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java index f799b3a4f85..2a1b771d6c8 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.ArrayUtil; import org.eclipse.jetty.util.MultiException; import org.eclipse.jetty.util.annotation.ManagedAttribute; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java index c8ef17b61c7..bc60dc7c059 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java @@ -25,10 +25,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.component.LifeCycle; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java index 6a38a710a84..9c2a72ab59c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java @@ -498,11 +498,12 @@ public class ResourceHandler extends HandlerWrapper doResponseHeaders(response,resource,mime); if (_etags) baseRequest.getResponse().getHttpFields().put(HttpHeader.ETAG,etag); + if (last_modified>0) + response.setDateHeader(HttpHeader.LAST_MODIFIED.asString(),last_modified); if(skipContentBody) return; - // Send the content OutputStream out =null; try {out = response.getOutputStream();} diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java index ba0d6d05a0b..8a14d13ab5f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java @@ -18,6 +18,8 @@ package org.eclipse.jetty.server.handler.gzip; +import static org.eclipse.jetty.http.GzipHttpContent.ETAG_GZIP_QUOTE; + import java.io.File; import java.io.IOException; import java.util.Set; @@ -28,6 +30,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.eclipse.jetty.http.GzipHttpContent; import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; @@ -61,10 +64,7 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory public final static String GZIP = "gzip"; public final static String DEFLATE = "deflate"; - public final static String ETAG_GZIP="--gzip"; - public final static String ETAG = "o.e.j.s.Gzip.ETag"; public final static int DEFAULT_MIN_GZIP_SIZE=16; - private int _minGzipSize=DEFAULT_MIN_GZIP_SIZE; private int _compressionLevel=Deflater.DEFAULT_COMPRESSION; private boolean _checkGzExists = true; @@ -79,6 +79,7 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory private HttpField _vary; + /* ------------------------------------------------------------ */ /** * Instantiates a new gzip handler. @@ -415,11 +416,19 @@ public class GzipHandler extends HandlerWrapper implements GzipFactory } // Special handling for etags - String etag = request.getHeader("If-None-Match"); + String etag = baseRequest.getHttpFields().get(HttpHeader.IF_NONE_MATCH); if (etag!=null) { - if (etag.contains(ETAG_GZIP)) - request.setAttribute(ETAG,etag.replace(ETAG_GZIP,"")); + int i=etag.indexOf(ETAG_GZIP_QUOTE); + if (i>0) + { + while (i>=0) + { + etag=etag.substring(0,i)+etag.substring(i+GzipHttpContent.ETAG_GZIP.length()); + i=etag.indexOf(ETAG_GZIP_QUOTE,i); + } + baseRequest.getHttpFields().put(new HttpField(HttpHeader.IF_NONE_MATCH,etag)); + } } // install interceptor and handle diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java index 41ba3b9c65c..0aa28d786b7 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHttpOutputInterceptor.java @@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.zip.CRC32; import java.util.zip.Deflater; +import org.eclipse.jetty.http.GzipHttpContent; import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; @@ -41,7 +42,6 @@ import org.eclipse.jetty.util.log.Logger; public class GzipHttpOutputInterceptor implements HttpOutput.Interceptor { public static Logger LOG = Log.getLogger(GzipHttpOutputInterceptor.class); - private final static PreEncodedHttpField CONTENT_ENCODING_GZIP=new PreEncodedHttpField(HttpHeader.CONTENT_ENCODING,"gzip"); private final static byte[] GZIP_HEADER = new byte[] { (byte)0x1f, (byte)0x8b, Deflater.DEFLATED, 0, 0, 0, 0, 0, 0, 0 }; public final static HttpField VARY_ACCEPT_ENCODING_USER_AGENT=new PreEncodedHttpField(HttpHeader.VARY,HttpHeader.ACCEPT_ENCODING+", "+HttpHeader.USER_AGENT); @@ -202,7 +202,7 @@ public class GzipHttpOutputInterceptor implements HttpOutput.Interceptor return; } - fields.put(CONTENT_ENCODING_GZIP); + fields.put(GzipHttpContent.CONTENT_ENCODING_GZIP); _crc.reset(); _buffer=_channel.getByteBufferPool().acquire(_bufferSize,false); BufferUtil.fill(_buffer,GZIP_HEADER,0,GZIP_HEADER.length); @@ -213,7 +213,7 @@ public class GzipHttpOutputInterceptor implements HttpOutput.Interceptor if (etag!=null) { int end = etag.length()-1; - etag=(etag.charAt(end)=='"')?etag.substring(0,end)+GzipHandler.ETAG_GZIP+'"':etag+GzipHandler.ETAG_GZIP; + etag=(etag.charAt(end)=='"')?etag.substring(0,end)+GzipHttpContent.ETAG_GZIP+'"':etag+GzipHttpContent.ETAG_GZIP; fields.put(HttpHeader.ETAG,etag); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionDataStore.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionDataStore.java index 2dc6aa81956..7130060dbb3 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionDataStore.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionDataStore.java @@ -34,13 +34,14 @@ public interface SessionDataStore extends LifeCycle /** * Initialize this session data store for the * given context. A SessionDataStore can only - * be used by one context. + * be used by one context(/session manager). * * @param contextId */ void initialize(ContextId contextId); + /** * Read in session data from storage * @param id diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java index 3468b6ced80..eb464180d65 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java @@ -18,6 +18,9 @@ package org.eclipse.jetty.server; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -26,6 +29,7 @@ import java.io.PrintWriter; import java.net.Socket; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -41,9 +45,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - public abstract class AbstractHttpTest { @Rule @@ -80,22 +81,24 @@ public abstract class AbstractHttpTest protected SimpleHttpResponse executeRequest() throws URISyntaxException, IOException { - Socket socket = new Socket("localhost", connector.getLocalPort()); - socket.setSoTimeout((int)connector.getIdleTimeout()); - BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)); - PrintWriter writer = new PrintWriter(new OutputStreamWriter(socket.getOutputStream())); + try(Socket socket = new Socket("localhost", connector.getLocalPort());) + { + socket.setSoTimeout((int)connector.getIdleTimeout()); + BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)); + PrintWriter writer = new PrintWriter(new OutputStreamWriter(socket.getOutputStream())); - writer.write("GET / " + httpVersion + "\r\n"); - writer.write("Host: localhost\r\n"); - writer.write("\r\n"); - writer.flush(); + writer.write("GET / " + httpVersion + "\r\n"); + writer.write("Host: localhost\r\n"); + writer.write("\r\n"); + writer.flush(); - SimpleHttpResponse response = httpParser.readResponse(reader); - if ("HTTP/1.1".equals(httpVersion) && response.getHeaders().get("content-length") == null && response - .getHeaders().get("transfer-encoding") == null) - assertThat("If HTTP/1.1 response doesn't contain transfer-encoding or content-length headers, " + - "it should contain connection:close", response.getHeaders().get("connection"), is("close")); - return response; + SimpleHttpResponse response = httpParser.readResponse(reader); + if ("HTTP/1.1".equals(httpVersion) && response.getHeaders().get("content-length") == null && response + .getHeaders().get("transfer-encoding") == null) + assertThat("If HTTP/1.1 response doesn't contain transfer-encoding or content-length headers, " + + "it should contain connection:close", response.getHeaders().get("connection"), is("close")); + return response; + } } protected void assertResponseBody(SimpleHttpResponse response, String expectedResponseBody) @@ -126,8 +129,14 @@ public abstract class AbstractHttpTest this.throwException = throwException; } - @Override + @Override final public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + super.handle(target,baseRequest,request,response); + } + + @Override + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (throwException) throw new TestCommitException(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java index d188105fad5..087007499f5 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/AsyncRequestReadTest.java @@ -18,6 +18,11 @@ package org.eclipse.jetty.server; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -42,11 +47,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; - public class AsyncRequestReadTest { private static Server server; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelStatisticsTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorStatisticsTest.java similarity index 98% rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelStatisticsTest.java rename to jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorStatisticsTest.java index 24523639330..08fb8544758 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelStatisticsTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorStatisticsTest.java @@ -45,9 +45,9 @@ import org.junit.Ignore; import org.junit.Test; @Ignore("Ignored while refactoring the connection events and statistics") -public class SelectChannelStatisticsTest +public class ConnectorStatisticsTest { - private static final Logger LOG = Log.getLogger(SelectChannelStatisticsTest.class); + private static final Logger LOG = Log.getLogger(ConnectorStatisticsTest.class); private static Server _server; private static ConnectorStatistics _statistics; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java index caad44978fb..2583a0310ea 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ConnectorTimeoutTest.java @@ -18,7 +18,6 @@ package org.eclipse.jetty.server; -import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java b/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java index 2fa7fd6af68..e0a5ee44877 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/DumpHandler.java @@ -66,7 +66,7 @@ public class DumpHandler extends AbstractHandler * @see org.eclipse.jetty.server.server.Handler#handle(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int) */ @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (!isStarted()) return; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java index 7a16f503ee2..ff49a768c8b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.HttpVersion; +import org.eclipse.jetty.io.ChannelEndPoint; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.io.ManagedSelector; @@ -60,7 +61,7 @@ public class ExtendedServerTest extends HttpServerTestBase { @Override - protected SelectChannelEndPoint newEndPoint(SocketChannel channel, ManagedSelector selectSet, SelectionKey key) throws IOException + protected ChannelEndPoint newEndPoint(SocketChannel channel, ManagedSelector selectSet, SelectionKey key) throws IOException { return new ExtendedEndPoint(channel,selectSet,key, getScheduler(), getIdleTimeout()); } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java index ff80487c3ca..829669c4c88 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java @@ -47,6 +47,7 @@ import org.eclipse.jetty.http.HttpParser; import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.ErrorHandler; +import org.eclipse.jetty.util.log.AbstractLogger; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.StdErrLog; @@ -764,7 +765,7 @@ public class HttpConnectionTest try { - ((StdErrLog)Log.getLogger(HttpChannel.class)).info("Excpect IOException: Response header too large..."); + ((AbstractLogger)Log.getLogger(HttpChannel.class)).info("Excpect IOException: Response header too large..."); ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(true); int offset = 0; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitBadBehaviourTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitBadBehaviourTest.java index f03282beaf4..d07455b27cd 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitBadBehaviourTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitBadBehaviourTest.java @@ -84,7 +84,7 @@ public class HttpManyWaysToAsyncCommitBadBehaviourTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { final CyclicBarrier resumeBarrier = new CyclicBarrier(1); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java index f4cf4a41ae7..758b0043672 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToAsyncCommitTest.java @@ -100,7 +100,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -118,7 +118,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } }).run(); } - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -157,7 +157,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -176,7 +176,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -215,7 +215,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -242,7 +242,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -285,7 +285,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -314,7 +314,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -356,7 +356,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -383,7 +383,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -425,7 +425,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -455,7 +455,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -500,7 +500,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -529,7 +529,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -572,7 +572,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -601,7 +601,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -645,7 +645,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -674,7 +674,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -713,7 +713,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -742,7 +742,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -782,7 +782,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, final HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { if (request.getAttribute(CONTEXT_ATTRIBUTE) == null) { @@ -811,7 +811,7 @@ public class HttpManyWaysToAsyncCommitTest extends AbstractHttpTest }).run(); } baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToCommitTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToCommitTest.java index 3eeef861cb8..3c4f1161d2a 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToCommitTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpManyWaysToCommitTest.java @@ -83,10 +83,10 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(false); // not needed, but lets be explicit about what the test does - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -121,10 +121,10 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -161,11 +161,11 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.getWriter().write("foobar"); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -206,12 +206,12 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.getWriter().write("foobar"); response.flushBuffer(); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -249,11 +249,11 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.flushBuffer(); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -294,13 +294,13 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.getWriter().write("foo"); response.flushBuffer(); response.getWriter().write("bar"); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -369,12 +369,12 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.setBufferSize(4); response.getWriter().write("foobar"); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -386,13 +386,13 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.setBufferSize(8); response.getWriter().write("fo"); response.getWriter().write("obarfoobar"); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -404,7 +404,7 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.setBufferSize(8); @@ -414,7 +414,7 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest response.getWriter().write("fo"); response.getWriter().write("ob"); response.getWriter().write("ar"); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -452,12 +452,12 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.setContentLength(3); response.getWriter().write("foo"); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -495,13 +495,13 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.setContentLength(3); // Only "foo" will get written and "bar" will be discarded response.getWriter().write("foobar"); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -539,12 +539,12 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.getWriter().write("foo"); response.setContentLength(3); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } @@ -582,12 +582,12 @@ public class HttpManyWaysToCommitTest extends AbstractHttpTest } @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.getWriter().write("foobar"); response.setContentLength(3); - super.handle(target, baseRequest, request, response); + super.doHandle(target, baseRequest, request, response); } } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java index 57f3016bf2b..7da9552ccbb 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java @@ -54,6 +54,7 @@ import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.toolchain.test.AdvancedRunner; import org.eclipse.jetty.toolchain.test.annotation.Slow; import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.log.AbstractLogger; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.StdErrLog; import org.hamcrest.Matchers; @@ -187,7 +188,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture { client.setSoTimeout(10000); ((StdErrLog)Log.getLogger(HttpConnection.class)).setHideStacks(true); - ((StdErrLog) Log.getLogger(HttpConnection.class)).info("expect request is too large, then ISE extra data ..."); + ((AbstractLogger) Log.getLogger(HttpConnection.class)).info("expect request is too large, then ISE extra data ..."); OutputStream os = client.getOutputStream(); byte[] buffer = new byte[64 * 1024]; @@ -218,7 +219,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture try (Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort())) { ((StdErrLog)Log.getLogger(HttpConnection.class)).setHideStacks(true); - ((StdErrLog)Log.getLogger(HttpConnection.class)).info("expect URI is too large, then ISE extra data ..."); + ((AbstractLogger)Log.getLogger(HttpConnection.class)).info("expect URI is too large, then ISE extra data ..."); OutputStream os = client.getOutputStream(); byte[] buffer = new byte[64 * 1024]; @@ -244,7 +245,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture } @Test - public void testExceptionThrownInHandler() throws Exception + public void testExceptionThrownInHandlerLoop() throws Exception { configureServer(new AbstractHandler() { @@ -269,7 +270,41 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture os.flush(); String response = readResponse(client); - assertThat("response code is 500", response.contains("500"), is(true)); + assertThat(response,Matchers.containsString(" 500 ")); + } + finally + { + ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(false); + } + } + + @Test + public void testExceptionThrownInHandler() throws Exception + { + configureServer(new AbstractHandler() + { + @Override + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + throw new QuietServletException("TEST handler exception"); + } + }); + + StringBuffer request = new StringBuffer("GET / HTTP/1.0\r\n"); + request.append("Host: localhost\r\n\r\n"); + + Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort()); + OutputStream os = client.getOutputStream(); + + try + { + ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(true); + Log.getLogger(HttpChannel.class).info("Expecting ServletException: TEST handler exception..."); + os.write(request.toString().getBytes()); + os.flush(); + + String response = readResponse(client); + assertThat(response,Matchers.containsString(" 500 ")); } finally { @@ -285,7 +320,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture configureServer(new AbstractHandler() { @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); int contentLength = request.getContentLength(); @@ -299,7 +334,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture catch (EofException e) { earlyEOFException.set(true); - throw e; + throw new QuietServletException(e); } if (i == 3) fourBytesRead.set(true); @@ -338,7 +373,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture try (Socket client = newSocket(_serverURI.getHost(), _serverURI.getPort())) { ((StdErrLog)Log.getLogger(HttpConnection.class)).setHideStacks(true); - ((StdErrLog)Log.getLogger(HttpConnection.class)).info("expect header is too large, then ISE extra data ..."); + ((AbstractLogger)Log.getLogger(HttpConnection.class)).info("expect header is too large, then ISE extra data ..."); OutputStream os = client.getOutputStream(); byte[] buffer = new byte[64 * 1024]; @@ -1180,7 +1215,7 @@ public abstract class HttpServerTestBase extends HttpServerTestFixture try { ((StdErrLog)Log.getLogger(HttpChannel.class)).setHideStacks(true); - ((StdErrLog)Log.getLogger(HttpChannel.class)).info("Expecting exception after commit then could not send 500...."); + ((AbstractLogger)Log.getLogger(HttpChannel.class)).info("Expecting exception after commit then could not send 500...."); OutputStream os = client.getOutputStream(); InputStream is = client.getInputStream(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java index bfe27e45288..abaf1cf8ad9 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java @@ -1411,7 +1411,7 @@ public class RequestTest private String _content; @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { ((Request)request).setHandled(true); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java index a21e45d7732..67c6e2447f5 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java @@ -49,9 +49,9 @@ public class ResourceCacheTest Resource[] r = rc.getResources(); MimeTypes mime = new MimeTypes(); - ResourceCache rc3 = new ResourceCache(null,r[2],mime,false,false); - ResourceCache rc2 = new ResourceCache(rc3,r[1],mime,false,false); - ResourceCache rc1 = new ResourceCache(rc2,r[0],mime,false,false); + ResourceCache rc3 = new ResourceCache(null,r[2],mime,false,false,false); + ResourceCache rc2 = new ResourceCache(rc3,r[1],mime,false,false,false); + ResourceCache rc1 = new ResourceCache(rc2,r[0],mime,false,false,false); assertEquals("1 - one", getContent(rc1, "1.txt")); assertEquals("2 - two", getContent(rc1, "2.txt")); @@ -79,8 +79,8 @@ public class ResourceCacheTest Resource[] r = rc.getResources(); MimeTypes mime = new MimeTypes(); - ResourceCache rc3 = new ResourceCache(null,r[2],mime,false,false); - ResourceCache rc2 = new ResourceCache(rc3,r[1],mime,false,false) + ResourceCache rc3 = new ResourceCache(null,r[2],mime,false,false,false); + ResourceCache rc2 = new ResourceCache(rc3,r[1],mime,false,false,false) { @Override public boolean isCacheable(Resource resource) @@ -89,7 +89,7 @@ public class ResourceCacheTest } }; - ResourceCache rc1 = new ResourceCache(rc2,r[0],mime,false,false); + ResourceCache rc1 = new ResourceCache(rc2,r[0],mime,false,false,false); assertEquals("1 - one", getContent(rc1, "1.txt")); assertEquals("2 - two", getContent(rc1, "2.txt")); @@ -130,7 +130,7 @@ public class ResourceCacheTest directory=Resource.newResource(files[0].getParentFile().getAbsolutePath()); - cache=new ResourceCache(null,directory,new MimeTypes(),false,false); + cache=new ResourceCache(null,directory,new MimeTypes(),false,false,false); cache.setMaxCacheSize(95); cache.setMaxCachedFileSize(85); @@ -243,7 +243,7 @@ public class ResourceCacheTest Resource[] resources = rc.getResources(); MimeTypes mime = new MimeTypes(); - ResourceCache cache = new ResourceCache(null,resources[0],mime,false,false); + ResourceCache cache = new ResourceCache(null,resources[0],mime,false,false,false); assertEquals("4 - four", getContent(cache, "four.txt")); assertEquals("4 - four (no extension)", getContent(cache, "four")); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java index 41f27be3dad..b5942464891 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java @@ -403,7 +403,7 @@ public class ResponseTest response.sendError(404); assertEquals(404, response.getStatus()); - assertEquals(null, response.getReason()); + assertEquals("Not Found", response.getReason()); response = newResponse(); @@ -534,6 +534,7 @@ public class ResponseTest Response response = newResponse(); Request request = response.getHttpChannel().getRequest(); + request.setScheme("http"); request.setAuthority(host,port); request.setURIPathQuery("/path/info;param;jsessionid=12345?query=0&more=1#target"); request.setContextPath("/path"); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorAsyncContextTest.java similarity index 94% rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java rename to jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorAsyncContextTest.java index 206cd92bcff..41bc73e6935 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelAsyncContextTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorAsyncContextTest.java @@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets; import org.eclipse.jetty.util.IO; -public class SelectChannelAsyncContextTest extends LocalAsyncContextTest +public class ServerConnectorAsyncContextTest extends LocalAsyncContextTest { @Override protected Connector initConnector() diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorCloseTest.java similarity index 94% rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java rename to jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorCloseTest.java index b05561e7595..aaa6b5cf899 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelConnectorCloseTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorCloseTest.java @@ -23,7 +23,7 @@ import org.junit.Before; /* ------------------------------------------------------------ */ -public class SelectChannelConnectorCloseTest extends ConnectorCloseTestBase +public class ServerConnectorCloseTest extends ConnectorCloseTestBase { /* ------------------------------------------------------------ */ diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java similarity index 94% rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java rename to jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java index ea35c0f90ef..a94f9518bd6 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelServerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; * HttpServer Tester. */ @RunWith(AdvancedRunner.class) -public class SelectChannelServerTest extends HttpServerTestBase +public class ServerConnectorHttpServerTest extends HttpServerTestBase { @Before public void init() throws Exception diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTest.java index 8ee21c5fd65..3f66131ab6a 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTest.java @@ -18,6 +18,15 @@ package org.eclipse.jetty.server; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThat; + import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -33,8 +42,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.io.ChannelEndPoint; import org.eclipse.jetty.io.EndPoint; +import org.eclipse.jetty.io.SocketChannelEndPoint; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.server.handler.HandlerList; @@ -42,15 +51,6 @@ import org.eclipse.jetty.toolchain.test.OS; import org.eclipse.jetty.util.IO; import org.junit.Test; -import static org.hamcrest.Matchers.anyOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; - public class ServerConnectorTest { public static class ReuseInfoHandler extends AbstractHandler @@ -61,8 +61,8 @@ public class ServerConnectorTest response.setContentType("text/plain"); EndPoint endPoint = baseRequest.getHttpChannel().getEndPoint(); - assertThat("Endpoint",endPoint,instanceOf(ChannelEndPoint.class)); - ChannelEndPoint channelEndPoint = (ChannelEndPoint)endPoint; + assertThat("Endpoint",endPoint,instanceOf(SocketChannelEndPoint.class)); + SocketChannelEndPoint channelEndPoint = (SocketChannelEndPoint)endPoint; Socket socket = channelEndPoint.getSocket(); ServerConnector connector = (ServerConnector)baseRequest.getHttpChannel().getConnector(); diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTimeoutTest.java similarity index 98% rename from jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java rename to jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTimeoutTest.java index 44eeb75d17e..27e96c4d7bb 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorTimeoutTest.java @@ -32,7 +32,7 @@ import org.eclipse.jetty.util.IO; import org.junit.Before; import org.junit.Test; -public class SelectChannelTimeoutTest extends ConnectorTimeoutTest +public class ServerConnectorTimeoutTest extends ConnectorTimeoutTest { @Before public void init() throws Exception diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java index fa46de262f0..7179c373af2 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ThreadStarvationTest.java @@ -26,26 +26,16 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import java.net.SocketException; -import java.util.concurrent.Exchanger; -import java.util.concurrent.TimeUnit; -import javax.net.ssl.SSLException; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.io.ssl.SslConnection; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.toolchain.test.AdvancedRunner; import org.eclipse.jetty.toolchain.test.TestTracker; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.thread.QueuedThreadPool; -import org.hamcrest.Matchers; -import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerGetResourceTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerGetResourceTest.java index 27edbe74eb2..156d0af5de8 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerGetResourceTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerGetResourceTest.java @@ -85,6 +85,18 @@ public class ContextHandlerGetResourceTest Files.createSymbolicLink(new File(docroot,"other").toPath(),new File("../transit").toPath()); Files.createSymbolicLink(transit.toPath(),otherroot.toPath()); + + // /web/logs -> /var/logs -> /media/internal/logs + // where /media/internal -> /media/internal-physical/ + new File(docroot,"media/internal-physical/logs").mkdirs(); + Files.createSymbolicLink(new File(docroot,"media/internal").toPath(),new File(docroot,"media/internal-physical").toPath()); + new File(docroot,"var").mkdir(); + Files.createSymbolicLink(new File(docroot,"var/logs").toPath(),new File(docroot,"media/internal/logs").toPath()); + new File(docroot,"web").mkdir(); + Files.createSymbolicLink(new File(docroot,"web/logs").toPath(),new File(docroot,"var/logs").toPath()); + new File(docroot,"media/internal-physical/logs/file.log").createNewFile(); + + System.err.println("docroot="+docroot); } OS_ALIAS_SUPPORTED = new File(sub, "TEXTFI~1.TXT").exists(); @@ -383,6 +395,29 @@ public class ContextHandlerGetResourceTest } } + + @Test + public void testSymlinkNested() throws Exception + { + Assume.assumeTrue(OS.IS_UNIX); + + try + { + allowSymlinks.set(true); + + final String path="/web/logs/file.log"; + + Resource resource=context.getResource(path); + assertNotNull(resource); + assertEquals("file.log",resource.getFile().getName()); + assertTrue(resource.exists()); + } + finally + { + allowSymlinks.set(false); + } + + } @Test public void testSymlinkUnknown() throws Exception diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java new file mode 100644 index 00000000000..f3ae33d9d0e --- /dev/null +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/DebugHandlerTest.java @@ -0,0 +1,182 @@ +// +// ======================================================================== +// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.server.handler; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertThat; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.KeyStore; +import java.util.concurrent.Executor; + +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.TrustManagerFactory; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.io.ByteBufferPool; +import org.eclipse.jetty.io.LeakTrackingByteBufferPool; +import org.eclipse.jetty.io.MappedByteBufferPool; +import org.eclipse.jetty.server.AbstractConnectionFactory; +import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.toolchain.test.MavenTestingUtils; +import org.eclipse.jetty.toolchain.test.SimpleRequest; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.eclipse.jetty.util.thread.Scheduler; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class DebugHandlerTest +{ + public final static HostnameVerifier __hostnameverifier = new HostnameVerifier() + { + public boolean verify(String hostname, SSLSession session) + { + return true; + } + }; + + private SSLContext sslContext; + private Server server; + private URI serverURI; + private URI secureServerURI; + + @SuppressWarnings("deprecation") + private DebugHandler debugHandler; + private ByteArrayOutputStream capturedLog; + + @SuppressWarnings("deprecation") + @Before + public void startServer() throws Exception + { + server = new Server(); + + ServerConnector httpConnector = new ServerConnector(server); + httpConnector.setPort(0); + server.addConnector(httpConnector); + + File keystorePath = MavenTestingUtils.getTestResourceFile("keystore"); + SslContextFactory sslContextFactory = new SslContextFactory(); + sslContextFactory.setKeyStorePath(keystorePath.getAbsolutePath()); + sslContextFactory.setKeyStorePassword("storepwd"); + sslContextFactory.setKeyManagerPassword("keypwd"); + sslContextFactory.setTrustStorePath(keystorePath.getAbsolutePath()); + sslContextFactory.setTrustStorePassword("storepwd"); + ByteBufferPool pool = new LeakTrackingByteBufferPool(new MappedByteBufferPool.Tagged()); + ServerConnector sslConnector = new ServerConnector(server, + (Executor)null, + (Scheduler)null, pool, 1, 1, + AbstractConnectionFactory.getFactories(sslContextFactory,new HttpConnectionFactory())); + + server.addConnector(sslConnector); + + debugHandler = new DebugHandler(); + capturedLog = new ByteArrayOutputStream(); + debugHandler.setOutputStream(capturedLog); + debugHandler.setHandler(new AbstractHandler() + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.setStatus(HttpStatus.OK_200); + } + }); + server.setHandler(debugHandler); + server.start(); + + String host = httpConnector.getHost(); + if(host == null) host = "localhost"; + + serverURI = URI.create(String.format("http://%s:%d/", host, httpConnector.getLocalPort())); + secureServerURI = URI.create(String.format("https://%s:%d/", host, sslConnector.getLocalPort())); + + KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType()); + try (InputStream stream = sslContextFactory.getKeyStoreResource().getInputStream()) + { + keystore.load(stream, "storepwd".toCharArray()); + } + TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + trustManagerFactory.init(keystore); + sslContext = SSLContext.getInstance("TLS"); + sslContext.init(null, trustManagerFactory.getTrustManagers(), null); + + try + { + HttpsURLConnection.setDefaultHostnameVerifier(__hostnameverifier); + SSLContext sc = SSLContext.getInstance("TLS"); + sc.init(null, SslContextFactory.TRUST_ALL_CERTS, new java.security.SecureRandom()); + HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); + } + catch(Exception e) + { + e.printStackTrace(); + throw new RuntimeException(e); + } + } + + @After + public void stopServer() throws Exception + { + server.stop(); + } + + @Test + public void testThreadName() throws IOException + { + SimpleRequest req = new SimpleRequest(serverURI); + req.getString("/foo/bar?a=b"); + + String log = capturedLog.toString(StandardCharsets.UTF_8.name()); + String expectedThreadName = String.format("//%s:%s/foo/bar?a=b",serverURI.getHost(),serverURI.getPort()); + assertThat("ThreadName", log, containsString(expectedThreadName)); + // Look for bad/mangled/duplicated schemes + assertThat("ThreadName", log, not(containsString("http:"+expectedThreadName))); + assertThat("ThreadName", log, not(containsString("https:"+expectedThreadName))); + } + + @Test + public void testSecureThreadName() throws IOException + { + SimpleRequest req = new SimpleRequest(secureServerURI); + req.getString("/foo/bar?a=b"); + + String log = capturedLog.toString(StandardCharsets.UTF_8.name()); + String expectedThreadName = String.format("https://%s:%s/foo/bar?a=b",secureServerURI.getHost(),secureServerURI.getPort()); + assertThat("ThreadName", log, containsString(expectedThreadName)); + // Look for bad/mangled/duplicated schemes + assertThat("ThreadName", log, not(containsString("http:"+expectedThreadName))); + assertThat("ThreadName", log, not(containsString("https:"+expectedThreadName))); + } +} diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogTest.java index 21ff6f04612..61566775ddb 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogTest.java @@ -66,6 +66,7 @@ public class RequestLogTest _server.stop(); } + @Test public void testNotHandled() throws Exception { @@ -73,6 +74,30 @@ public class RequestLogTest String log = _log.exchange(null,5,TimeUnit.SECONDS); assertThat(log,containsString("GET /foo HTTP/1.0\" 404 ")); } + + @Test + public void testRequestLine() throws Exception + { + _connector.getResponses("GET /foo?data=1 HTTP/1.0\nhost: host:80\n\n"); + String log = _log.exchange(null,5,TimeUnit.SECONDS); + // TODO should be without host (https://bugs.eclipse.org/bugs/show_bug.cgi?id=480276) + // assertThat(log,containsString("GET /foo?data=1 HTTP/1.0\" 200 ")); + assertThat(log,containsString("GET //host:80/foo?data=1 HTTP/1.0\" 200 ")); + + _connector.getResponses("GET //host/foo?data=1 HTTP/1.0\n\n"); + log = _log.exchange(null,5,TimeUnit.SECONDS); + assertThat(log,containsString("GET //host/foo?data=1 HTTP/1.0\" 200 ")); + + _connector.getResponses("GET //absolute:80/foo?data=1 HTTP/1.0\nhost: host:80\n\n"); + log = _log.exchange(null,5,TimeUnit.SECONDS); + // TODO should it be with absolute? (https://bugs.eclipse.org/bugs/show_bug.cgi?id=480276) + // assertThat(log,containsString("GET //absolute:80/foo?data=1 HTTP/1.0\" 200 ")); + assertThat(log,containsString("GET //host:80/foo?data=1 HTTP/1.0\" 200 ")); + + _connector.getResponses("GET http://host:80/foo?data=1 HTTP/1.0\n\n"); + log = _log.exchange(null,5,TimeUnit.SECONDS); + assertThat(log,containsString("GET http://host:80/foo?data=1 HTTP/1.0\" 200 ")); + } @Test public void testSmallData() throws Exception diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java index 7101ad4ed5e..22d28d72d39 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ResourceHandlerTest.java @@ -18,6 +18,9 @@ package org.eclipse.jetty.server.handler; +import static org.hamcrest.Matchers.startsWith; +import static org.junit.Assert.assertThat; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -33,6 +36,7 @@ import java.nio.file.Files; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; +import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; @@ -58,6 +62,7 @@ public class ResourceHandlerTest private static Server _server; private static HttpConfiguration _config; private static ServerConnector _connector; + private static LocalConnector _local; private static ContextHandler _contextHandler; private static ResourceHandler _resourceHandler; @@ -111,7 +116,9 @@ public class ResourceHandlerTest _config.setOutputBufferSize(2048); _connector = new ServerConnector(_server,new HttpConnectionFactory(_config)); - _server.setConnectors(new Connector[] { _connector }); + _local = new LocalConnector(_server); + + _server.setConnectors(new Connector[] { _connector, _local }); _resourceHandler = new ResourceHandler(); _resourceHandler.setMinAsyncContentLength(4096); @@ -151,6 +158,18 @@ public class ResourceHandlerTest Assert.assertEquals("simple text",sr.getString("/resource/simple.txt")); } + @Test + public void testHeaders() throws Exception + { + String response = _local.getResponses("GET /resource/simple.txt HTTP/1.0\r\n\r\n"); + assertThat(response,startsWith("HTTP/1.1 200 OK")); + assertThat(response,Matchers.containsString("Content-Type: text/plain")); + assertThat(response,Matchers.containsString("Last-Modified: ")); + assertThat(response,Matchers.containsString("Content-Length: 11")); + assertThat(response,Matchers.containsString("Server: Jetty")); + assertThat(response,Matchers.containsString("simple text")); + } + @Test public void testBigFile() throws Exception { diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java index a242a51151e..f33d45d1f10 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java @@ -20,7 +20,6 @@ package org.eclipse.jetty.server.ssl; import static org.junit.Assert.assertEquals; -import java.io.FileInputStream; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java index 5bdb81b386e..062c79c42ac 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SniSslConnectionFactoryTest.java @@ -18,6 +18,10 @@ package org.eclipse.jetty.server.ssl; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.startsWith; +import static org.junit.Assert.assertThat; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -98,7 +102,7 @@ public class SniSslConnectionFactoryTest _server.setHandler(new AbstractHandler() { @Override - public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + public void doHandle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { baseRequest.setHandled(true); response.setStatus(200); @@ -237,8 +241,8 @@ public class SniSslConnectionFactoryTest output.flush(); response = response(input); - Assert.assertTrue(response.startsWith("HTTP/1.1 400 ")); - Assert.assertThat(response, Matchers.containsString("Host does not match SNI")); + assertThat(response,startsWith("HTTP/1.1 400 ")); + assertThat(response, containsString("Host does not match SNI")); } finally { diff --git a/jetty-server/src/test/resources/jetty-logging.properties b/jetty-server/src/test/resources/jetty-logging.properties index adf68c7c337..f345cd6cb5e 100644 --- a/jetty-server/src/test/resources/jetty-logging.properties +++ b/jetty-server/src/test/resources/jetty-logging.properties @@ -1,3 +1,3 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog -#org.eclipse.jetty.LEVEL=DEBUG +org.eclipse.jetty.LEVEL=INFO #org.eclipse.jetty.server.LEVEL=DEBUG diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index a1ae6875f21..cc6fb609116 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@
* This handler maps requests to servlets that implement the
@@ -155,7 +149,7 @@ public class ServletHandler extends ScopedHandler
updateNameMappings();
updateMappings();
- if (getServletMapping("/")==null && _ensureDefaultServlet)
+ if (getServletMapping("/")==null && isEnsureDefaultServlet())
{
if (LOG.isDebugEnabled())
LOG.debug("Adding Default404Servlet to {}",this);
@@ -164,19 +158,19 @@ public class ServletHandler extends ScopedHandler
getServletMapping("/").setDefault(true);
}
- if(_filterChainsCached)
+ if (isFilterChainsCached())
{
- _chainCache[FilterMapping.REQUEST]=new ConcurrentHashMap
* Holds the name, params and some state of a javax.servlet.Servlet
@@ -72,6 +72,7 @@ public class ServletHolder extends Holder
* Holders with order<0, are initialized on use. Those with
@@ -199,7 +199,7 @@ public class ServletHolder extends Holder
- * Incomplete set is considered to be no-match.
- */
-public class CriteriaSetPredicate implements Predicate
-{
- private final Set
- * Useful for nodes that are virtual/transient in nature (such as the jsp/jstl/alpn modules)
- * @param name the name of the node to resolve
- * @return the node
- */
- public abstract T resolveNode(String name);
-
- public Set${jetty.base}, including
@@ -94,37 +97,6 @@ public class BaseBuilder
}
}
- private void ackLicenses() throws IOException
- {
- if (startArgs.isLicenseCheckRequired())
- {
- if (startArgs.isApproveAllLicenses())
- {
- StartLog.info("All Licenses Approved via Command Line Option");
- }
- else
- {
- Licensing licensing = new Licensing();
- for (Module module : startArgs.getAllModules().getSelected())
- {
- if (!module.hasFiles(baseHome,startArgs.getProperties()))
- {
- licensing.addModule(module);
- }
- }
-
- if (licensing.hasLicenses())
- {
- StartLog.debug("Requesting License Acknowledgement");
- if (!licensing.acknowledgeLicenses())
- {
- StartLog.warn(EXITING_LICENSE_NOT_ACKNOWLEDGED);
- System.exit(1);
- }
- }
- }
- }
- }
/**
* Build out the Base directory (if needed)
@@ -135,112 +107,101 @@ public class BaseBuilder
public boolean build() throws IOException
{
Modules modules = startArgs.getAllModules();
- boolean dirty = false;
- String dirCriteria = "${jetty.base}/start.d/ based configuration.
@@ -64,13 +63,12 @@ public class StartDirBuilder implements BaseBuilder.Config
}
String mode = "";
- boolean isTransitive = module.matches(OnlyTransitivePredicate.INSTANCE);
- if (isTransitive)
+ if (module.isTransitive())
{
mode = "(transitively) ";
}
- if (module.hasIniTemplate() || !isTransitive)
+ if (module.hasIniTemplate() || !module.isTransitive())
{
// Create start.d/{name}.ini
Path ini = startDir.resolve(module.getName() + ".ini");
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/builders/StartIniBuilder.java b/jetty-start/src/main/java/org/eclipse/jetty/start/builders/StartIniBuilder.java
index 035ec201180..f55d2c5f35c 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/builders/StartIniBuilder.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/builders/StartIniBuilder.java
@@ -35,7 +35,6 @@ import org.eclipse.jetty.start.BaseHome;
import org.eclipse.jetty.start.Module;
import org.eclipse.jetty.start.Props;
import org.eclipse.jetty.start.StartLog;
-import org.eclipse.jetty.start.graph.OnlyTransitivePredicate;
/**
* Management of the ${jetty.base}/start.ini based configuration.
@@ -107,13 +106,12 @@ public class StartIniBuilder implements BaseBuilder.Config
}
String mode = "";
- boolean isTransitive = module.matches(OnlyTransitivePredicate.INSTANCE);
- if (isTransitive)
+ if (module.isTransitive())
{
mode = "(transitively) ";
}
- if (module.hasIniTemplate() || !isTransitive)
+ if (module.hasIniTemplate() || !module.isTransitive())
{
StartLog.info("%-15s initialised %sin %s",module.getName(),mode,baseHome.toShortForm(startIni));
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializer.java b/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializer.java
index 76f8e55e190..6c2466b4f86 100644
--- a/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializer.java
+++ b/jetty-start/src/main/java/org/eclipse/jetty/start/fileinits/MavenLocalRepoFileInitializer.java
@@ -47,7 +47,7 @@ import org.eclipse.jetty.start.Utils;
*