_handlers = new AtomicReference<>();
/* ------------------------------------------------------------ */
public HandlerCollection()
@@ -71,72 +72,93 @@ public class HandlerCollection extends AbstractHandlerContainer
/* ------------------------------------------------------------ */
/**
- * @return Returns the handlers.
+ * @return the array of handlers.
*/
@Override
@ManagedAttribute(value="Wrapped handlers", readonly=true)
public Handler[] getHandlers()
{
- return _handlers;
+ Handlers handlers = _handlers.get();
+ return handlers==null ? null : handlers._handlers;
}
/* ------------------------------------------------------------ */
/**
- * @param handlers The handlers to set.
+ * @param handlers the array of handlers to set.
*/
public void setHandlers(Handler[] handlers)
{
if (!_mutableWhenRunning && isStarted())
throw new IllegalStateException(STARTED);
- if (handlers!=null)
+ while(true)
{
- // check for loops
- for (Handler handler:handlers)
- if (handler == this || (handler instanceof HandlerContainer &&
- Arrays.asList(((HandlerContainer)handler).getChildHandlers()).contains(this)))
- throw new IllegalStateException("setHandler loop");
-
- // Set server
- for (Handler handler:handlers)
- if (handler.getServer()!=getServer())
- handler.setServer(getServer());
+ if (updateHandlers(_handlers.get(), newHandlers(handlers)))
+ break;
}
- Handler[] old=_handlers;;
- _handlers = handlers;
- updateBeans(old, handlers);
}
/* ------------------------------------------------------------ */
- /**
- * @see Handler#handle(String, Request, HttpServletRequest, HttpServletResponse)
- */
+ protected Handlers newHandlers(Handler[] handlers)
+ {
+ if (handlers==null || handlers.length==0)
+ return null;
+ return new Handlers(handlers);
+ }
+
+ /* ------------------------------------------------------------ */
+ protected boolean updateHandlers(Handlers old, Handlers handlers)
+ {
+ if (handlers!=null)
+ {
+ // check for loops
+ for (Handler handler:handlers._handlers)
+ if (handler == this || (handler instanceof HandlerContainer &&
+ Arrays.asList(((HandlerContainer)handler).getChildHandlers()).contains(this)))
+ throw new IllegalStateException("setHandler loop");
+
+ // Set server
+ for (Handler handler:handlers._handlers)
+ if (handler.getServer()!=getServer())
+ handler.setServer(getServer());
+ }
+
+ if (_handlers.compareAndSet(old, handlers))
+ {
+ Handler[] oldBeans = old == null ? null : old._handlers;
+ Handler[] newBeans = handlers == null ? null : handlers._handlers;
+ updateBeans(oldBeans, newBeans);
+ return true;
+ }
+ return false;
+ }
+
+ /* ------------------------------------------------------------ */
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
- if (_handlers!=null && isStarted())
+ if (isStarted())
{
- MultiException mex=null;
+ Handlers handlers = _handlers.get();
+ if (handlers==null)
+ return;
- for (int i=0;i<_handlers.length;i++)
+ MultiException mex=null;
+ for (Handler handler : handlers._handlers)
{
try
{
- _handlers[i].handle(target,baseRequest, request, response);
+ handler.handle(target, baseRequest, request, response);
}
- catch(IOException e)
+ catch (IOException | RuntimeException e)
{
throw e;
}
- catch(RuntimeException e)
+ catch (Exception e)
{
- throw e;
- }
- catch(Exception e)
- {
- if (mex==null)
- mex=new MultiException();
+ if (mex == null)
+ mex = new MultiException();
mex.add(e);
}
}
@@ -147,37 +169,54 @@ public class HandlerCollection extends AbstractHandlerContainer
else
throw new ServletException(mex);
}
-
}
}
/* ------------------------------------------------------------ */
- /* Add a handler.
+ /**
+ * Adds a handler.
* This implementation adds the passed handler to the end of the existing collection of handlers.
- * @see org.eclipse.jetty.server.server.HandlerContainer#addHandler(org.eclipse.jetty.server.server.Handler)
+ * If the handler is already added, it is removed and readded
*/
public void addHandler(Handler handler)
{
- setHandlers(ArrayUtil.addToArray(getHandlers(), handler, Handler.class));
+ while(true)
+ {
+ Handlers old = _handlers.get();
+ Handlers handlers = newHandlers(ArrayUtil.addToArray(old==null?null:ArrayUtil.removeFromArray(old._handlers, handler), handler, Handler.class));
+ if (updateHandlers(old,handlers))
+ break;
+ }
}
/* ------------------------------------------------------------ */
- /* Prepend a handler.
+ /**
+ * Prepends a handler.
* This implementation adds the passed handler to the start of the existing collection of handlers.
- * @see org.eclipse.jetty.server.server.HandlerContainer#addHandler(org.eclipse.jetty.server.server.Handler)
*/
public void prependHandler(Handler handler)
{
- setHandlers(ArrayUtil.prependToArray(handler, getHandlers(), Handler.class));
+ while(true)
+ {
+ Handlers old = _handlers.get();
+ Handlers handlers = newHandlers(ArrayUtil.prependToArray(handler, old==null?null:old._handlers, Handler.class));
+ if (updateHandlers(old,handlers))
+ break;
+ }
}
/* ------------------------------------------------------------ */
public void removeHandler(Handler handler)
{
- Handler[] handlers = getHandlers();
-
- if (handlers!=null && handlers.length>0 )
- setHandlers(ArrayUtil.removeFromArray(handlers, handler));
+ while(true)
+ {
+ Handlers old = _handlers.get();
+ if (old==null || old._handlers.length==0)
+ break;
+ Handlers handlers = newHandlers(ArrayUtil.removeFromArray(old._handlers, handler));
+ if (updateHandlers(old,handlers))
+ break;
+ }
}
/* ------------------------------------------------------------ */
@@ -196,10 +235,28 @@ public class HandlerCollection extends AbstractHandlerContainer
{
if (!isStopped())
throw new IllegalStateException("!STOPPED");
- Handler[] children=getChildHandlers();
+ Handler[] children = getChildHandlers();
setHandlers(null);
for (Handler child: children)
child.destroy();
super.destroy();
}
+
+ /* ------------------------------------------------------------ */
+ /* ------------------------------------------------------------ */
+ /* ------------------------------------------------------------ */
+ protected static class Handlers
+ {
+ private final Handler[] _handlers;
+
+ protected Handlers(Handler[] handlers)
+ {
+ this._handlers = handlers;
+ }
+
+ public Handler[] getHandlers()
+ {
+ return _handlers;
+ }
+ }
}
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 5525a49990f..c8e54f1a06d 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
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
index 579f6305194..7292631f600 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
@@ -18,17 +18,17 @@
package org.eclipse.jetty.server;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.util.log.StacklessLogging;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterEach;
-
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
/**
*
*/
@@ -82,6 +82,7 @@ public class ProxyConnectionTest
}
@Test
+ @Tag("ipv6")
public void testIPv6() throws Exception
{
String response=_connector.getResponse("PROXY UNKNOWN eeee:eeee:eeee:eeee:eeee:eeee:eeee:eeee ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 65535 65535\r\n"+
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java
index b0eda81f5c3..d6b04538afe 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java
@@ -18,16 +18,6 @@
package org.eclipse.jetty.server.handler;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.endsWith;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
import java.io.IOException;
import javax.servlet.AsyncContext;
@@ -41,9 +31,18 @@ import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.hamcrest.Matchers;
-
import org.junit.jupiter.api.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
public class ContextHandlerCollectionTest
{
@Test
@@ -214,7 +213,7 @@ public class ContextHandlerCollectionTest
IsHandledHandler handler = (IsHandledHandler)context.getHandler();
context.setVirtualHosts(contextHosts);
- // trigger this manually; it's supposed to be called when adding the handler
+ // trigger this manually
handlerCollection.mapContexts();
for(String host : requestHosts)
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 bc7a6c24b1e..1ca0baa01b7 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
@@ -167,7 +167,7 @@ public class ResourceHandlerTest
_local.getResponse("GET /resource/ HTTP/1.0\r\n\r\n"));
assertThat(response.getStatus(),equalTo(200));
assertThat(response.getContent(),containsString("jetty-dir.css"));
- assertThat(response.getContent(),containsString("Directory: /resource/"));
+ assertThat(response.getContent(),containsString("Directory: /resource/"));
assertThat(response.getContent(),containsString("big.txt"));
assertThat(response.getContent(),containsString("bigger.txt"));
assertThat(response.getContent(),containsString("directory"));
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
index 69563a9c9f8..d7f87544921 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
@@ -23,7 +23,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
@@ -48,8 +47,7 @@ import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.resource.ResourceFactory;
-
-/**
+/**
* The default servlet.
*
* This servlet, normally mapped to /, provides the handling for static
@@ -79,9 +77,9 @@ import org.eclipse.jetty.util.resource.ResourceFactory;
*
* gzip If set to true, then static content will be served as
* gzip content encoded if a matching resource is
- * found ending with ".gz" (default false)
+ * found ending with ".gz" (default false)
* (deprecated: use precompressed)
- *
+ *
* precompressed If set to a comma separated list of encoding types (that may be
* listed in a requests Accept-Encoding header) to file
* extension mappings to look for and serve. For example:
@@ -131,10 +129,10 @@ import org.eclipse.jetty.util.resource.ResourceFactory;
public class DefaultServlet extends HttpServlet implements ResourceFactory, WelcomeFactory
{
public static final String CONTEXT_INIT = "org.eclipse.jetty.servlet.Default.";
-
+
private static final Logger LOG = Log.getLogger(DefaultServlet.class);
- private static final long serialVersionUID = 4930458713846881193L;
+ private static final long serialVersionUID = 4930458713846881193L;
private final ResourceService _resourceService;
private ServletContext _servletContext;
@@ -165,7 +163,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory, Welc
{
this(new ResourceService());
}
-
+
/* ------------------------------------------------------------ */
@Override
public void init()
@@ -186,7 +184,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory, Welc
_resourceService.setPrecompressedFormats(parsePrecompressedFormats(getInitParameter("precompressed"), getInitBoolean("gzip", false)));
_resourceService.setPathInfoOnly(getInitBoolean("pathInfoOnly",_resourceService.isPathInfoOnly()));
_resourceService.setEtags(getInitBoolean("etags",_resourceService.isEtags()));
-
+
if ("exact".equals(getInitParameter("welcomeServlets")))
{
_welcomeExactServlets=true;
@@ -242,8 +240,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory, Welc
String cc=getInitParameter("cacheControl");
if (cc!=null)
_resourceService.setCacheControl(new PreEncodedHttpField(HttpHeader.CACHE_CONTROL,cc));
-
-
+
String resourceCache = getInitParameter("resourceCache");
int max_cache_size=getInitInt("maxCacheSize", -2);
int max_cached_file_size=getInitInt("maxCachedFileSize", -2);
@@ -286,7 +283,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory, Welc
}
_resourceService.setContentFactory(contentFactory);
_resourceService.setWelcomeFactory(this);
-
+
List gzip_equivalent_file_extensions = new ArrayList();
String otherGzipExtensions = getInitParameter("otherGzipFileExtensions");
if (otherGzipExtensions != null)
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
index 7d7c2b163a7..690cafcfed4 100644
--- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
+++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
@@ -157,10 +157,14 @@ public class DefaultServletTest
defholder.setInitParameter("gzip", "false");
/* create some content in the docroot */
- FS.ensureDirExists(docRoot.resolve("one"));
+ Path one = docRoot.resolve("one");
+ FS.ensureDirExists(one);
FS.ensureDirExists(docRoot.resolve("two"));
FS.ensureDirExists(docRoot.resolve("three"));
+ Path alert = one.resolve("onmouseclick='alert(oops)'");
+ FS.touch(alert);
+
/*
* Intentionally bad request URI. Sending a non-encoded URI with typically
* encoded characters '<', '>', and '"'.
@@ -172,6 +176,16 @@ public class DefaultServletTest
String body = response.getContent();
assertThat(body, not(containsString("