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

Merge remote-tracking branch 'origin/jetty-9.3.x'

This commit is contained in:
Greg Wilkins 2016-02-04 07:00:13 +01:00
parent 459ba4ae5a 009fde2400
commit df79ad689a
45 changed files with 1727 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apache-jstl/src/test/java/org/eclipse/jetty/jstl/JstlTest.java
View File

@ -18,8 +18,9 @@
package org.eclipse.jetty.jstl; package org.eclipse.jetty.jstl;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.*; import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThat;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -75,6 +76,16 @@ public class JstlTest
WebAppContext context = new WebAppContext(); WebAppContext context = new WebAppContext();
context.setContextPath("/"); context.setContextPath("/");
/* TODO: Bug #486530 - sub-handler on WebAppContext prevents startup
context.setHandler(new AbstractHandler()
{
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
}
});
*/
File scratchDir = MavenTestingUtils.getTargetFile("tests/" + JstlTest.class.getSimpleName() + "-scratch"); File scratchDir = MavenTestingUtils.getTargetFile("tests/" + JstlTest.class.getSimpleName() + "-scratch");
FS.ensureEmpty(scratchDir); FS.ensureEmpty(scratchDir);
JspConfig.init(context,testWebAppDir.toURI(),scratchDir); JspConfig.init(context,testWebAppDir.toURI(),scratchDir);

3
apache-jstl/src/test/resources/jetty-logging.properties Normal file
View File

@ -0,0 +1,3 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
# org.eclipse.jetty.LEVEL=INFO
# org.eclipse.jetty.util.LEVEL=DEBUG

2
jetty-distribution/src/main/resources/demo-base/webapps/ROOT/index.html
View File

@ -66,7 +66,7 @@
<div id='blog'> <div id='blog'>
<h1>Jetty Blog</h1> <h1>Jetty Blog</h1>
<iframe src="http://www.webtide.com/blog.jsp" /> <iframe src="https://webtide.com/blog.jsp" />
</div> </div>
</body> </body>
</html> </html>

14
jetty-distribution/src/main/resources/etc/jamon.xml
View File

@ -7,13 +7,13 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Get id="oldhandler" name="handler" /> <Call name="insertHandler">
<Set name="handler"> <Arg>
<New id="JamonHandler" class="com.jamonapi.http.JAMonJettyHandlerNew"> <New id="JamonHandler" class="com.jamonapi.http.JAMonJettyHandlerNew">
<Set name="handler"><Ref refid="oldhandler" /></Set> <Set name="summaryLabels"><Property name="jamon.summaryLabels" /></Set>
<Set name="summaryLabels"><Property name="jamon.summaryLabels" /></Set> </New>
</New> </Arg>
</Set> </Call>
<Ref refid="Contexts"> <Ref refid="Contexts">
<Call name="addHandler"> <Call name="addHandler">

19
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
View File

@ -334,6 +334,8 @@ public class HttpURI
state=State.PORT; state=State.PORT;
break; break;
case '@': case '@':
if (_user!=null)
throw new IllegalArgumentException("Bad authority");
_user=uri.substring(mark,i); _user=uri.substring(mark,i);
mark=i+1; mark=i+1;
break; break;
@ -372,7 +374,16 @@ public class HttpURI
case PORT: case PORT:
{ {
if (c=='/') if (c=='@')
{
if (_user!=null)
throw new IllegalArgumentException("Bad authority");
// It wasn't a port, but a password!
_user=_host+":"+uri.substring(mark,i);
mark=i+1;
state=State.HOST;
}
else if (c=='/')
{ {
_port=TypeUtil.parseInt(uri,mark,i-mark,10); _port=TypeUtil.parseInt(uri,mark,i-mark,10);
path_mark=mark=i; path_mark=mark=i;
@ -746,5 +757,11 @@ public class HttpURI
return _host; return _host;
} }
/* ------------------------------------------------------------ */
public String getUser()
{
return _user;
}
} }

10
jetty-http/src/test/java/org/eclipse/jetty/http/HttpURITest.java
View File

@ -22,6 +22,7 @@ package org.eclipse.jetty.http;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -193,4 +194,13 @@ public class HttpURITest
assertEquals("http:/path/info",uri.toString()); assertEquals("http:/path/info",uri.toString());
} }
@Test
public void testBasicAuthCredentials() throws Exception
{
HttpURI uri = new HttpURI("http://user:password@example.com:8888/blah");
assertEquals("http://user:password@example.com:8888/blah", uri.toString());
assertEquals(uri.getAuthority(), "example.com:8888");
assertEquals(uri.getUser(), "user:password");
}
} }

28
jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
View File

@ -28,6 +28,7 @@ import java.nio.channels.SelectionKey;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.ExecutionStrategy.Rejectable;
import org.eclipse.jetty.util.thread.Locker; import org.eclipse.jetty.util.thread.Locker;
import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.Scheduler;
@ -73,6 +74,27 @@ public abstract class ChannelEndPoint extends AbstractEndPoint implements Manage
} }
} }
private abstract class RejectableRunnable extends RunnableTask implements Rejectable
{
RejectableRunnable(String op)
{
super(op);
}
@Override
public void reject()
{
try
{
close();
}
catch (Throwable x)
{
LOG.warn(x);
}
}
}
private final Runnable _runUpdateKey = new RunnableTask("runUpdateKey") private final Runnable _runUpdateKey = new RunnableTask("runUpdateKey")
{ {
@Override @Override
@ -82,7 +104,7 @@ public abstract class ChannelEndPoint extends AbstractEndPoint implements Manage
} }
}; };
private final Runnable _runFillable = new RunnableTask("runFillable") private final Runnable _runFillable = new RejectableRunnable("runFillable")
{ {
@Override @Override
public void run() public void run()
@ -91,7 +113,7 @@ public abstract class ChannelEndPoint extends AbstractEndPoint implements Manage
} }
}; };
private final Runnable _runCompleteWrite = new RunnableTask("runCompleteWrite") private final Runnable _runCompleteWrite = new RejectableRunnable("runCompleteWrite")
{ {
@Override @Override
public void run() public void run()
@ -100,7 +122,7 @@ public abstract class ChannelEndPoint extends AbstractEndPoint implements Manage
} }
}; };
private final Runnable _runFillableCompleteWrite = new RunnableTask("runFillableCompleteWrite") private final Runnable _runFillableCompleteWrite = new RejectableRunnable("runFillableCompleteWrite")
{ {
@Override @Override
public void run() public void run()

19
jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
View File

@ -43,6 +43,7 @@ import org.eclipse.jetty.util.component.Dumpable;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.ExecutionStrategy; import org.eclipse.jetty.util.thread.ExecutionStrategy;
import org.eclipse.jetty.util.thread.ExecutionStrategy.Rejectable;
import org.eclipse.jetty.util.thread.Locker; import org.eclipse.jetty.util.thread.Locker;
import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.Scheduler;
@ -536,7 +537,7 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
} }
} }
class Accept implements Runnable class Accept implements Runnable, Rejectable
{ {
private final SelectableChannel channel; private final SelectableChannel channel;
private final Object attachment; private final Object attachment;
@ -547,6 +548,13 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
this.attachment = attachment; this.attachment = attachment;
} }
@Override
public void reject()
{
LOG.debug("rejected accept {}",channel);
closeNoExceptions(channel);
}
@Override @Override
public void run() public void run()
{ {
@ -563,7 +571,7 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
} }
} }
private class CreateEndPoint implements Product private class CreateEndPoint implements Product, Rejectable
{ {
private final SelectableChannel channel; private final SelectableChannel channel;
private final SelectionKey key; private final SelectionKey key;
@ -588,6 +596,13 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
} }
} }
@Override
public void reject()
{
LOG.debug("rejected create {}",channel);
closeNoExceptions(channel);
}
protected void failed(Throwable failure) protected void failed(Throwable failure)
{ {
closeNoExceptions(channel); closeNoExceptions(channel);

154
jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointTest.java
View File

@ -37,9 +37,12 @@ import java.nio.channels.SelectionKey;
import java.nio.channels.ServerSocketChannel; import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel; import java.nio.channels.SocketChannel;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Callback;
@ -49,9 +52,11 @@ import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.Scheduler; import org.eclipse.jetty.util.thread.Scheduler;
import org.eclipse.jetty.util.thread.TimerScheduler; import org.eclipse.jetty.util.thread.TimerScheduler;
import org.hamcrest.Matchers;
import org.junit.After; import org.junit.After;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
public class SelectChannelEndPointTest public class SelectChannelEndPointTest
@ -124,10 +129,18 @@ public class SelectChannelEndPointTest
ByteBuffer _in = BufferUtil.allocate(32 * 1024); ByteBuffer _in = BufferUtil.allocate(32 * 1024);
ByteBuffer _out = BufferUtil.allocate(32 * 1024); ByteBuffer _out = BufferUtil.allocate(32 * 1024);
long _last = -1; long _last = -1;
final CountDownLatch _latch;
public TestConnection(EndPoint endp) public TestConnection(EndPoint endp)
{ {
super(endp, _threadPool); super(endp, _threadPool);
_latch=null;
}
public TestConnection(EndPoint endp,CountDownLatch latch)
{
super(endp, _threadPool);
_latch=latch;
} }
@Override @Override
@ -153,6 +166,18 @@ public class SelectChannelEndPointTest
@Override @Override
public void onFillable() public void onFillable()
{ {
if (_latch!=null)
{
try
{
_latch.await();
}
catch (InterruptedException e)
{
e.printStackTrace();
}
}
Callback blocking = _blockingRead; Callback blocking = _blockingRead;
if (blocking!=null) if (blocking!=null)
{ {
@ -671,4 +696,133 @@ public class SelectChannelEndPointTest
} }
assertFalse(server.isOpen()); assertFalse(server.isOpen());
} }
// TODO make this test reliable
@Test
@Ignore
public void testRejectedExecution() throws Exception
{
_manager.stop();
_threadPool.stop();
final CountDownLatch latch = new CountDownLatch(1);
BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(4);
_threadPool = new QueuedThreadPool(4,4,60000,q);
_manager = new SelectorManager(_threadPool, _scheduler, 1)
{
@Override
protected EndPoint newEndPoint(SelectableChannel channel, ManagedSelector selector, SelectionKey selectionKey) throws IOException
{
SocketChannelEndPoint endp = new SocketChannelEndPoint(channel,selector,selectionKey,getScheduler());
_lastEndPoint = endp;
_lastEndPointLatch.countDown();
return endp;
}
@Override
public Connection newConnection(SelectableChannel channel, EndPoint endpoint, Object attachment) throws IOException
{
return new TestConnection(endpoint,latch);
}
};
_threadPool.start();
_manager.start();
AtomicInteger timeout = new AtomicInteger();
AtomicInteger rejections = new AtomicInteger();
AtomicInteger echoed = new AtomicInteger();
CountDownLatch closed = new CountDownLatch(20);
for (int i=0;i<20;i++)
{
new Thread()
{
public void run()
{
try(Socket client = newClient();)
{
client.setSoTimeout(5000);
SocketChannel server = _connector.accept();
server.configureBlocking(false);
_manager.accept(server);
// Write client to server
client.getOutputStream().write("HelloWorld".getBytes(StandardCharsets.UTF_8));
client.getOutputStream().flush();
client.shutdownOutput();
// Verify echo server to client
for (char c : "HelloWorld".toCharArray())
{
int b = client.getInputStream().read();
assertTrue(b > 0);
assertEquals(c, (char)b);
}
assertEquals(-1,client.getInputStream().read());
echoed.incrementAndGet();
}
catch(SocketTimeoutException x)
{
x.printStackTrace();
timeout.incrementAndGet();
}
catch(Throwable x)
{
rejections.incrementAndGet();
}
finally
{
closed.countDown();
}
}
}.start();
}
// unblock the handling
latch.countDown();
// wait for all clients to complete or fail
closed.await();
// assert some clients must have been rejected
Assert.assertThat(rejections.get(),Matchers.greaterThan(0));
// but not all of them
Assert.assertThat(rejections.get(),Matchers.lessThan(20));
// none should have timed out
Assert.assertThat(timeout.get(),Matchers.equalTo(0));
// and the rest should have worked
Assert.assertThat(echoed.get(),Matchers.equalTo(20-rejections.get()));
// and the selector is still working for new requests
try(Socket client = newClient();)
{
client.setSoTimeout(5000);
SocketChannel server = _connector.accept();
server.configureBlocking(false);
_manager.accept(server);
// Write client to server
client.getOutputStream().write("HelloWorld".getBytes(StandardCharsets.UTF_8));
client.getOutputStream().flush();
client.shutdownOutput();
// Verify echo server to client
for (char c : "HelloWorld".toCharArray())
{
int b = client.getInputStream().read();
assertTrue(b > 0);
assertEquals(c, (char)b);
}
assertEquals(-1,client.getInputStream().read());
}
}
} }

286
jetty-quickstart/src/main/java/org/eclipse/jetty/quickstart/AttributeNormalizer.java
View File

@ -19,9 +19,19 @@
package org.eclipse.jetty.quickstart; package org.eclipse.jetty.quickstart;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
@ -30,7 +40,8 @@ import org.eclipse.jetty.util.resource.Resource;
/** /**
* Normalize Attribute to String. * Normalize Attribute to String.
* <p>Replaces and expands: * <p>
* Replaces and expands:
* <ul> * <ul>
* <li>${WAR}</li> * <li>${WAR}</li>
* <li>${jetty.base}</li> * <li>${jetty.base}</li>
@ -42,72 +53,151 @@ import org.eclipse.jetty.util.resource.Resource;
public class AttributeNormalizer public class AttributeNormalizer
{ {
private static final Logger LOG = Log.getLogger(AttributeNormalizer.class); private static final Logger LOG = Log.getLogger(AttributeNormalizer.class);
private final Path _warPath; private static final Pattern __propertyPattern = Pattern.compile("(?<=[^$]|^)\\$\\{([^}]*)\\}");
private final Path _jettyBasePath;
private final Path _jettyHomePath;
private final Path _userHomePath;
private final Path _userDirPath;
private static class PathAttribute
{
public final Path path;
public final String key;
private int weight = -1;
public PathAttribute(String key, Path path) throws IOException
{
this.key = key;
this.path = toCanonicalPath(path);
// TODO: Don't allow non-directory paths? (but what if the path doesn't exist?)
}
public PathAttribute(String key, String systemPropertyKey) throws IOException
{
this(key, toCanonicalPath(System.getProperty(systemPropertyKey)));
}
private static Path toCanonicalPath(String path) throws IOException
{
if (path == null)
{
return null;
}
return toCanonicalPath(FileSystems.getDefault().getPath(path));
}
private static Path toCanonicalPath(Path path) throws IOException
{
if (path == null)
{
return null;
}
if (Files.exists(path))
{
return path.toRealPath();
}
return path.toAbsolutePath();
}
public PathAttribute weight(int newweight)
{
this.weight = newweight;
return this;
}
@Override
public String toString()
{
return String.format("PathAttribute[%s=>%s,%d]",key,path,weight);
}
}
private static class PathAttributeComparator implements Comparator<PathAttribute>
{
@Override
public int compare(PathAttribute o1, PathAttribute o2)
{
if( (o1.path == null) && (o2.path != null) )
{
return -1;
}
if( (o1.path != null) && (o2.path == null) )
{
return 1;
}
// Different lengths?
int diff = o2.path.getNameCount() - o1.path.getNameCount();
if(diff != 0)
{
return diff;
}
// Different names?
diff = o2.path.compareTo(o1.path);
if(diff != 0)
{
return diff;
}
// The paths are the same, base now on weight
return o2.weight - o1.weight;
}
}
private List<PathAttribute> attributes = new ArrayList<>();
public AttributeNormalizer(Resource baseResource) public AttributeNormalizer(Resource baseResource)
{ {
try try
{ {
_warPath=baseResource==null?null:baseResource.getFile().toPath(); // Track path attributes for expansion
_jettyBasePath=systemPath("jetty.base"); attributes.add(new PathAttribute("WAR", baseResource == null ? null : baseResource.getFile().toPath()).weight(10));
_jettyHomePath=systemPath("jetty.home"); attributes.add(new PathAttribute("jetty.base", "jetty.base").weight(9));
_userHomePath=systemPath("user.home"); attributes.add(new PathAttribute("jetty.home", "jetty.home").weight(8));
_userDirPath=systemPath("user.dir"); attributes.add(new PathAttribute("user.home", "user.home").weight(7));
attributes.add(new PathAttribute("user.dir", "user.dir").weight(6));
Collections.sort(attributes, new PathAttributeComparator());
} }
catch(Exception e) catch (Exception e)
{ {
throw new IllegalArgumentException(e); throw new IllegalArgumentException(e);
} }
} }
private static Path systemPath(String property) throws Exception
{
String p=System.getProperty(property);
if (p!=null)
return new File(p).getAbsoluteFile().getCanonicalFile().toPath();
return null;
}
public String normalize(Object o) public String normalize(Object o)
{ {
try try
{ {
// Find a URI // Find a URI
URI uri=null; URI uri = null;
if (o instanceof URI) if (o instanceof URI)
uri=(URI)o; uri = (URI)o;
else if (o instanceof URL) else if (o instanceof URL)
uri = ((URL)o).toURI(); uri = ((URL)o).toURI();
else if (o instanceof File) else if (o instanceof File)
uri = ((File)o).toURI(); uri = ((File)o).toURI();
else else
{ {
String s=o.toString(); String s = o.toString();
uri=new URI(s); uri = new URI(s);
if (uri.getScheme()==null) if (uri.getScheme() == null)
return s; return s;
} }
if ("jar".equalsIgnoreCase(uri.getScheme())) if ("jar".equalsIgnoreCase(uri.getScheme()))
{ {
String raw = uri.getRawSchemeSpecificPart(); String raw = uri.getRawSchemeSpecificPart();
int bang=raw.indexOf("!/"); int bang = raw.indexOf("!/");
String normal=normalize(raw.substring(0,bang)); String normal = normalize(raw.substring(0,bang));
String suffix=raw.substring(bang); String suffix = raw.substring(bang);
return "jar:"+normal+suffix; return "jar:" + normal + suffix;
} }
else if ("file".equalsIgnoreCase(uri.getScheme())) else if ("file".equalsIgnoreCase(uri.getScheme()))
{ {
return "file:"+normalizePath(new File(uri).toPath()); return "file:" + normalizePath(new File(uri).toPath());
} }
} }
catch(Exception e) catch (Exception e)
{ {
LOG.warn(e); LOG.warn(e);
} }
@ -116,42 +206,116 @@ public class AttributeNormalizer
public String normalizePath(Path path) public String normalizePath(Path path)
{ {
if (_warPath!=null && path.startsWith(_warPath)) for (PathAttribute attr : attributes)
return URIUtil.addPaths("${WAR}",_warPath.relativize(path).toString()); {
if (_jettyBasePath!=null && path.startsWith(_jettyBasePath)) if (attr.path == null)
return URIUtil.addPaths("${jetty.base}",_jettyBasePath.relativize(path).toString()); continue;
if (_jettyHomePath!=null && path.startsWith(_jettyHomePath))
return URIUtil.addPaths("${jetty.home}",_jettyHomePath.relativize(path).toString()); try
if (_userHomePath!=null && path.startsWith(_userHomePath)) {
return URIUtil.addPaths("${user.home}",_userHomePath.relativize(path).toString()); if (path.startsWith(attr.path) || path.equals(attr.path) || Files.isSameFile(path,attr.path))
if (_userDirPath!=null && path.startsWith(_userDirPath)) {
return URIUtil.addPaths("${user.dir}",_userDirPath.relativize(path).toString()); return URIUtil.addPaths("${" + attr.key + "}",attr.path.relativize(path).toString());
}
}
catch (IOException ignore)
{
LOG.ignore(ignore);
}
}
return path.toString(); return path.toString();
} }
public String expand(String str)
public String expand(String s)
{ {
int i=s.indexOf("${"); return expand(str,new Stack<String>());
if (i<0) }
return s;
int e=s.indexOf('}',i+3); public String expand(String str, Stack<String> seenStack)
String prop=s.substring(i+2,e); {
switch(prop) if (str == null)
{ {
case "WAR": return str;
return s.substring(0,i)+_warPath+expand(s.substring(e+1));
case "jetty.base":
return s.substring(0,i)+_jettyBasePath+expand(s.substring(e+1));
case "jetty.home":
return s.substring(0,i)+_jettyHomePath+expand(s.substring(e+1));
case "user.home":
return s.substring(0,i)+_userHomePath+expand(s.substring(e+1));
case "user.dir":
return s.substring(0,i)+_userDirPath+expand(s.substring(e+1));
default:
return s;
} }
if (str.indexOf("${") < 0)
{
// Contains no potential expressions.
return str;
}
Matcher mat = __propertyPattern.matcher(str);
StringBuilder expanded = new StringBuilder();
int offset = 0;
String property;
String value;
while (mat.find(offset))
{
property = mat.group(1);
// Loop detection
if (seenStack.contains(property))
{
StringBuilder err = new StringBuilder();
err.append("Property expansion loop detected: ");
int idx = seenStack.lastIndexOf(property);
for (int i = idx; i < seenStack.size(); i++)
{
err.append(seenStack.get(i));
err.append(" -> ");
}
err.append(property);
throw new RuntimeException(err.toString());
}
seenStack.push(property);
// find property name
expanded.append(str.subSequence(offset,mat.start()));
// get property value
value = getString(property);
if (value == null)
{
if(LOG.isDebugEnabled())
LOG.debug("Unable to expand: {}",property);
expanded.append(mat.group());
}
else
{
// recursively expand
value = expand(value,seenStack);
expanded.append(value);
}
// update offset
offset = mat.end();
}
// leftover
expanded.append(str.substring(offset));
// special case for "$$"
if (expanded.indexOf("$$") >= 0)
{
return expanded.toString().replaceAll("\\$\\$","\\$");
}
return expanded.toString();
}
private String getString(String property)
{
// Use known attributes first
for (PathAttribute attr : attributes)
{
if (attr.key.equalsIgnoreCase(property))
{
return attr.path.toString();
}
}
// Use system properties next
return System.getProperty(property);
} }
} }

64
jetty-rewrite/src/main/config/etc/jetty-rewrite.xml
View File

@ -1,47 +1,41 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- =============================================================== -->
<!-- Mixin the RewriteHandler -->
<!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- configure rewrite handler --> <!-- configure rewrite handler -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Get id="oldhandler" name="handler"/> <Call name="insertHandler">
<Arg>
<New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
<Set name="rewriteRequestURI"><Property name="jetty.rewrite.rewriteRequestURI" deprecated="rewrite.rewriteRequestURI" default="true"/></Set>
<Set name="rewritePathInfo"><Property name="jetty.rewrite.rewritePathInfo" deprecated="rewrite.rewritePathInfo" default="false"/></Set>
<Set name="originalPathAttribute"><Property name="jetty.rewrite.originalPathAttribute" deprecated="rewrite.originalPathAttribute" default="requestedPath"/></Set>
<Set name="handler"> <!-- Set DispatcherTypes -->
<New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler"> <Set name="dispatcherTypes">
<Set name="handler"><Ref refid="oldhandler"/></Set> <Array type="javax.servlet.DispatcherType">
<Set name="rewriteRequestURI"><Property name="jetty.rewrite.rewriteRequestURI" deprecated="rewrite.rewriteRequestURI" default="true"/></Set> <Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>REQUEST</Arg></Call></Item>
<Set name="rewritePathInfo"><Property name="jetty.rewrite.rewritePathInfo" deprecated="rewrite.rewritePathInfo" default="false"/></Set> <Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>ASYNC</Arg></Call></Item>
<Set name="originalPathAttribute"><Property name="jetty.rewrite.originalPathAttribute" deprecated="rewrite.originalPathAttribute" default="requestedPath"/></Set> </Array>
</Set>
<!-- Set DispatcherTypes --> <!-- example rule -->
<Set name="dispatcherTypes"> <!--
<Array type="javax.servlet.DispatcherType"> <Call name="addRule">
<Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>REQUEST</Arg></Call></Item> <Arg>
<Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>ASYNC</Arg></Call></Item> <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
</Array> <Set name="pattern">/favicon.ico</Set>
</Set> <Set name="name">Cache-Control</Set>
<Set name="value">Max-Age=3600,public</Set>
<Set name="terminating">true</Set>
</New>
</Arg>
</Call>
-->
<!-- example rule --> </New>
<!-- </Arg>
<Call name="addRule"> </Call>
<Arg>
<New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
<Set name="pattern">/favicon.ico</Set>
<Set name="name">Cache-Control</Set>
<Set name="value">Max-Age=3600,public</Set>
<Set name="terminating">true</Set>
</New>
</Arg>
</Call>
-->
</New>
</Set>
</Configure> </Configure>

32
jetty-server/src/main/config/etc/jetty-debuglog.xml
View File

@ -6,20 +6,20 @@
<!-- =============================================================== --> <!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Get id="oldhandler" name="handler"/> <Call name="insertHandler">
<Set name="handler"> <Arg>
<New id="DebugHandler" class="org.eclipse.jetty.server.handler.DebugHandler"> <New id="DebugHandler" class="org.eclipse.jetty.server.handler.DebugHandler">
<Set name="handler"><Ref refid="oldhandler"/></Set> <Set name="outputStream">
<Set name="outputStream"> <New class="org.eclipse.jetty.util.RolloverFileOutputStream">
<New class="org.eclipse.jetty.util.RolloverFileOutputStream"> <Arg type="String"><Property name="jetty.debuglog.dir" deprecated="jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg>
<Arg type="String"><Property name="jetty.debuglog.dir" deprecated="jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg> <Arg type="boolean"><Property name="jetty.debuglog.append" default="true"/></Arg>
<Arg type="boolean"><Property name="jetty.debuglog.append" default="true"/></Arg> <Arg type="int"><Property name="jetty.debuglog.retainDays" default="90"/></Arg>
<Arg type="int"><Property name="jetty.debuglog.retainDays" default="90"/></Arg> <Arg>
<Arg> <Call class="java.util.TimeZone" name="getTimeZone"><Arg><Property name="jetty.debuglog.timezone" default="GMT"/></Arg></Call>
<Call class="java.util.TimeZone" name="getTimeZone"><Arg><Property name="jetty.debuglog.timezone" default="GMT"/></Arg></Call> </Arg>
</Arg> </New>
</New> </Set>
</Set> </New>
</New> </Arg>
</Set> </Call>
</Configure> </Configure>

94
jetty-server/src/main/config/etc/jetty-gzip.xml
View File

@ -9,59 +9,59 @@
<!-- =============================================================== --> <!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Get id="next" name="handler" /> <Call name="insertHandler">
<Set name="handler"> <Arg>
<New id="GzipHandler" class="org.eclipse.jetty.server.handler.gzip.GzipHandler"> <New id="GzipHandler" class="org.eclipse.jetty.server.handler.gzip.GzipHandler">
<Set name="handler"><Ref refid="next" /></Set> <Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize" deprecated="gzip.minGzipSize" default="2048"/></Set>
<Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize" deprecated="gzip.minGzipSize" default="2048"/></Set> <Set name="checkGzExists"><Property name="jetty.gzip.checkGzExists" deprecated="gzip.checkGzExists" default="false"/></Set>
<Set name="checkGzExists"><Property name="jetty.gzip.checkGzExists" deprecated="gzip.checkGzExists" default="false"/></Set> <Set name="compressionLevel"><Property name="jetty.gzip.compressionLevel" deprecated="gzip.compressionLevel" default="-1"/></Set>
<Set name="compressionLevel"><Property name="jetty.gzip.compressionLevel" deprecated="gzip.compressionLevel" default="-1"/></Set> <Set name="excludedAgentPatterns">
<Set name="excludedAgentPatterns"> <Array type="String">
<Array type="String"> <Item><Property name="jetty.gzip.excludedUserAgent" deprecated="gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item>
<Item><Property name="jetty.gzip.excludedUserAgent" deprecated="gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item> </Array>
</Array> </Set>
</Set>
<Set name="includedMethods"> <Set name="includedMethods">
<Array type="String"> <Array type="String">
<Item>GET</Item> <Item>GET</Item>
</Array> </Array>
</Set> </Set>
<!-- <!--
<Set name="includedPaths"> <Set name="includedPaths">
<Array type="String"> <Array type="String">
<Item>/*</Item> <Item>/*</Item>
</Array> </Array>
</Set> </Set>
--> -->
<!-- <!--
<Set name="excludedPaths"> <Set name="excludedPaths">
<Array type="String"> <Array type="String">
<Item>*.gz</Item> <Item>*.gz</Item>
</Array> </Array>
</Set> </Set>
--> -->
<!-- <!--
<Call name="addIncludedMimeTypes"> <Call name="addIncludedMimeTypes">
<Arg><Array type="String"> <Arg><Array type="String">
<Item>some/type</Item> <Item>some/type</Item>
</Array></Arg> </Array></Arg>
</Call> </Call>
--> -->
<!-- <!--
<Call name="addExcludedMimeTypes"> <Call name="addExcludedMimeTypes">
<Arg><Array type="String"> <Arg><Array type="String">
<Item>some/type</Item> <Item>some/type</Item>
</Array></Arg> </Array></Arg>
</Call> </Call>
--> -->
</New> </New>
</Set> </Arg>
</Call>
</Configure> </Configure>

41
jetty-server/src/main/config/etc/jetty-ipaccess.xml
View File

@ -6,26 +6,23 @@
<!-- =============================================================== --> <!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler">
<Get id="oldhandler" name="handler"/> <Arg>
<New id="IPAccessHandler" class="org.eclipse.jetty.server.handler.IPAccessHandler">
<Set name="handler"> <Set name="white">
<New id="IPAccessHandler" class="org.eclipse.jetty.server.handler.IPAccessHandler"> <Array type="String">
<Set name="handler"><Ref refid="oldhandler"/></Set> <Item>127.0.0.1</Item>
<Set name="white"> <Item>127.0.0.2/*.html</Item>
<Array type="String"> </Array>
<Item>127.0.0.1</Item> </Set>
<Item>127.0.0.2/*.html</Item> <Set name="black">
</Array> <Array type="String">
</Set> <Item>127.0.0.1/blacklisted</Item>
<Set name="black"> <Item>127.0.0.2/black.html</Item>
<Array type="String"> </Array>
<Item>127.0.0.1/blacklisted</Item> </Set>
<Item>127.0.0.2/black.html</Item> <Set name="whiteListByPath">false</Set>
</Array> </New>
</Set> </Arg>
<Set name="whiteListByPath">false</Set> </Call>
</New>
</Set>
</Configure> </Configure>

14
jetty-server/src/main/config/etc/jetty-ssl-context.xml
View File

@ -17,16 +17,8 @@
<Set name="EndpointIdentificationAlgorithm"></Set> <Set name="EndpointIdentificationAlgorithm"></Set>
<Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set> <Set name="NeedClientAuth"><Property name="jetty.sslContext.needClientAuth" deprecated="jetty.ssl.needClientAuth" default="false"/></Set>
<Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set> <Set name="WantClientAuth"><Property name="jetty.sslContext.wantClientAuth" deprecated="jetty.ssl.wantClientAuth" default="false"/></Set>
<Set name="ExcludeCipherSuites"> <!-- To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at
<Array type="String"> https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites
<Item>SSL_RSA_WITH_DES_CBC_SHA</Item> -->
<Item>SSL_DHE_RSA_WITH_DES_CBC_SHA</Item>
<Item>SSL_DHE_DSS_WITH_DES_CBC_SHA</Item>
<Item>SSL_RSA_EXPORT_WITH_RC4_40_MD5</Item>
<Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
<Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
<Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
</Array>
</Set>
<Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set> <Set name="useCipherSuitesOrder"><Property name="jetty.sslContext.useCipherSuitesOrder" default="true"/></Set>
</Configure> </Configure>

12
jetty-server/src/main/config/etc/jetty-stats.xml
View File

@ -6,12 +6,12 @@
<!-- =============================================================== --> <!-- =============================================================== -->
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<Get id="oldhandler" name="handler" /> <Call name="insertHandler">
<Set name="handler"> <Arg>
<New id="StatsHandler" class="org.eclipse.jetty.server.handler.StatisticsHandler"> <New id="StatsHandler" class="org.eclipse.jetty.server.handler.StatisticsHandler">
<Set name="handler"><Ref refid="oldhandler" /></Set> </New>
</New> </Arg>
</Set> </Call>
<Call class="org.eclipse.jetty.server.ConnectorStatistics" name="addToAllConnectors"> <Call class="org.eclipse.jetty.server.ConnectorStatistics" name="addToAllConnectors">
<Arg><Ref refid="Server"/></Arg> <Arg><Ref refid="Server"/></Arg>
</Call> </Call>

3
jetty-server/src/main/config/modules/ssl.mod
View File

@ -88,3 +88,6 @@ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/
## Whether cipher order is significant (since java 8 only) ## Whether cipher order is significant (since java 8 only)
# jetty.sslContext.useCipherSuitesOrder=true # jetty.sslContext.useCipherSuitesOrder=true
## To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at
## https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites

6
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
View File

@ -654,7 +654,6 @@ public class Server extends HandlerWrapper implements Attributes
/** /**
* @return The URI of the first {@link NetworkConnector} and first {@link ContextHandler}, or null * @return The URI of the first {@link NetworkConnector} and first {@link ContextHandler}, or null
*/ */
@SuppressWarnings("resource")
public URI getURI() public URI getURI()
{ {
NetworkConnector connector=null; NetworkConnector connector=null;
@ -674,7 +673,10 @@ public class Server extends HandlerWrapper implements Attributes
try try
{ {
String scheme=connector.getDefaultConnectionFactory().getProtocol().startsWith("SSL-")?"https":"http"; String protocol = connector.getDefaultConnectionFactory().getProtocol();
String scheme="http";
if (protocol.startsWith("SSL-") || protocol.equals("SSL"))
scheme = "https";
String host=connector.getHost(); String host=connector.getHost();
if (context!=null && context.getVirtualHosts()!=null && context.getVirtualHosts().length>0) if (context!=null && context.getVirtualHosts()!=null && context.getVirtualHosts().length>0)

2
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -100,7 +100,7 @@ import org.eclipse.jetty.util.resource.Resource;
* The maximum size of a form that can be processed by this context is controlled by the system properties org.eclipse.jetty.server.Request.maxFormKeys * The maximum size of a form that can be processed by this context is controlled by the system properties org.eclipse.jetty.server.Request.maxFormKeys
* and org.eclipse.jetty.server.Request.maxFormContentSize. These can also be configured with {@link #setMaxFormContentSize(int)} and {@link #setMaxFormKeys(int)} * and org.eclipse.jetty.server.Request.maxFormContentSize. These can also be configured with {@link #setMaxFormContentSize(int)} and {@link #setMaxFormKeys(int)}
* <p> * <p>
* This servers executore is made available via a context attributed "org.eclipse.jetty.server.Executor". * This servers executor is made available via a context attributed "org.eclipse.jetty.server.Executor".
* <p> * <p>
* 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. * If these alias checkers are not required, then {@link #clearAliasChecks()} or {@link #setAliasChecks(List)} should be called.

5
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
View File

@ -99,6 +99,11 @@ public class ErrorHandler extends AbstractHandler
throw new IOException(x); throw new IOException(x);
} }
} }
} else {
if (LOG.isDebugEnabled())
{
LOG.debug("No Error Page mapping for request({} {}) (using default)",request.getMethod(),request.getRequestURI());
}
else else
{ {
LOG.warn("Could not dispatch to error page: {}", error_page); LOG.warn("Could not dispatch to error page: {}", error_page);

10
jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java
View File

@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HandlerContainer;
import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.util.ArrayUtil; import org.eclipse.jetty.util.ArrayUtil;
import org.eclipse.jetty.util.MultiException; import org.eclipse.jetty.util.MultiException;
@ -81,9 +82,18 @@ public class HandlerCollection extends AbstractHandlerContainer
throw new IllegalStateException(STARTED); throw new IllegalStateException(STARTED);
if (handlers!=null) if (handlers!=null)
{
// 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) for (Handler handler:handlers)
if (handler.getServer()!=getServer()) if (handler.getServer()!=getServer())
handler.setServer(getServer()); handler.setServer(getServer());
}
Handler[] old=_handlers;; Handler[] old=_handlers;;
_handlers = handlers; _handlers = handlers;
updateBeans(old, handlers); updateBeans(old, handlers);

19
jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerWrapper.java
View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.server.handler; package org.eclipse.jetty.server.handler;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.servlet.ServletException; import javax.servlet.ServletException;
@ -26,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HandlerContainer;
import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedAttribute;
import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedObject;
@ -80,6 +82,11 @@ public class HandlerWrapper extends AbstractHandlerContainer
if (isStarted()) if (isStarted())
throw new IllegalStateException(STARTED); throw new IllegalStateException(STARTED);
// check for loops
if (handler==this || (handler instanceof HandlerContainer &&
Arrays.asList(((HandlerContainer)handler).getChildHandlers()).contains(this)))
throw new IllegalStateException("setHandler loop");
if (handler!=null) if (handler!=null)
handler.setServer(getServer()); handler.setServer(getServer());
@ -102,10 +109,18 @@ public class HandlerWrapper extends AbstractHandlerContainer
*/ */
public void insertHandler(HandlerWrapper wrapper) public void insertHandler(HandlerWrapper wrapper)
{ {
if (wrapper==null || wrapper.getHandler()!=null) if (wrapper==null)
throw new IllegalArgumentException(); throw new IllegalArgumentException();
wrapper.setHandler(getHandler());
HandlerWrapper tail = wrapper;
while(tail.getHandler() instanceof HandlerWrapper)
tail=(HandlerWrapper)tail.getHandler();
if (tail.getHandler()!=null)
throw new IllegalArgumentException("bad tail of inserted wrapper chain");
Handler next=getHandler();
setHandler(wrapper); setHandler(wrapper);
tail.setHandler(next);
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */

342
jetty-server/src/test/java/org/eclipse/jetty/server/handler/HandlerTest.java Normal file
View File

@ -0,0 +1,342 @@
//
// ========================================================================
// Copyright (c) 1995-2016 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.equalTo;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.*;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.hamcrest.Matchers;
import org.junit.Test;
public class HandlerTest
{
@Test
public void testWrapperSetServer()
{
Server s=new Server();
HandlerWrapper a = new HandlerWrapper();
HandlerWrapper b = new HandlerWrapper();
HandlerWrapper c = new HandlerWrapper();
a.setHandler(b);
b.setHandler(c);
a.setServer(s);
assertThat(b.getServer(),equalTo(s));
assertThat(c.getServer(),equalTo(s));
}
@Test
public void testWrapperServerSet()
{
Server s=new Server();
HandlerWrapper a = new HandlerWrapper();
HandlerWrapper b = new HandlerWrapper();
HandlerWrapper c = new HandlerWrapper();
a.setServer(s);
b.setHandler(c);
a.setHandler(b);
assertThat(b.getServer(),equalTo(s));
assertThat(c.getServer(),equalTo(s));
}
@Test
public void testWrapperThisLoop()
{
HandlerWrapper a = new HandlerWrapper();
try
{
a.setHandler(a);
fail();
}
catch(IllegalStateException e)
{
assertThat(e.getMessage(),containsString("loop"));
}
}
@Test
public void testWrapperSimpleLoop()
{
HandlerWrapper a = new HandlerWrapper();
HandlerWrapper b = new HandlerWrapper();
a.setHandler(b);
try
{
b.setHandler(a);
fail();
}
catch(IllegalStateException e)
{
assertThat(e.getMessage(),containsString("loop"));
}
}
@Test
public void testWrapperDeepLoop()
{
HandlerWrapper a = new HandlerWrapper();
HandlerWrapper b = new HandlerWrapper();
HandlerWrapper c = new HandlerWrapper();
a.setHandler(b);
b.setHandler(c);
try
{
c.setHandler(a);
fail();
}
catch(IllegalStateException e)
{
assertThat(e.getMessage(),containsString("loop"));
}
}
@Test
public void testWrapperChainLoop()
{
HandlerWrapper a = new HandlerWrapper();
HandlerWrapper b = new HandlerWrapper();
HandlerWrapper c = new HandlerWrapper();
a.setHandler(b);
c.setHandler(a);
try
{
b.setHandler(c);
fail();
}
catch(IllegalStateException e)
{
assertThat(e.getMessage(),containsString("loop"));
}
}
@Test
public void testCollectionSetServer()
{
Server s=new Server();
HandlerCollection a = new HandlerCollection();
HandlerCollection b = new HandlerCollection();
HandlerCollection b1 = new HandlerCollection();
HandlerCollection b2 = new HandlerCollection();
HandlerCollection c = new HandlerCollection();
HandlerCollection c1 = new HandlerCollection();
HandlerCollection c2 = new HandlerCollection();
a.addHandler(b);
a.addHandler(c);
b.setHandlers(new Handler[]{b1,b2});
c.setHandlers(new Handler[]{c1,c2});
a.setServer(s);
assertThat(b.getServer(),equalTo(s));
assertThat(c.getServer(),equalTo(s));
assertThat(b1.getServer(),equalTo(s));
assertThat(b2.getServer(),equalTo(s));
assertThat(c1.getServer(),equalTo(s));
assertThat(c2.getServer(),equalTo(s));
}
@Test
public void testCollectionServerSet()
{
Server s=new Server();
HandlerCollection a = new HandlerCollection();
HandlerCollection b = new HandlerCollection();
HandlerCollection b1 = new HandlerCollection();
HandlerCollection b2 = new HandlerCollection();
HandlerCollection c = new HandlerCollection();
HandlerCollection c1 = new HandlerCollection();
HandlerCollection c2 = new HandlerCollection();
a.setServer(s);
a.addHandler(b);
a.addHandler(c);
b.setHandlers(new Handler[]{b1,b2});
c.setHandlers(new Handler[]{c1,c2});
assertThat(b.getServer(),equalTo(s));
assertThat(c.getServer(),equalTo(s));
assertThat(b1.getServer(),equalTo(s));
assertThat(b2.getServer(),equalTo(s));
assertThat(c1.getServer(),equalTo(s));
assertThat(c2.getServer(),equalTo(s));
}
@Test
public void testCollectionThisLoop()
{
HandlerCollection a = new HandlerCollection();
try
{
a.addHandler(a);
fail();
}
catch(IllegalStateException e)
{
assertThat(e.getMessage(),containsString("loop"));
}
}
@Test
public void testCollectionDeepLoop()
{
HandlerCollection a = new HandlerCollection();
HandlerCollection b = new HandlerCollection();
HandlerCollection b1 = new HandlerCollection();
HandlerCollection b2 = new HandlerCollection();
HandlerCollection c = new HandlerCollection();
HandlerCollection c1 = new HandlerCollection();
HandlerCollection c2 = new HandlerCollection();
a.addHandler(b);
a.addHandler(c);
b.setHandlers(new Handler[]{b1,b2});
c.setHandlers(new Handler[]{c1,c2});
try
{
b2.addHandler(a);
fail();
}
catch(IllegalStateException e)
{
assertThat(e.getMessage(),containsString("loop"));
}
}
@Test
public void testCollectionChainLoop()
{
HandlerCollection a = new HandlerCollection();
HandlerCollection b = new HandlerCollection();
HandlerCollection b1 = new HandlerCollection();
HandlerCollection b2 = new HandlerCollection();
HandlerCollection c = new HandlerCollection();
HandlerCollection c1 = new HandlerCollection();
HandlerCollection c2 = new HandlerCollection();
a.addHandler(c);
b.setHandlers(new Handler[]{b1,b2});
c.setHandlers(new Handler[]{c1,c2});
b2.addHandler(a);
try
{
a.addHandler(b);
fail();
}
catch(IllegalStateException e)
{
assertThat(e.getMessage(),containsString("loop"));
}
}
@Test
public void testInsertWrapperTail()
{
HandlerWrapper a = new HandlerWrapper();
HandlerWrapper b = new HandlerWrapper();
a.insertHandler(b);
assertThat(a.getHandler(),equalTo(b));
assertThat(b.getHandler(),nullValue());
}
@Test
public void testInsertWrapper()
{
HandlerWrapper a = new HandlerWrapper();
HandlerWrapper b = new HandlerWrapper();
HandlerWrapper c = new HandlerWrapper();
a.insertHandler(c);
a.insertHandler(b);
assertThat(a.getHandler(),equalTo(b));
assertThat(b.getHandler(),equalTo(c));
assertThat(c.getHandler(),nullValue());
}
@Test
public void testInsertWrapperChain()
{
HandlerWrapper a = new HandlerWrapper();
HandlerWrapper b = new HandlerWrapper();
HandlerWrapper c = new HandlerWrapper();
HandlerWrapper d = new HandlerWrapper();
a.insertHandler(d);
b.insertHandler(c);
a.insertHandler(b);
assertThat(a.getHandler(),equalTo(b));
assertThat(b.getHandler(),equalTo(c));
assertThat(c.getHandler(),equalTo(d));
assertThat(d.getHandler(),nullValue());
}
@Test
public void testInsertWrapperBadChain()
{
HandlerWrapper a = new HandlerWrapper();
HandlerWrapper b = new HandlerWrapper();
HandlerWrapper c = new HandlerWrapper();
HandlerWrapper d = new HandlerWrapper();
a.insertHandler(d);
b.insertHandler(c);
c.setHandler(new AbstractHandler()
{
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
{
}
});
try
{
a.insertHandler(b);
fail();
}
catch(IllegalArgumentException e)
{
assertThat(e.getMessage(),containsString("bad tail"));
}
}
}

13
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SSLSelectChannelConnectorLoadTest.java
View File

@ -18,12 +18,16 @@
package org.eclipse.jetty.server.ssl; package org.eclipse.jetty.server.ssl;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.URI;
import java.security.KeyStore; import java.security.KeyStore;
import java.util.Arrays; import java.util.Arrays;
import java.util.Random; import java.util.Random;
@ -92,6 +96,15 @@ public class SSLSelectChannelConnectorLoadTest
server.join(); server.join();
} }
@Test
public void testGetURI()
{
URI uri = server.getURI();
assertThat("Server.uri.scheme", uri.getScheme(), is("https"));
assertThat("Server.uri.port", uri.getPort(), is(connector.getLocalPort()));
assertThat("Server.uri.path", uri.getPath(), is("/"));
}
@Test @Test
public void testLongLivedConnections() throws Exception public void testLongLivedConnections() throws Exception
{ {

51
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
View File

@ -30,6 +30,8 @@ import javax.servlet.http.HttpServletRequest;
import org.eclipse.jetty.server.Dispatcher; import org.eclipse.jetty.server.Dispatcher;
import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ErrorHandler; import org.eclipse.jetty.server.handler.ErrorHandler;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
/** /**
* An ErrorHandler that maps exceptions and status codes to URIs for dispatch using * An ErrorHandler that maps exceptions and status codes to URIs for dispatch using
@ -38,6 +40,8 @@ import org.eclipse.jetty.server.handler.ErrorHandler;
public class ErrorPageErrorHandler extends ErrorHandler implements ErrorHandler.ErrorPageMapper public class ErrorPageErrorHandler extends ErrorHandler implements ErrorHandler.ErrorPageMapper
{ {
public final static String GLOBAL_ERROR_PAGE = "org.eclipse.jetty.server.error_page.global"; public final static String GLOBAL_ERROR_PAGE = "org.eclipse.jetty.server.error_page.global";
private static final Logger LOG = Log.getLogger(ErrorPageErrorHandler.class);
enum PageLookupTechnique{ THROWABLE, STATUS_CODE, GLOBAL }
protected ServletContext _servletContext; protected ServletContext _servletContext;
private final Map<String,String> _errorPages= new HashMap<>(); // code or exception to URL private final Map<String,String> _errorPages= new HashMap<>(); // code or exception to URL
@ -48,11 +52,15 @@ public class ErrorPageErrorHandler extends ErrorHandler implements ErrorHandler.
{ {
String error_page= null; String error_page= null;
PageLookupTechnique pageSource = null;
Throwable th = (Throwable)request.getAttribute(Dispatcher.ERROR_EXCEPTION); Throwable th = (Throwable)request.getAttribute(Dispatcher.ERROR_EXCEPTION);
// Walk the cause hierarchy // Walk the cause hierarchy
while (error_page == null && th != null ) while (error_page == null && th != null )
{ {
pageSource = PageLookupTechnique.THROWABLE;
Class<?> exClass=th.getClass(); Class<?> exClass=th.getClass();
error_page = _errorPages.get(exClass.getName()); error_page = _errorPages.get(exClass.getName());
@ -68,13 +76,17 @@ public class ErrorPageErrorHandler extends ErrorHandler implements ErrorHandler.
th=(th instanceof ServletException)?((ServletException)th).getRootCause():null; th=(th instanceof ServletException)?((ServletException)th).getRootCause():null;
} }
Integer errorStatusCode = null;
if (error_page == null) if (error_page == null)
{ {
pageSource = PageLookupTechnique.STATUS_CODE;
// look for an exact code match // look for an exact code match
Integer code=(Integer)request.getAttribute(Dispatcher.ERROR_STATUS_CODE); errorStatusCode = (Integer)request.getAttribute(Dispatcher.ERROR_STATUS_CODE);
if (code!=null) if (errorStatusCode!=null)
{ {
error_page=_errorPages.get(Integer.toString(code)); error_page= (String)_errorPages.get(Integer.toString(errorStatusCode));
// if still not found // if still not found
if ((error_page == null) && (_errorPageList != null)) if ((error_page == null) && (_errorPageList != null))
@ -83,7 +95,7 @@ public class ErrorPageErrorHandler extends ErrorHandler implements ErrorHandler.
for (int i = 0; i < _errorPageList.size(); i++) for (int i = 0; i < _errorPageList.size(); i++)
{ {
ErrorCodeRange errCode = _errorPageList.get(i); ErrorCodeRange errCode = _errorPageList.get(i);
if (errCode.isInRange(code)) if (errCode.isInRange(errorStatusCode))
{ {
error_page = errCode.getUri(); error_page = errCode.getUri();
break; break;
@ -95,7 +107,38 @@ public class ErrorPageErrorHandler extends ErrorHandler implements ErrorHandler.
// Try servlet 3.x global error page. // Try servlet 3.x global error page.
if (error_page == null) if (error_page == null)
{
pageSource = PageLookupTechnique.GLOBAL;
error_page = _errorPages.get(GLOBAL_ERROR_PAGE); error_page = _errorPages.get(GLOBAL_ERROR_PAGE);
}
if (LOG.isDebugEnabled())
{
StringBuilder dbg = new StringBuilder();
dbg.append("getErrorPage(");
dbg.append(request.getMethod()).append(' ');
dbg.append(request.getRequestURI());
dbg.append(") => error_page=").append(error_page);
switch (pageSource)
{
case THROWABLE:
dbg.append(" (from Throwable ");
dbg.append(th.getClass().getName());
dbg.append(')');
LOG.debug(dbg.toString(),th);
break;
case STATUS_CODE:
dbg.append(" (from status code ");
dbg.append(errorStatusCode);
dbg.append(')');
LOG.debug(dbg.toString());
break;
case GLOBAL:
dbg.append(" (from global default)");
LOG.debug(dbg.toString());
break;
}
}
return error_page; return error_page;
} }

90
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
View File

@ -66,6 +66,8 @@ import org.eclipse.jetty.util.DeprecationWarning;
import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedAttribute;
import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedObject;
import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
/** /**
* Servlet Context. * Servlet Context.
@ -83,6 +85,8 @@ import org.eclipse.jetty.util.component.LifeCycle;
@ManagedObject("Servlet Context Handler") @ManagedObject("Servlet Context Handler")
public class ServletContextHandler extends ContextHandler public class ServletContextHandler extends ContextHandler
{ {
private static final Logger LOG = Log.getLogger(ServletContextHandler.class);
public final static int SESSIONS=1; public final static int SESSIONS=1;
public final static int SECURITY=2; public final static int SECURITY=2;
public final static int GZIP=4; public final static int GZIP=4;
@ -169,7 +173,21 @@ public class ServletContextHandler extends ContextHandler
if (errorHandler!=null) if (errorHandler!=null)
setErrorHandler(errorHandler); setErrorHandler(errorHandler);
}
@Override
public void setHandler(Handler handler)
{
LOG.warn("ServletContextHandler.setHandler should not be called directly. Use insertHandler or setSessionHandler etc.");
super.setHandler(handler);
}
private void doSetHandler(HandlerWrapper wrapper, Handler handler)
{
if (wrapper==this)
super.setHandler(handler);
else
wrapper.setHandler(handler);
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -189,12 +207,7 @@ public class ServletContextHandler extends ContextHandler
handler=(HandlerWrapper)handler.getHandler(); handler=(HandlerWrapper)handler.getHandler();
if (handler.getHandler()!=_sessionHandler) if (handler.getHandler()!=_sessionHandler)
{ doSetHandler(handler,_sessionHandler);
if (handler== this)
super.setHandler(_sessionHandler);
else
handler.setHandler(_sessionHandler);
}
handler=_sessionHandler; handler=_sessionHandler;
} }
@ -208,12 +221,7 @@ public class ServletContextHandler extends ContextHandler
handler=(HandlerWrapper)handler.getHandler(); handler=(HandlerWrapper)handler.getHandler();
if (handler.getHandler()!=_securityHandler) if (handler.getHandler()!=_securityHandler)
{ doSetHandler(handler,_securityHandler);
if (handler== this)
super.setHandler(_securityHandler);
else
handler.setHandler(_securityHandler);
}
handler=_securityHandler; handler=_securityHandler;
} }
@ -226,12 +234,7 @@ public class ServletContextHandler extends ContextHandler
handler=(HandlerWrapper)handler.getHandler(); handler=(HandlerWrapper)handler.getHandler();
if (handler.getHandler()!=_gzipHandler) if (handler.getHandler()!=_gzipHandler)
{ doSetHandler(handler,_gzipHandler);
if (handler== this)
super.setHandler(_gzipHandler);
else
handler.setHandler(_gzipHandler);
}
handler=_gzipHandler; handler=_gzipHandler;
} }
@ -244,12 +247,7 @@ public class ServletContextHandler extends ContextHandler
handler=(HandlerWrapper)handler.getHandler(); handler=(HandlerWrapper)handler.getHandler();
if (handler.getHandler()!=_servletHandler) if (handler.getHandler()!=_servletHandler)
{ doSetHandler(handler,_servletHandler);
if (handler== this)
super.setHandler(_servletHandler);
else
handler.setHandler(_servletHandler);
}
handler=_servletHandler; handler=_servletHandler;
} }
@ -554,7 +552,7 @@ public class ServletContextHandler extends ContextHandler
{ {
if (wrapper.getHandler()==handler) if (wrapper.getHandler()==handler)
{ {
wrapper.setHandler(replace); doSetHandler(wrapper,replace);
return true; return true;
} }
@ -664,20 +662,38 @@ public class ServletContextHandler extends ContextHandler
*/ */
public void insertHandler(HandlerWrapper handler) public void insertHandler(HandlerWrapper handler)
{ {
HandlerWrapper h=this; if (handler instanceof SessionHandler)
setSessionHandler((SessionHandler)handler);
// Skip any injected handlers else if (handler instanceof SecurityHandler)
while (h.getHandler() instanceof HandlerWrapper) setSecurityHandler((SecurityHandler)handler);
else if (handler instanceof GzipHandler)
setGzipHandler((GzipHandler)handler);
else if (handler instanceof ServletHandler)
setServletHandler((ServletHandler)handler);
else
{ {
HandlerWrapper wrapper = (HandlerWrapper)h.getHandler(); HandlerWrapper tail = handler;
if (wrapper instanceof SessionHandler || while(tail.getHandler() instanceof HandlerWrapper)
wrapper instanceof SecurityHandler || tail=(HandlerWrapper)tail.getHandler();
wrapper instanceof ServletHandler) if (tail.getHandler()!=null)
break; throw new IllegalArgumentException("bad tail of inserted wrapper chain");
h=wrapper;
}
h.setHandler(handler); // Skip any injected handlers
HandlerWrapper h=this;
while (h.getHandler() instanceof HandlerWrapper)
{
HandlerWrapper wrapper = (HandlerWrapper)h.getHandler();
if (wrapper instanceof SessionHandler ||
wrapper instanceof SecurityHandler ||
wrapper instanceof ServletHandler)
break;
h=wrapper;
}
Handler next=h.getHandler();
doSetHandler(h,handler);
doSetHandler(tail,next);
}
relinkHandlers(); relinkHandlers();
} }

2
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/GzipHandlerTest.java
View File

@ -81,7 +81,6 @@ public class GzipHandlerTest
_server.setHandler(gzipHandler); _server.setHandler(gzipHandler);
gzipHandler.setHandler(context); gzipHandler.setHandler(context);
context.setHandler(servlets);
servlets.addServletWithMapping(TestServlet.class,"/content"); servlets.addServletWithMapping(TestServlet.class,"/content");
servlets.addServletWithMapping(ForwardServlet.class,"/forward"); servlets.addServletWithMapping(ForwardServlet.class,"/forward");
servlets.addServletWithMapping(IncludeServlet.class,"/include"); servlets.addServletWithMapping(IncludeServlet.class,"/include");
@ -91,7 +90,6 @@ public class GzipHandlerTest
public static class TestServlet extends HttpServlet public static class TestServlet extends HttpServlet
{ {
@Override @Override
protected void doGet(HttpServletRequest req, HttpServletResponse response) throws ServletException, IOException protected void doGet(HttpServletRequest req, HttpServletResponse response) throws ServletException, IOException
{ {

145
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestGetPartsTest.java Normal file
View File

@ -0,0 +1,145 @@
//
// ========================================================================
// Copyright (c) 1995-2016 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.servlet;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.file.Path;
import javax.servlet.MultipartConfigElement;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Part;
import org.eclipse.jetty.http.HttpTester;
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.toolchain.test.FS;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class RequestGetPartsTest
{
@SuppressWarnings("serial")
public static class DumpPartInfoServlet extends HttpServlet
{
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
resp.setContentType("text/plain");
PrintWriter out = resp.getWriter();
for(Part part: req.getParts())
{
out.printf("Got part: name=%s, size=%,d, filename=%s%n",part.getName(), part.getSize(), part.getSubmittedFileName());
}
}
}
private static Server server;
private static LocalConnector connector;
private static File locationDir;
@BeforeClass
public static void startServer() throws Exception
{
Path tmpDir = MavenTestingUtils.getTargetTestingPath("testrequest_getparts");
FS.ensureEmpty(tmpDir);
locationDir = tmpDir.toFile();
server = new Server();
connector = new LocalConnector(server);
server.addConnector(connector);
ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
server.setHandler(context);
ServletHolder holder = context.addServlet(DumpPartInfoServlet.class,"/dump/*");
String location = locationDir.getAbsolutePath();
long maxFileSize = 1024*1024*5;
long maxRequestSize = 1024*1024*10;
int fileSizeThreshold = 1;
MultipartConfigElement multipartConfig = new MultipartConfigElement(location,maxFileSize,maxRequestSize,fileSizeThreshold);
((ServletHolder.Registration) holder.getRegistration()).setMultipartConfig(multipartConfig);
server.start();
}
@AfterClass
public static void stopServer() throws Exception
{
server.stop();
}
@Test
public void testMultiFileUpload_SameName() throws Exception
{
// generated and parsed test
HttpTester.Request request = HttpTester.newRequest();
HttpTester.Response response;
// test GET
request.setMethod("POST");
request.setURI("/dump/");
request.setVersion("HTTP/1.1");
request.setHeader("Host","tester");
request.setHeader("Connection","close");
String boundary="XyXyXy";
request.setHeader("Content-Type","multipart/form-data; boundary=" + boundary);
String crocMsg = "See ya later, aligator.";
String aligMsg = "In a while, crocodile.";
StringBuilder content = new StringBuilder();
content.append("--").append(boundary).append("\r\n");
content.append("Content-Disposition: form-data; name=\"same\"; filename=\"crocodile.dat\"\r\n");
content.append("Content-Type: application/octet-stream\r\n");
content.append("\r\n");
content.append(crocMsg).append("\r\n");
content.append("--").append(boundary).append("\r\n");
content.append("Content-Disposition: form-data; name=\"same\"; filename=\"aligator.dat\"\r\n");
content.append("Content-Type: application/octet-stream\r\n");
content.append("\r\n");
content.append(aligMsg).append("\r\n");
content.append("--").append(boundary).append("--\r\n");
content.append("\r\n");
request.setContent(content.toString());
response = HttpTester.parseResponse(connector.getResponses(request.generate()));
assertThat("Response status", response.getStatus(), is(HttpServletResponse.SC_OK));
assertEquals(HttpServletResponse.SC_OK,response.getStatus());
String responseContents = response.getContent();
assertThat("response.contents", responseContents, containsString(String.format("Got part: name=same, size=%d, filename=crocodile.dat",crocMsg.length())));
assertThat("response.contents", responseContents, containsString(String.format("Got part: name=same, size=%d, filename=aligator.dat",aligMsg.length())));
}
}

2
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java
View File

@ -26,6 +26,7 @@ import java.util.EnumSet;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.servlet.BaseHolder.Source; import org.eclipse.jetty.servlet.BaseHolder.Source;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -428,5 +429,4 @@ public class ServletHandlerTest
} }
} }

3
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
View File

@ -104,6 +104,7 @@ public class MultiPartFilter implements Filter
private boolean _deleteFiles; private boolean _deleteFiles;
private ServletContext _context; private ServletContext _context;
private int _fileOutputBuffer = 0; private int _fileOutputBuffer = 0;
private boolean _writeFilesWithFilenames = false;
private long _maxFileSize = -1L; private long _maxFileSize = -1L;
private long _maxRequestSize = -1L; private long _maxRequestSize = -1L;
private int _maxFormKeys = Integer.getInteger("org.eclipse.jetty.server.Request.maxFormKeys", 1000); private int _maxFormKeys = Integer.getInteger("org.eclipse.jetty.server.Request.maxFormKeys", 1000);
@ -130,6 +131,7 @@ public class MultiPartFilter implements Filter
String mfks = filterConfig.getInitParameter("maxFormKeys"); String mfks = filterConfig.getInitParameter("maxFormKeys");
if (mfks!=null) if (mfks!=null)
_maxFormKeys=Integer.parseInt(mfks); _maxFormKeys=Integer.parseInt(mfks);
_writeFilesWithFilenames = "true".equalsIgnoreCase(filterConfig.getInitParameter("writeFilesWithFilenames"));
} }
/* ------------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------------- */
@ -164,6 +166,7 @@ public class MultiPartFilter implements Filter
MultipartConfigElement config = new MultipartConfigElement(tempdir.getCanonicalPath(), _maxFileSize, _maxRequestSize, _fileOutputBuffer); MultipartConfigElement config = new MultipartConfigElement(tempdir.getCanonicalPath(), _maxFileSize, _maxRequestSize, _fileOutputBuffer);
MultiPartInputStreamParser mpis = new MultiPartInputStreamParser(in, content_type, config, tempdir); MultiPartInputStreamParser mpis = new MultiPartInputStreamParser(in, content_type, config, tempdir);
mpis.setDeleteOnExit(_deleteFiles); mpis.setDeleteOnExit(_deleteFiles);
mpis.setWriteFilesWithFilenames(_writeFilesWithFilenames);
request.setAttribute(MULTIPART, mpis); request.setAttribute(MULTIPART, mpis);
try try
{ {

3
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/IncludedGzipTest.java
View File

@ -89,8 +89,7 @@ public class IncludedGzipTest
tester.getContext().addServlet(org.eclipse.jetty.servlet.DefaultServlet.class, "/"); tester.getContext().addServlet(org.eclipse.jetty.servlet.DefaultServlet.class, "/");
GzipHandler gzipHandler = new GzipHandler(); GzipHandler gzipHandler = new GzipHandler();
gzipHandler.setHandler(tester.getContext().getHandler()); tester.getContext().insertHandler(gzipHandler);
tester.getContext().setHandler(gzipHandler);
tester.start(); tester.start();
} }

258
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
View File

@ -18,9 +18,10 @@
package org.eclipse.jetty.servlets; package org.eclipse.jetty.servlets;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
@ -30,10 +31,15 @@ import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.Reader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Enumeration;
import java.util.Map; import java.util.Map;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
@ -45,17 +51,59 @@ import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.http.HttpTester;
import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletTester; import org.eclipse.jetty.servlet.ServletTester;
import org.eclipse.jetty.toolchain.test.FS;
import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.IO;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
public class MultipartFilterTest public class MultipartFilterTest
{ {
private File _dir; private File _dir;
private ServletTester tester; private ServletTester tester;
FilterHolder multipartFilter;
@SuppressWarnings("serial")
public static class FilenameServlet extends TestServlet
{
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
assertThat(req.getAttribute("fileup"), notNullValue());
super.doPost(req, resp);
}
}
@SuppressWarnings("serial")
public static class ParameterListServlet extends TestServlet
{
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
resp.setContentType("text/plain");
PrintWriter out = resp.getWriter();
Enumeration<String> pnames = req.getParameterNames();
while (pnames.hasMoreElements())
{
String pname = pnames.nextElement();
Object param = req.getParameter(pname);
out.printf("Parameter[%s] = ",pname);
if (param == null)
{
out.println(" <null>");
}
else
{
out.printf("(%s) %s%n",param.getClass().getName(),param);
}
}
}
}
@SuppressWarnings("serial")
public static class BoundaryServlet extends TestServlet public static class BoundaryServlet extends TestServlet
{ {
@Override @Override
@ -63,9 +111,11 @@ public class MultipartFilterTest
{ {
//we have configured the multipart filter to always store to disk (file size threshold == 1) //we have configured the multipart filter to always store to disk (file size threshold == 1)
//but fileName has no filename param, so only the attribute should be set //but fileName has no filename param, so only the attribute should be set
assertNull(req.getParameter("fileName")); assertThat("getParameter('fileName')", req.getParameter("fileName"), nullValue());
assertNotNull(req.getAttribute("fileName")); assertThat("getAttribute('fileName')", req.getAttribute("fileName"), notNullValue());
File f = (File)req.getAttribute("fileName"); File f = (File)req.getAttribute("fileName");
assertThat("File exists", f.exists(), is(true));
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
IO.copy(new FileInputStream(f), baos); IO.copy(new FileInputStream(f), baos);
assertEquals(getServletContext().getAttribute("fileName"), baos.toString()); assertEquals(getServletContext().getAttribute("fileName"), baos.toString());
@ -83,37 +133,39 @@ public class MultipartFilterTest
} }
} }
@SuppressWarnings("serial")
public static class TestServlet extends DumpServlet public static class TestServlet extends DumpServlet
{ {
@SuppressWarnings("deprecation")
@Override @Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{ {
assertNotNull(req.getParameter("fileup")); String fileup = req.getParameter("fileup");
System.err.println("Fileup="+req.getParameter("fileup")); assertThat("getParameter('fileup')",fileup,notNullValue());
assertNotNull(req.getParameter("fileup"+MultiPartFilter.CONTENT_TYPE_SUFFIX));
assertEquals(req.getParameter("fileup"+MultiPartFilter.CONTENT_TYPE_SUFFIX), "application/octet-stream"); System.err.println("Fileup=" + req.getParameter("fileup"));
String fileupType = req.getParameter("fileup" + MultiPartFilter.CONTENT_TYPE_SUFFIX);
assertThat("req.getParameter('fileup'+CONTENT_TYPE_SUFFIX)",fileupType,is("application/octet-stream"));
super.doPost(req, resp); super.doPost(req, resp);
} }
} }
@SuppressWarnings("deprecation")
@Before @Before
public void setUp() throws Exception public void setUp() throws Exception
{ {
_dir = File.createTempFile("testmultupart",null); Path tmpDir = MavenTestingUtils.getTargetTestingPath("testmultupart");
assertTrue(_dir.delete()); FS.ensureEmpty(tmpDir);
assertTrue(_dir.mkdir());
_dir.deleteOnExit(); _dir = tmpDir.toFile();
assertTrue(_dir.isDirectory());
tester=new ServletTester("/context"); tester=new ServletTester("/context");
tester.getContext().setResourceBase(_dir.getCanonicalPath()); tester.getContext().setResourceBase(tmpDir.toString());
tester.getContext().addServlet(TestServlet.class, "/"); tester.getContext().addServlet(TestServlet.class, "/");
tester.getContext().setAttribute("javax.servlet.context.tempdir", _dir); tester.getContext().setAttribute("javax.servlet.context.tempdir", _dir);
FilterHolder multipartFilter = tester.getContext().addFilter(MultiPartFilter.class,"/*", EnumSet.of(DispatcherType.REQUEST)); multipartFilter = tester.getContext().addFilter(MultiPartFilter.class,"/*", EnumSet.of(DispatcherType.REQUEST));
multipartFilter.setInitParameter("deleteFiles", "true"); multipartFilter.setInitParameter("deleteFiles", "true");
multipartFilter.setInitParameter("fileOutputBuffer", "1"); //write a file if there's more than 1 byte content multipartFilter.setInitParameter("fileOutputBuffer", "1"); //write a file if there's more than 1 byte content
tester.start(); tester.start();
@ -780,6 +832,7 @@ public class MultipartFilterTest
assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, response.getStatus()); assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, response.getStatus());
} }
@SuppressWarnings("serial")
public static class TestServletParameterMap extends DumpServlet public static class TestServletParameterMap extends DumpServlet
{ {
@Override @Override
@ -820,7 +873,7 @@ public class MultipartFilterTest
"Content-Type: application/octet-stream\r\n\r\n"+ "Content-Type: application/octet-stream\r\n\r\n"+
"How now brown cow."+ "How now brown cow."+
"\r\n--" + boundary + "\r\n"+ "\r\n--" + boundary + "\r\n"+
"Content-Disposition: form-data; name=\"strup\""+ "Content-Disposition: form-data; name=\"strup\""+ // FIXME: this is missing a "\r\n"??
"Content-Type: application/octet-stream\r\n\r\n"+ "Content-Type: application/octet-stream\r\n\r\n"+
"How now brown cow."+ "How now brown cow."+
"\r\n--" + boundary + "--\r\n\r\n"; "\r\n--" + boundary + "--\r\n\r\n";
@ -832,6 +885,119 @@ public class MultipartFilterTest
assertTrue(response.getContent().indexOf("brown cow")>=0); assertTrue(response.getContent().indexOf("brown cow")>=0);
} }
/**
* Validate that the uploaded file can be accessed on the name it was given
* @throws Exception on test failure
*/
@Test
@Ignore("Fails for Bug #486394")
public void testFileUpload_AccessViaFilename() throws Exception
{
tester.addServlet(ParameterListServlet.class,"/paramlist");
multipartFilter.setInitParameter("fileOutputBuffer", "1");
multipartFilter.setInitParameter("deleteFiles", "false");
multipartFilter.setInitParameter("writeFilesWithFilenames", "true");
// generated and parsed test
HttpTester.Request request = HttpTester.newRequest();
HttpTester.Response response;
// test GET
request.setMethod("POST");
request.setURI("/context/paramlist");
request.setVersion("HTTP/1.1");
request.setHeader("Host","tester");
request.setHeader("Connection","close");
String boundary="XyXyXy";
request.setHeader("Content-Type","multipart/form-data; boundary=" + boundary);
StringBuilder content = new StringBuilder();
content.append("--").append(boundary).append("\r\n");
content.append("Content-Disposition: form-data; name=\"file\"; filename=\"tiny.dat\"\r\n");
content.append("Content-Type: application/octet-stream\r\n");
content.append("\r\n");
content.append("How now brown cow.\r\n");
content.append("--").append(boundary).append("--\r\n");
content.append("\r\n");
request.setContent(content.toString());
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
assertThat("Response status", response.getStatus(), is(HttpServletResponse.SC_OK));
assertEquals(HttpServletResponse.SC_OK,response.getStatus());
String contents = assertUploadedFileExists("tiny.dat");
assertThat("contents", contents, containsString("How now brown cow."));
}
/**
* Validate that the two upload files, with the same name="" on two different parts,
* can be accessed with the filename="" portions.
* @throws Exception on test failure
*/
@Test
@Ignore("Fails for Bug #486394")
public void testTwoFileUploads_AccessViaFilename() throws Exception
{
tester.addServlet(ParameterListServlet.class,"/paramlist");
multipartFilter.setInitParameter("fileOutputBuffer", "1");
multipartFilter.setInitParameter("deleteFiles", "false");
multipartFilter.setInitParameter("writeFilesWithFilenames", "true");
// generated and parsed test
HttpTester.Request request = HttpTester.newRequest();
HttpTester.Response response;
// test GET
request.setMethod("POST");
request.setURI("/context/paramlist");
request.setVersion("HTTP/1.1");
request.setHeader("Host","tester");
request.setHeader("Connection","close");
String boundary="XyXyXy";
request.setHeader("Content-Type","multipart/form-data; boundary=" + boundary);
StringBuilder content = new StringBuilder();
content.append("--").append(boundary).append("\r\n");
content.append("Content-Disposition: form-data; name=\"same\"; filename=\"crocodile.dat\"\r\n");
content.append("Content-Type: application/octet-stream\r\n");
content.append("\r\n");
content.append("See ya later, aligator.\r\n");
content.append("--").append(boundary).append("\r\n");
content.append("Content-Disposition: form-data; name=\"same\"; filename=\"aligator.dat\"\r\n");
content.append("Content-Type: application/octet-stream\r\n");
content.append("\r\n");
content.append("In a while, crocodile.\r\n");
content.append("--").append(boundary).append("--\r\n");
content.append("\r\n");
request.setContent(content.toString());
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
assertThat("Response status", response.getStatus(), is(HttpServletResponse.SC_OK));
assertEquals(HttpServletResponse.SC_OK,response.getStatus());
String contents = assertUploadedFileExists("crocodile.dat");
assertThat("contents", contents, containsString("See ya later, aligator."));
contents = assertUploadedFileExists("aligator.dat");
assertThat("contents", contents, containsString("In a while, crocodile."));
}
private String assertUploadedFileExists(String filename) throws IOException
{
File uploadedFile = new File(_dir,filename);
assertThat("Uploaded File[" + uploadedFile + "].exists",uploadedFile.exists(),is(true));
try (Reader reader = new FileReader(uploadedFile))
{
return IO.toString(reader);
}
}
public static class TestServletCharSet extends HttpServlet public static class TestServletCharSet extends HttpServlet
{ {
@ -885,11 +1051,61 @@ public class MultipartFilterTest
response = HttpTester.parseResponse(tester.getResponses(request.generate())); response = HttpTester.parseResponse(tester.getResponses(request.generate()));
} }
@Test
public void testFilesWithFilenames ()
throws Exception
{
multipartFilter.setInitParameter("fileOutputBuffer", "0");
multipartFilter.setInitParameter("writeFilesWithFilenames", "true");
String boundary="XyXyXy";
HttpTester.Request request = HttpTester.newRequest();
HttpTester.Response response;
tester.addServlet(FilenameServlet.class,"/testf");
// test GET
request.setMethod("POST");
request.setVersion("HTTP/1.0");
request.setHeader("Host","tester");
request.setURI("/context/testf");
request.setHeader("Content-Type","multipart/form-data; boundary="+boundary);
String content = "--XyXyXy\r"+
"Content-Disposition: form-data; name=\"fileName\"\r"+
"Content-Type: text/plain; charset=US-ASCII\r"+
"Content-Transfer-Encoding: 8bit\r"+
"\r"+
"abc\r"+
"--XyXyXy\r"+
"Content-Disposition: form-data; name=\"desc\"\r"+
"Content-Type: text/plain; charset=US-ASCII\r"+
"Content-Transfer-Encoding: 8bit\r"+
"\r"+
"123\r"+
"--XyXyXy\r"+
"Content-Disposition: form-data; name=\"title\"\r"+
"Content-Type: text/plain; charset=US-ASCII\r"+
"Content-Transfer-Encoding: 8bit\r"+
"\r"+
"ttt\r"+
"--XyXyXy\r"+
"Content-Disposition: form-data; name=\"fileup\"; filename=\"test.upload\"\r"+
"Content-Type: application/octet-stream\r"+
"Content-Transfer-Encoding: binary\r"+
"\r"+
"000\r"+
"--XyXyXy--\r";
request.setContent(content);
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
assertEquals(HttpServletResponse.SC_OK,response.getStatus());
assertTrue(response.getContent().indexOf("000")>=0);
}
@SuppressWarnings("serial")
public static class DumpServlet extends HttpServlet public static class DumpServlet extends HttpServlet
{ {
private static final long serialVersionUID = 201012011130L;
/* ------------------------------------------------------------ */
/** /**
* @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) * @see javax.servlet.http.HttpServlet#doPost(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
*/ */

26
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
View File

@ -63,6 +63,7 @@ public class MultiPartInputStreamParser
protected File _tmpDir; protected File _tmpDir;
protected File _contextTmpDir; protected File _contextTmpDir;
protected boolean _deleteOnExit; protected boolean _deleteOnExit;
protected boolean _writeFilesWithFilenames;
@ -94,9 +95,19 @@ public class MultiPartInputStreamParser
protected void open() protected void open()
throws IOException throws IOException
{ {
//Write to a buffer in memory until we discover we've exceed the //We will either be writing to a file, if it has a filename on the content-disposition
//MultipartConfig fileSizeThreshold //and otherwise a byte-array-input-stream, OR if we exceed the getFileSizeThreshold, we
_out = _bout= new ByteArrayOutputStream2(); //will need to change to write to a file.
if (isWriteFilesWithFilenames() && _filename != null && _filename.trim().length() > 0)
{
createFile();
}
else
{
//Write to a buffer in memory until we discover we've exceed the
//MultipartConfig fileSizeThreshold
_out = _bout= new ByteArrayOutputStream2();
}
} }
protected void close() protected void close()
@ -751,6 +762,15 @@ public class MultiPartInputStreamParser
_deleteOnExit = deleteOnExit; _deleteOnExit = deleteOnExit;
} }
public void setWriteFilesWithFilenames (boolean writeFilesWithFilenames)
{
_writeFilesWithFilenames = writeFilesWithFilenames;
}
public boolean isWriteFilesWithFilenames ()
{
return _writeFilesWithFilenames;
}
public boolean isDeleteOnExit() public boolean isDeleteOnExit()
{ {

10
jetty-util/src/main/java/org/eclipse/jetty/util/thread/ExecutionStrategy.java
View File

@ -20,6 +20,7 @@ package org.eclipse.jetty.util.thread;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.Loader;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
@ -53,6 +54,15 @@ public interface ExecutionStrategy
*/ */
public void execute(); public void execute();
/**
* A task that can handle {@link RejectedExecutionException}
*/
public interface Rejectable
{
public void reject();
}
/** /**
* <p>A producer of {@link Runnable} tasks to run.</p> * <p>A producer of {@link Runnable} tasks to run.</p>
* <p>The {@link ExecutionStrategy} will repeatedly invoke {@link #produce()} until * <p>The {@link ExecutionStrategy} will repeatedly invoke {@link #produce()} until

39
jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ExecuteProduceConsume.java
View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.util.thread.strategy; package org.eclipse.jetty.util.thread.strategy;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
@ -140,7 +141,15 @@ public class ExecuteProduceConsume implements ExecutionStrategy, Runnable
while (_threadpool!=null && _threadpool.isLowOnThreads()) while (_threadpool!=null && _threadpool.isLowOnThreads())
{ {
LOG.debug("EWYK low resources {}",this); LOG.debug("EWYK low resources {}",this);
_lowresources.execute(); try
{
_lowresources.execute();
}
catch(Throwable e)
{
// just warn if lowresources execute fails and keep producing
LOG.warn(e);
}
} }
// no longer low resources so produceAndRun normally // no longer low resources so produceAndRun normally
@ -204,13 +213,37 @@ public class ExecuteProduceConsume implements ExecutionStrategy, Runnable
// Spawn a new thread to continue production by running the produce loop. // Spawn a new thread to continue production by running the produce loop.
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("{} dispatch",this); LOG.debug("{} dispatch",this);
_executor.execute(this); try
{
_executor.execute(this);
}
catch(RejectedExecutionException e)
{
// If we cannot execute, then discard/reject the task and keep producing
LOG.debug(e);
LOG.warn("RejectedExecution {}",task);
try
{
if (task instanceof Rejectable)
((Rejectable)task).reject();
}
catch (Exception x)
{
e.addSuppressed(x);
LOG.warn(e);
}
finally
{
task=null;
}
}
} }
// Run the task. // Run the task.
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("{} run {}",this,task); LOG.debug("{} run {}",this,task);
task.run(); if (task != null)
task.run();
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("{} ran {}",this,task); LOG.debug("{} ran {}",this,task);

22
jetty-util/src/main/java/org/eclipse/jetty/util/thread/strategy/ProduceExecuteConsume.java
View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.util.thread.strategy; package org.eclipse.jetty.util.thread.strategy;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
@ -55,7 +56,26 @@ public class ProduceExecuteConsume implements ExecutionStrategy
break; break;
// Execute the task. // Execute the task.
_executor.execute(task); try
{
_executor.execute(task);
}
catch(RejectedExecutionException e)
{
// Discard/reject tasks that cannot be executed
if (task instanceof Rejectable)
{
try
{
((Rejectable)task).reject();
}
catch (Throwable x)
{
e.addSuppressed(x);
LOG.warn(e);
}
}
}
} }
} }

32
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
View File

@ -657,6 +657,38 @@ public class MultiPartInputStreamTest
} }
@Test
public void testWriteFilesIfContentDispositionFilename ()
throws Exception
{
String s = "--AaB03x\r\n"+
"content-disposition: form-data; name=\"field1\"; filename=\"frooble.txt\"\r\n"+
"\r\n"+
"Joe Blow\r\n"+
"--AaB03x\r\n"+
"content-disposition: form-data; name=\"stuff\"\r\n"+
"Content-Type: text/plain\r\n"+
"\r\n"+"sss"+
"aaa"+"\r\n" +
"--AaB03x--\r\n";
//all default values for multipartconfig, ie file size threshold 0
MultipartConfigElement config = new MultipartConfigElement(_dirname);
MultiPartInputStreamParser mpis = new MultiPartInputStreamParser(new ByteArrayInputStream(s.getBytes()),
_contentType,
config,
_tmpDir);
mpis.setDeleteOnExit(true);
mpis.setWriteFilesWithFilenames(true);
Collection<Part> parts = mpis.getParts();
assertThat(parts.size(), is(2));
Part field1 = mpis.getPart("field1"); //has a filename, should be written to a file
File f = ((MultiPartInputStreamParser.MultiPart)field1).getFile();
assertThat(f,notNullValue()); // longer than 100 bytes, should already be a tmp file
Part stuff = mpis.getPart("stuff");
f = ((MultiPartInputStreamParser.MultiPart)stuff).getFile(); //should only be in memory, no filename
assertThat(f, nullValue());
}
private void testMulti(String filename) throws IOException, ServletException, InterruptedException private void testMulti(String filename) throws IOException, ServletException, InterruptedException

2
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/frames/BinaryFrame.java
View File

@ -51,6 +51,8 @@ public class BinaryFrame extends DataFrame
@Override @Override
public Type getType() public Type getType()
{ {
if (getOpCode() == OpCode.CONTINUATION)
return Type.CONTINUATION;
return Type.BINARY; return Type.BINARY;
} }
} }

2
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/frames/TextFrame.java
View File

@ -34,6 +34,8 @@ public class TextFrame extends DataFrame
@Override @Override
public Type getType() public Type getType()
{ {
if (getOpCode() == OpCode.CONTINUATION)
return Type.CONTINUATION;
return Type.TEXT; return Type.TEXT;
} }

4
tests/test-integration/src/test/resources/DefaultHandler.xml
View File

@ -41,8 +41,8 @@
<New id="defcontext" class="org.eclipse.jetty.server.handler.ContextHandler"> <New id="defcontext" class="org.eclipse.jetty.server.handler.ContextHandler">
<Set name="contextPath">/tests</Set> <Set name="contextPath">/tests</Set>
<Set name="ResourceBase"><Property name="test.docroot.base"/>/default</Set> <Set name="ResourceBase"><Property name="test.docroot.base"/>/default</Set>
<Set name="Handler"><New id="reshandler" class="org.eclipse.jetty.server.handler.ResourceHandler"/></Set> <Set name="Handler"><New id="reshandler" class="org.eclipse.jetty.server.handler.ResourceHandler"/></Set>
<Set name="DisplayName">default</Set> <Set name="DisplayName">default</Set>
</New> </New>
</Item> </Item>
</Array> </Array>

12
tests/test-integration/src/test/resources/RFC2616Base.xml
View File

@ -102,12 +102,10 @@
</Arg> </Arg>
</Call> </Call>
<!-- =========================================================== -->
<!-- extra options -->
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- extra options --> <Set name="stopAtShutdown">true</Set>
<!-- =========================================================== --> <Set name="stopTimeout">1000</Set>
<Set name="stopAtShutdown">true</Set>
<Set name="stopTimeout">1000</Set>
</Configure> </Configure>

74
tests/test-integration/src/test/resources/RFC2616_Redirects.xml
View File

@ -2,53 +2,51 @@
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd"> <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server"> <Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- Configure Rewrite Handler --> <!-- Configure Rewrite Handler -->
<!-- =========================================================== --> <!-- =========================================================== -->
<Get id="oldhandler" name="handler"/>
<Set name="handler"> <Call name="insertHandler">
<Arg>
<New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler"> <New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
<Set name="handler"><Ref refid="oldhandler"/></Set>
<Set name="rewriteRequestURI">true</Set> <Set name="rewriteRequestURI">true</Set>
<Set name="rewritePathInfo">false</Set> <Set name="rewritePathInfo">false</Set>
<Set name="originalPathAttribute">requestedPath</Set> <Set name="originalPathAttribute">requestedPath</Set>
<Set name="rules"> <Set name="rules">
<Array type="org.eclipse.jetty.rewrite.handler.Rule"> <Array type="org.eclipse.jetty.rewrite.handler.Rule">
<!-- add a response rule --> <!-- add a response rule -->
<!-- <!--
<Item> <Item>
<New id="response" class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule"> <New id="response" class="org.eclipse.jetty.rewrite.handler.ResponsePatternRule">
<Set name="pattern">/rewrite/session/</Set> <Set name="pattern">/rewrite/session/</Set>
<Set name="code">401</Set> <Set name="code">401</Set>
<Set name="reason">Setting error code 401</Set> <Set name="reason">Setting error code 401</Set>
</New> </New>
</Item> </Item>
--> -->
<!-- add a simple redirect --> <!-- add a simple redirect -->
<!-- <!--
<Item> <Item>
<New id="redirect" class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule"> <New id="redirect" class="org.eclipse.jetty.rewrite.handler.RedirectPatternRule">
<Set name="pattern">/redirect/*</Set> <Set name="pattern">/redirect/*</Set>
<Set name="location">/tests/</Set> <Set name="location">/tests/</Set>
</New> </New>
</Item> </Item>
--> -->
<!-- add a regex rewrite redirect --> <!-- add a regex rewrite redirect -->
<Item> <Item>
<New id="redirect" class="org.eclipse.jetty.rewrite.handler.RedirectRegexRule"> <New id="redirect" class="org.eclipse.jetty.rewrite.handler.RedirectRegexRule">
<Set name="regex">/redirect/(.*)</Set> <Set name="regex">/redirect/(.*)</Set>
<Set name="replacement">/tests/$1</Set> <Set name="replacement">/tests/$1</Set>
</New> </New>
</Item> </Item>
</Array> </Array>
</Set> </Set>
</New> </New>
</Set> </Arg>
</Call>
</Configure> </Configure>

11
tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java
View File

@ -161,12 +161,12 @@ public class JdbcLoginServiceTest
} }
} }
public void testGetWithNonExistantUser() throws Exception @Test
public void testGetNonExistantUser () throws Exception
{ {
try try
{ {
startClient("foo", "bar"); startClient("foo", "bar");
ContentResponse response = _client.GET(_baseUri.resolve("input.txt")); ContentResponse response = _client.GET(_baseUri.resolve("input.txt"));
assertEquals(HttpServletResponse.SC_UNAUTHORIZED,response.getStatus()); assertEquals(HttpServletResponse.SC_UNAUTHORIZED,response.getStatus());
} }
@ -218,13 +218,18 @@ public class JdbcLoginServiceTest
protected void startClient(String username, String pwd) protected void startClient(String username, String pwd)
throws Exception throws Exception
{
startClient("jetty", "jetty");
}
protected void startClient(String user, String pwd) throws Exception
{ {
_client = new HttpClient(); _client = new HttpClient();
QueuedThreadPool executor = new QueuedThreadPool(); QueuedThreadPool executor = new QueuedThreadPool();
executor.setName(executor.getName() + "-client"); executor.setName(executor.getName() + "-client");
_client.setExecutor(executor); _client.setExecutor(executor);
AuthenticationStore authStore = _client.getAuthenticationStore(); AuthenticationStore authStore = _client.getAuthenticationStore();
authStore.addAuthentication(new BasicAuthentication(_baseUri, __realm, username, pwd)); authStore.addAuthentication(new BasicAuthentication(_baseUri, __realm, user, pwd));
_client.start(); _client.start();
} }

87
tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/AttributeNormalizerTest.java
View File

@ -18,12 +18,17 @@
package org.eclipse.jetty.quickstart; package org.eclipse.jetty.quickstart;
import static org.junit.Assert.assertEquals; import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -43,16 +48,50 @@ public class AttributeNormalizerTest
public static List<String[]> data() public static List<String[]> data()
{ {
String[][] tests = { String[][] tests = {
{ "WAR", "/opt/jetty-distro/demo.base/webapps/root" }, { "WAR", toSystemPath("/opt/jetty-distro/demo.base/webapps/root") },
{ "jetty.home", "/opt/jetty-distro" }, { "jetty.home", toSystemPath("/opt/jetty-distro") },
{ "jetty.base", "/opt/jetty-distro/demo.base" }, { "jetty.base", toSystemPath("/opt/jetty-distro/demo.base") },
{ "user.home", "/home/user" }, { "user.home", toSystemPath("/home/user") },
{ "user.dir", "/etc/init.d" }, { "user.dir", toSystemPath("/etc/init.d") },
}; };
return Arrays.asList(tests); return Arrays.asList(tests);
} }
/**
* As the declared paths in this testcase might be actual paths on the system
* running these tests, the expected paths should be cleaned up to represent
* the actual system paths.
* <p>
* Eg: on fedora /etc/init.d is a symlink to /etc/rc.d/init.d
*/
private static String toSystemPath(String rawpath)
{
Path path = FileSystems.getDefault().getPath(rawpath);
if (Files.exists(path))
{
// It exists, resolve it to the real path
try
{
path = path.toRealPath();
}
catch (IOException e)
{
// something prevented us from resolving to real path, fallback to
// absolute path resolution (not as accurate)
path = path.toAbsolutePath();
e.printStackTrace();
}
}
else
{
// File doesn't exist, resolve to absolute path
// We can't rely on File.toCanonicalPath() here
path = path.toAbsolutePath();
}
return path.toString();
}
private static String origJettyBase; private static String origJettyBase;
private static String origJettyHome; private static String origJettyHome;
private static String origUserHome; private static String origUserHome;
@ -97,108 +136,108 @@ public class AttributeNormalizerTest
@Test @Test
public void testEqual() public void testEqual()
{ {
assertEquals("file:${" + key + "}",normalizer.normalize("file:" + path)); assertThat(normalizer.normalize("file:" + path), is("file:${" + key + "}"));
} }
@Test @Test
public void testEqualsSlash() public void testEqualsSlash()
{ {
assertEquals("file:${" + key + "}",normalizer.normalize("file:" + path + "/")); assertThat(normalizer.normalize("file:" + path + "/"), is("file:${" + key + "}"));
} }
@Test @Test
public void testEqualsSlashFile() public void testEqualsSlashFile()
{ {
assertEquals("file:${" + key + "}/file",normalizer.normalize("file:" + path + "/file")); assertThat(normalizer.normalize("file:" + path + "/file"), is("file:${" + key + "}/file"));
} }
@Test @Test
public void testURIEquals() throws URISyntaxException public void testURIEquals() throws URISyntaxException
{ {
assertEquals("file:${" + key + "}",normalizer.normalize(new URI("file:" + path))); assertThat(normalizer.normalize(new URI("file:" + path)), is("file:${" + key + "}"));
} }
@Test @Test
public void testURIEqualsSlash() throws URISyntaxException public void testURIEqualsSlash() throws URISyntaxException
{ {
assertEquals("file:${" + key + "}",normalizer.normalize(new URI("file:" + path + "/"))); assertThat(normalizer.normalize(new URI("file:" + path + "/")), is("file:${" + key + "}"));
} }
@Test @Test
public void testURIEqualsSlashFile() throws URISyntaxException public void testURIEqualsSlashFile() throws URISyntaxException
{ {
assertEquals("file:${" + key + "}/file",normalizer.normalize(new URI("file:" + path + "/file"))); assertThat(normalizer.normalize(new URI("file:" + path + "/file")), is("file:${" + key + "}/file"));
} }
@Test @Test
public void testURLEquals() throws MalformedURLException public void testURLEquals() throws MalformedURLException
{ {
assertEquals("file:${" + key + "}",normalizer.normalize(new URL("file:" + path))); assertThat(normalizer.normalize(new URL("file:" + path)), is("file:${" + key + "}"));
} }
@Test @Test
public void testURLEqualsSlash() throws MalformedURLException public void testURLEqualsSlash() throws MalformedURLException
{ {
assertEquals("file:${" + key + "}",normalizer.normalize(new URL("file:" + path + "/"))); assertThat(normalizer.normalize(new URL("file:" + path + "/")), is("file:${" + key + "}"));
} }
@Test @Test
public void testURLEqualsSlashFile() throws MalformedURLException public void testURLEqualsSlashFile() throws MalformedURLException
{ {
assertEquals("file:${" + key + "}/file",normalizer.normalize(new URL("file:" + path + "/file"))); assertThat(normalizer.normalize(new URL("file:" + path + "/file")), is("file:${" + key + "}/file"));
} }
@Test @Test
public void testJarFileEquals_BangFile() public void testJarFileEquals_BangFile()
{ {
assertEquals("jar:file:${" + key + "}!/file",normalizer.normalize("jar:file:" + path + "!/file")); assertThat(normalizer.normalize("jar:file:" + path + "!/file"), is("jar:file:${" + key + "}!/file"));
} }
@Test @Test
public void testJarFileEquals_SlashBangFile() public void testJarFileEquals_SlashBangFile()
{ {
assertEquals("jar:file:${" + key + "}!/file",normalizer.normalize("jar:file:" + path + "/!/file")); assertThat(normalizer.normalize("jar:file:" + path + "/!/file"), is("jar:file:${" + key + "}!/file"));
} }
@Test @Test
public void testJarFileEquals_FileBangFile() public void testJarFileEquals_FileBangFile()
{ {
assertEquals("jar:file:${" + key + "}/file!/file",normalizer.normalize("jar:file:" + path + "/file!/file")); assertThat(normalizer.normalize("jar:file:" + path + "/file!/file"), is("jar:file:${" + key + "}/file!/file"));
} }
@Test @Test
public void testJarFileEquals_URIBangFile() throws URISyntaxException public void testJarFileEquals_URIBangFile() throws URISyntaxException
{ {
assertEquals("jar:file:${" + key + "}!/file",normalizer.normalize(new URI("jar:file:" + path + "!/file"))); assertThat(normalizer.normalize(new URI("jar:file:" + path + "!/file")), is("jar:file:${" + key + "}!/file"));
} }
@Test @Test
public void testJarFileEquals_URISlashBangFile() throws URISyntaxException public void testJarFileEquals_URISlashBangFile() throws URISyntaxException
{ {
assertEquals("jar:file:${" + key + "}!/file",normalizer.normalize(new URI("jar:file:" + path + "/!/file"))); assertThat(normalizer.normalize(new URI("jar:file:" + path + "/!/file")), is("jar:file:${" + key + "}!/file"));
} }
@Test @Test
public void testJarFileEquals_URIFileBangFile() throws URISyntaxException public void testJarFileEquals_URIFileBangFile() throws URISyntaxException
{ {
assertEquals("jar:file:${" + key + "}/file!/file",normalizer.normalize(new URI("jar:file:" + path + "/file!/file"))); assertThat(normalizer.normalize(new URI("jar:file:" + path + "/file!/file")), is("jar:file:${" + key + "}/file!/file"));
} }
@Test @Test
public void testJarFileEquals_URLBangFile() throws MalformedURLException public void testJarFileEquals_URLBangFile() throws MalformedURLException
{ {
assertEquals("jar:file:${" + key + "}!/file",normalizer.normalize(new URL("jar:file:" + path + "!/file"))); assertThat(normalizer.normalize(new URL("jar:file:" + path + "!/file")), is("jar:file:${" + key + "}!/file"));
} }
@Test @Test
public void testJarFileEquals_URLSlashBangFile() throws MalformedURLException public void testJarFileEquals_URLSlashBangFile() throws MalformedURLException
{ {
assertEquals("jar:file:${" + key + "}!/file",normalizer.normalize(new URL("jar:file:" + path + "/!/file"))); assertThat(normalizer.normalize(new URL("jar:file:" + path + "/!/file")), is("jar:file:${" + key + "}!/file"));
} }
@Test @Test
public void testJarFileEquals_URLFileBangFile() throws MalformedURLException public void testJarFileEquals_URLFileBangFile() throws MalformedURLException
{ {
assertEquals("jar:file:${" + key + "}/file!/file",normalizer.normalize(new URL("jar:file:" + path + "/file!/file"))); assertThat(normalizer.normalize(new URL("jar:file:" + path + "/file!/file")), is("jar:file:${" + key + "}/file!/file"));
} }
} }

1
tests/test-webapps/test-jetty-webapp/src/main/assembly/embedded-jetty-web-for-webbundle.xml
View File

@ -13,7 +13,6 @@ detected.
<Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Configure class="org.eclipse.jetty.webapp.WebAppContext">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Required minimal context configuration : --> <!-- Required minimal context configuration : -->
<!-- + contextPath --> <!-- + contextPath -->