Modified attempt to delete files on Windows without failing the test.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2935 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Simone Bordet
parent
e9e7a72b08
commit
da0160029d
|
|
@ -1,11 +1,8 @@
|
||||||
package org.eclipse.jetty.servlet;
|
package org.eclipse.jetty.servlet;
|
||||||
|
|
||||||
import static org.junit.Assert.assertTrue;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import javax.servlet.Filter;
|
import javax.servlet.Filter;
|
||||||
import javax.servlet.FilterChain;
|
import javax.servlet.FilterChain;
|
||||||
import javax.servlet.FilterConfig;
|
import javax.servlet.FilterConfig;
|
||||||
|
|
@ -14,7 +11,6 @@ import javax.servlet.ServletRequest;
|
||||||
import javax.servlet.ServletResponse;
|
import javax.servlet.ServletResponse;
|
||||||
|
|
||||||
import junit.framework.AssertionFailedError;
|
import junit.framework.AssertionFailedError;
|
||||||
|
|
||||||
import org.eclipse.jetty.server.LocalConnector;
|
import org.eclipse.jetty.server.LocalConnector;
|
||||||
import org.eclipse.jetty.server.Server;
|
import org.eclipse.jetty.server.Server;
|
||||||
import org.eclipse.jetty.toolchain.test.FS;
|
import org.eclipse.jetty.toolchain.test.FS;
|
||||||
|
|
@ -29,10 +25,12 @@ import org.junit.Before;
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
public class DefaultServletTest
|
public class DefaultServletTest
|
||||||
{
|
{
|
||||||
@Rule
|
@Rule
|
||||||
public TestingDir testdir = new TestingDir();
|
public TestingDir testdir = new TestingDir();
|
||||||
|
|
||||||
private Server server;
|
private Server server;
|
||||||
private LocalConnector connector;
|
private LocalConnector connector;
|
||||||
|
|
@ -48,7 +46,7 @@ public class DefaultServletTest
|
||||||
|
|
||||||
context = new ServletContextHandler();
|
context = new ServletContextHandler();
|
||||||
context.setContextPath("/context");
|
context.setContextPath("/context");
|
||||||
context.setWelcomeFiles(new String[] {"index.html","index.jsp","index.htm"});
|
context.setWelcomeFiles(new String[]{"index.html", "index.jsp", "index.htm"});
|
||||||
|
|
||||||
server.setHandler(context);
|
server.setHandler(context);
|
||||||
server.addConnector(connector);
|
server.addConnector(connector);
|
||||||
|
|
@ -66,10 +64,10 @@ public class DefaultServletTest
|
||||||
@Test
|
@Test
|
||||||
public void testListingWithSession() throws Exception
|
public void testListingWithSession() throws Exception
|
||||||
{
|
{
|
||||||
ServletHolder defholder = context.addServlet(DefaultServlet.class,"/*");
|
ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
|
||||||
defholder.setInitParameter("dirAllowed","true");
|
defholder.setInitParameter("dirAllowed", "true");
|
||||||
defholder.setInitParameter("redirectWelcome","false");
|
defholder.setInitParameter("redirectWelcome", "false");
|
||||||
defholder.setInitParameter("gzip","false");
|
defholder.setInitParameter("gzip", "false");
|
||||||
|
|
||||||
testdir.ensureEmpty();
|
testdir.ensureEmpty();
|
||||||
|
|
||||||
|
|
@ -81,7 +79,7 @@ public class DefaultServletTest
|
||||||
assertTrue(new File(resBase, "three").mkdir());
|
assertTrue(new File(resBase, "three").mkdir());
|
||||||
|
|
||||||
String resBasePath = resBase.getAbsolutePath();
|
String resBasePath = resBase.getAbsolutePath();
|
||||||
defholder.setInitParameter("resourceBase",resBasePath);
|
defholder.setInitParameter("resourceBase", resBasePath);
|
||||||
|
|
||||||
StringBuffer req1 = new StringBuffer();
|
StringBuffer req1 = new StringBuffer();
|
||||||
req1.append("GET /context/;JSESSIONID=1234567890 HTTP/1.1\n");
|
req1.append("GET /context/;JSESSIONID=1234567890 HTTP/1.1\n");
|
||||||
|
|
@ -90,20 +88,20 @@ public class DefaultServletTest
|
||||||
|
|
||||||
String response = connector.getResponses(req1.toString());
|
String response = connector.getResponses(req1.toString());
|
||||||
|
|
||||||
assertResponseContains("/one/;JSESSIONID=1234567890",response);
|
assertResponseContains("/one/;JSESSIONID=1234567890", response);
|
||||||
assertResponseContains("/two/;JSESSIONID=1234567890",response);
|
assertResponseContains("/two/;JSESSIONID=1234567890", response);
|
||||||
assertResponseContains("/three/;JSESSIONID=1234567890",response);
|
assertResponseContains("/three/;JSESSIONID=1234567890", response);
|
||||||
|
|
||||||
assertResponseNotContains("<script>",response);
|
assertResponseNotContains("<script>", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testListingXSS() throws Exception
|
public void testListingXSS() throws Exception
|
||||||
{
|
{
|
||||||
ServletHolder defholder = context.addServlet(DefaultServlet.class,"/*");
|
ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
|
||||||
defholder.setInitParameter("dirAllowed","true");
|
defholder.setInitParameter("dirAllowed", "true");
|
||||||
defholder.setInitParameter("redirectWelcome","false");
|
defholder.setInitParameter("redirectWelcome", "false");
|
||||||
defholder.setInitParameter("gzip","false");
|
defholder.setInitParameter("gzip", "false");
|
||||||
|
|
||||||
testdir.ensureEmpty();
|
testdir.ensureEmpty();
|
||||||
|
|
||||||
|
|
@ -113,41 +111,43 @@ public class DefaultServletTest
|
||||||
assertTrue(new File(resBase, "one").mkdir());
|
assertTrue(new File(resBase, "one").mkdir());
|
||||||
assertTrue(new File(resBase, "two").mkdir());
|
assertTrue(new File(resBase, "two").mkdir());
|
||||||
assertTrue(new File(resBase, "three").mkdir());
|
assertTrue(new File(resBase, "three").mkdir());
|
||||||
if ( !OS.IS_WINDOWS ) {
|
if (!OS.IS_WINDOWS)
|
||||||
|
{
|
||||||
assertTrue("Creating dir 'f??r' (Might not work in Windows)", new File(resBase, "f??r").mkdir());
|
assertTrue("Creating dir 'f??r' (Might not work in Windows)", new File(resBase, "f??r").mkdir());
|
||||||
}
|
}
|
||||||
|
|
||||||
String resBasePath = resBase.getAbsolutePath();
|
String resBasePath = resBase.getAbsolutePath();
|
||||||
defholder.setInitParameter( "resourceBase", resBasePath );
|
defholder.setInitParameter("resourceBase", resBasePath);
|
||||||
|
|
||||||
StringBuffer req1 = new StringBuffer();
|
StringBuffer req1 = new StringBuffer();
|
||||||
/*
|
/*
|
||||||
* Intentionally bad request URI. Sending a non-encoded URI with typically encoded characters '<', '>', and
|
* Intentionally bad request URI. Sending a non-encoded URI with typically encoded characters '<', '>', and
|
||||||
* '"'.
|
* '"'.
|
||||||
*/
|
*/
|
||||||
req1.append( "GET /context/;<script>window.alert(\"hi\");</script> HTTP/1.1\n" );
|
req1.append("GET /context/;<script>window.alert(\"hi\");</script> HTTP/1.1\n");
|
||||||
req1.append( "Host: localhost\n" );
|
req1.append("Host: localhost\n");
|
||||||
req1.append( "\n" );
|
req1.append("\n");
|
||||||
|
|
||||||
String response = connector.getResponses( req1.toString() );
|
String response = connector.getResponses(req1.toString());
|
||||||
|
|
||||||
assertResponseContains( "/one/", response );
|
assertResponseContains("/one/", response);
|
||||||
assertResponseContains( "/two/", response );
|
assertResponseContains("/two/", response);
|
||||||
assertResponseContains( "/three/", response );
|
assertResponseContains("/three/", response);
|
||||||
if ( !OS.IS_WINDOWS ) {
|
if (!OS.IS_WINDOWS)
|
||||||
assertResponseContains( "/f%3F%3Fr", response );
|
{
|
||||||
|
assertResponseContains("/f%3F%3Fr", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
assertResponseNotContains( "<script>", response );
|
assertResponseNotContains("<script>", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testListingProperUrlEncoding() throws Exception
|
public void testListingProperUrlEncoding() throws Exception
|
||||||
{
|
{
|
||||||
ServletHolder defholder = context.addServlet(DefaultServlet.class,"/*");
|
ServletHolder defholder = context.addServlet(DefaultServlet.class, "/*");
|
||||||
defholder.setInitParameter("dirAllowed","true");
|
defholder.setInitParameter("dirAllowed", "true");
|
||||||
defholder.setInitParameter("redirectWelcome","false");
|
defholder.setInitParameter("redirectWelcome", "false");
|
||||||
defholder.setInitParameter("gzip","false");
|
defholder.setInitParameter("gzip", "false");
|
||||||
|
|
||||||
testdir.ensureEmpty();
|
testdir.ensureEmpty();
|
||||||
|
|
||||||
|
|
@ -171,7 +171,7 @@ public class DefaultServletTest
|
||||||
*/
|
*/
|
||||||
|
|
||||||
String resBasePath = resBase.getAbsolutePath();
|
String resBasePath = resBase.getAbsolutePath();
|
||||||
defholder.setInitParameter("resourceBase",resBasePath);
|
defholder.setInitParameter("resourceBase", resBasePath);
|
||||||
|
|
||||||
// First send request in improper, unencoded way.
|
// First send request in improper, unencoded way.
|
||||||
String response = connector.getResponses("GET /context/dir;/ HTTP/1.0\r\n\r\n");
|
String response = connector.getResponses("GET /context/dir;/ HTTP/1.0\r\n\r\n");
|
||||||
|
|
@ -184,22 +184,22 @@ public class DefaultServletTest
|
||||||
// Should not see double-encoded ";"
|
// Should not see double-encoded ";"
|
||||||
// First encoding: ";" -> "%3b"
|
// First encoding: ";" -> "%3b"
|
||||||
// Second encoding: "%3B" -> "%253B" (BAD!)
|
// Second encoding: "%3B" -> "%253B" (BAD!)
|
||||||
assertResponseNotContains("%253B",response);
|
assertResponseNotContains("%253B", response);
|
||||||
|
|
||||||
assertResponseContains("/dir%3B/",response);
|
assertResponseContains("/dir%3B/", response);
|
||||||
assertResponseContains("/dir%3B/four/",response);
|
assertResponseContains("/dir%3B/four/", response);
|
||||||
assertResponseContains("/dir%3B/five/",response);
|
assertResponseContains("/dir%3B/five/", response);
|
||||||
assertResponseContains("/dir%3B/six/",response);
|
assertResponseContains("/dir%3B/six/", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testListingContextBreakout() throws Exception
|
public void testListingContextBreakout() throws Exception
|
||||||
{
|
{
|
||||||
ServletHolder defholder = context.addServlet(DefaultServlet.class,"/");
|
ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
|
||||||
defholder.setInitParameter("dirAllowed","true");
|
defholder.setInitParameter("dirAllowed", "true");
|
||||||
defholder.setInitParameter("redirectWelcome","false");
|
defholder.setInitParameter("redirectWelcome", "false");
|
||||||
defholder.setInitParameter("gzip","false");
|
defholder.setInitParameter("gzip", "false");
|
||||||
defholder.setInitParameter("aliases","true");
|
defholder.setInitParameter("aliases", "true");
|
||||||
|
|
||||||
testdir.ensureEmpty();
|
testdir.ensureEmpty();
|
||||||
|
|
||||||
|
|
@ -211,8 +211,9 @@ public class DefaultServletTest
|
||||||
createFile(index, "<h1>Hello Index</h1>");
|
createFile(index, "<h1>Hello Index</h1>");
|
||||||
|
|
||||||
File wackyDir = new File(resBase, "dir?");
|
File wackyDir = new File(resBase, "dir?");
|
||||||
if ( !OS.IS_WINDOWS ) {
|
if (!OS.IS_WINDOWS)
|
||||||
FS.ensureDirExists(wackyDir);
|
{
|
||||||
|
FS.ensureDirExists(wackyDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
wackyDir = new File(resBase, "dir;");
|
wackyDir = new File(resBase, "dir;");
|
||||||
|
|
@ -235,68 +236,68 @@ public class DefaultServletTest
|
||||||
*/
|
*/
|
||||||
|
|
||||||
String resBasePath = resBase.getAbsolutePath();
|
String resBasePath = resBase.getAbsolutePath();
|
||||||
defholder.setInitParameter("resourceBase",resBasePath);
|
defholder.setInitParameter("resourceBase", resBasePath);
|
||||||
|
|
||||||
String response;
|
String response;
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Index</h1>",response);
|
assertResponseContains("<h1>Hello Index</h1>", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir?/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir?/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("404",response);
|
assertResponseContains("404", response);
|
||||||
|
|
||||||
if ( !OS.IS_WINDOWS )
|
if (!OS.IS_WINDOWS)
|
||||||
{
|
{
|
||||||
response= connector.getResponses("GET /context/dir%3F/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir%3F/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("Directory: /context/dir?/<",response);
|
assertResponseContains("Directory: /context/dir?/<", response);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
assertResponseContains("404",response);
|
assertResponseContains("404", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/index.html HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/index.html HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("Hello Index",response);
|
assertResponseContains("Hello Index", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir%3F/../index.html HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir%3F/../index.html HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("Hello Index",response);
|
assertResponseContains("Hello Index", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir%3F/../../ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir%3F/../../ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseNotContains("Directory: ",response);
|
assertResponseNotContains("Directory: ", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir%3F/../../sekret/pass HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir%3F/../../sekret/pass HTTP/1.0\r\n\r\n");
|
||||||
assertResponseNotContains("Sssh",response);
|
assertResponseNotContains("Sssh", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir?/../../ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir?/../../ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseNotContains("Directory: ",response);
|
assertResponseNotContains("Directory: ", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir?/../../sekret/pass HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir?/../../sekret/pass HTTP/1.0\r\n\r\n");
|
||||||
assertResponseNotContains("Sssh",response);
|
assertResponseNotContains("Sssh", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Index</h1>",response);
|
assertResponseContains("<h1>Hello Index</h1>", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir;/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir;/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("404",response);
|
assertResponseContains("404", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir%3B/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir%3B/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("Directory: /context/dir;/<",response);
|
assertResponseContains("Directory: /context/dir;/<", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/index.html HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/index.html HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("Hello Index",response);
|
assertResponseContains("Hello Index", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir%3B/../index.html HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir%3B/../index.html HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("Hello Index",response);
|
assertResponseContains("Hello Index", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir%3B/../../ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir%3B/../../ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseNotContains("Directory: ",response);
|
assertResponseNotContains("Directory: ", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir%3B/../../sekret/pass HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir%3B/../../sekret/pass HTTP/1.0\r\n\r\n");
|
||||||
assertResponseNotContains("Sssh",response);
|
assertResponseNotContains("Sssh", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir;/../../ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir;/../../ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseNotContains("Directory: ",response);
|
assertResponseNotContains("Directory: ", response);
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/dir;/../../sekret/pass HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/dir;/../../sekret/pass HTTP/1.0\r\n\r\n");
|
||||||
assertResponseNotContains("Sssh",response);
|
assertResponseNotContains("Sssh", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
@ -310,37 +311,37 @@ public class DefaultServletTest
|
||||||
|
|
||||||
String resBasePath = resBase.getAbsolutePath();
|
String resBasePath = resBase.getAbsolutePath();
|
||||||
|
|
||||||
ServletHolder defholder = context.addServlet(DefaultServlet.class,"/");
|
ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
|
||||||
defholder.setInitParameter("dirAllowed","false");
|
defholder.setInitParameter("dirAllowed", "false");
|
||||||
defholder.setInitParameter("redirectWelcome","false");
|
defholder.setInitParameter("redirectWelcome", "false");
|
||||||
defholder.setInitParameter("welcomeServlets","false");
|
defholder.setInitParameter("welcomeServlets", "false");
|
||||||
defholder.setInitParameter("gzip","false");
|
defholder.setInitParameter("gzip", "false");
|
||||||
defholder.setInitParameter("resourceBase",resBasePath);
|
defholder.setInitParameter("resourceBase", resBasePath);
|
||||||
defholder.setInitParameter("maxCacheSize","1024000");
|
defholder.setInitParameter("maxCacheSize", "1024000");
|
||||||
defholder.setInitParameter("maxCachedFileSize","512000");
|
defholder.setInitParameter("maxCachedFileSize", "512000");
|
||||||
defholder.setInitParameter("maxCachedFiles","100");
|
defholder.setInitParameter("maxCachedFiles", "100");
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
ServletHolder jspholder = context.addServlet(NoJspServlet.class,"*.jsp");
|
ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
|
||||||
|
|
||||||
String response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
String response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("403",response);
|
assertResponseContains("403", response);
|
||||||
|
|
||||||
createFile(index, "<h1>Hello Index</h1>");
|
createFile(index, "<h1>Hello Index</h1>");
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Index</h1>",response);
|
assertResponseContains("<h1>Hello Index</h1>", response);
|
||||||
|
|
||||||
createFile(inde, "<h1>Hello Inde</h1>");
|
createFile(inde, "<h1>Hello Inde</h1>");
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Index</h1>",response);
|
assertResponseContains("<h1>Hello Index</h1>", response);
|
||||||
|
|
||||||
assertTrue(index.delete());
|
assertTrue(index.delete());
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Inde</h1>",response);
|
assertResponseContains("<h1>Hello Inde</h1>", response);
|
||||||
|
|
||||||
assertTrue(inde.delete());
|
assertTrue(inde.delete());
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("403",response);
|
assertResponseContains("403", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
@ -354,36 +355,36 @@ public class DefaultServletTest
|
||||||
|
|
||||||
String resBasePath = resBase.getAbsolutePath();
|
String resBasePath = resBase.getAbsolutePath();
|
||||||
|
|
||||||
ServletHolder defholder = context.addServlet(DefaultServlet.class,"/");
|
ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
|
||||||
defholder.setInitParameter("dirAllowed","false");
|
defholder.setInitParameter("dirAllowed", "false");
|
||||||
defholder.setInitParameter("redirectWelcome","false");
|
defholder.setInitParameter("redirectWelcome", "false");
|
||||||
defholder.setInitParameter("welcomeServlets","true");
|
defholder.setInitParameter("welcomeServlets", "true");
|
||||||
defholder.setInitParameter("gzip","false");
|
defholder.setInitParameter("gzip", "false");
|
||||||
defholder.setInitParameter("resourceBase",resBasePath);
|
defholder.setInitParameter("resourceBase", resBasePath);
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
ServletHolder jspholder = context.addServlet(NoJspServlet.class,"*.jsp");
|
ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
|
||||||
|
|
||||||
String response;
|
String response;
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("JSP support not configured",response);
|
assertResponseContains("JSP support not configured", response);
|
||||||
|
|
||||||
createFile(index, "<h1>Hello Index</h1>");
|
createFile(index, "<h1>Hello Index</h1>");
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Index</h1>",response);
|
assertResponseContains("<h1>Hello Index</h1>", response);
|
||||||
|
|
||||||
createFile(inde, "<h1>Hello Inde</h1>");
|
createFile(inde, "<h1>Hello Inde</h1>");
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Index</h1>",response);
|
assertResponseContains("<h1>Hello Index</h1>", response);
|
||||||
|
|
||||||
deleteFile(index);
|
deleteFile(index);
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Inde</h1>",response);
|
assertResponseContains("<h1>Hello Inde</h1>", response);
|
||||||
|
|
||||||
deleteFile(inde);
|
deleteFile(inde);
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("JSP support not configured",response);
|
assertResponseContains("JSP support not configured", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
@ -397,36 +398,36 @@ public class DefaultServletTest
|
||||||
|
|
||||||
String resBasePath = resBase.getAbsolutePath();
|
String resBasePath = resBase.getAbsolutePath();
|
||||||
|
|
||||||
ServletHolder defholder = context.addServlet(DefaultServlet.class,"/");
|
ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
|
||||||
defholder.setInitParameter("dirAllowed","false");
|
defholder.setInitParameter("dirAllowed", "false");
|
||||||
defholder.setInitParameter("redirectWelcome","false");
|
defholder.setInitParameter("redirectWelcome", "false");
|
||||||
defholder.setInitParameter("welcomeServlets","exact");
|
defholder.setInitParameter("welcomeServlets", "exact");
|
||||||
defholder.setInitParameter("gzip","false");
|
defholder.setInitParameter("gzip", "false");
|
||||||
defholder.setInitParameter("resourceBase",resBasePath);
|
defholder.setInitParameter("resourceBase", resBasePath);
|
||||||
|
|
||||||
ServletHolder jspholder = context.addServlet(NoJspServlet.class,"*.jsp");
|
ServletHolder jspholder = context.addServlet(NoJspServlet.class, "*.jsp");
|
||||||
context.addServlet(jspholder,"/index.jsp");
|
context.addServlet(jspholder, "/index.jsp");
|
||||||
|
|
||||||
String response;
|
String response;
|
||||||
|
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("JSP support not configured",response);
|
assertResponseContains("JSP support not configured", response);
|
||||||
|
|
||||||
createFile(index, "<h1>Hello Index</h1>");
|
createFile(index, "<h1>Hello Index</h1>");
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Index</h1>",response);
|
assertResponseContains("<h1>Hello Index</h1>", response);
|
||||||
|
|
||||||
createFile(inde, "<h1>Hello Inde</h1>");
|
createFile(inde, "<h1>Hello Inde</h1>");
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Index</h1>",response);
|
assertResponseContains("<h1>Hello Index</h1>", response);
|
||||||
|
|
||||||
assertTrue(index.delete());
|
assertTrue(index.delete());
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("<h1>Hello Inde</h1>",response);
|
assertResponseContains("<h1>Hello Inde</h1>", response);
|
||||||
|
|
||||||
assertTrue(inde.delete());
|
assertTrue(inde.delete());
|
||||||
response= connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
response = connector.getResponses("GET /context/ HTTP/1.0\r\n\r\n");
|
||||||
assertResponseContains("JSP support not configured",response);
|
assertResponseContains("JSP support not configured", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
@ -436,77 +437,77 @@ public class DefaultServletTest
|
||||||
File resBase = testdir.getFile("docroot");
|
File resBase = testdir.getFile("docroot");
|
||||||
FS.ensureDirExists(resBase);
|
FS.ensureDirExists(resBase);
|
||||||
File data = new File(resBase, "data.txt");
|
File data = new File(resBase, "data.txt");
|
||||||
createFile(data,"01234567890123456789012345678901234567890123456789012345678901234567890123456789");
|
createFile(data, "01234567890123456789012345678901234567890123456789012345678901234567890123456789");
|
||||||
String resBasePath = resBase.getAbsolutePath();
|
String resBasePath = resBase.getAbsolutePath();
|
||||||
|
|
||||||
ServletHolder defholder = context.addServlet(DefaultServlet.class,"/");
|
ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
|
||||||
defholder.setInitParameter("acceptRanges","true");
|
defholder.setInitParameter("acceptRanges", "true");
|
||||||
defholder.setInitParameter("resourceBase",resBasePath);
|
defholder.setInitParameter("resourceBase", resBasePath);
|
||||||
|
|
||||||
String response = connector.getResponses(
|
String response = connector.getResponses(
|
||||||
"GET /context/data.txt HTTP/1.1\r\n" +
|
"GET /context/data.txt HTTP/1.1\r\n" +
|
||||||
"Host: localhost\r\n" +
|
"Host: localhost\r\n" +
|
||||||
"\r\n");
|
"\r\n");
|
||||||
assertResponseContains("200 OK",response);
|
assertResponseContains("200 OK", response);
|
||||||
assertResponseContains("Accept-Ranges: bytes",response);
|
assertResponseContains("Accept-Ranges: bytes", response);
|
||||||
|
|
||||||
response= connector.getResponses(
|
response = connector.getResponses(
|
||||||
"GET /context/data.txt HTTP/1.1\r\n"+
|
"GET /context/data.txt HTTP/1.1\r\n" +
|
||||||
"Host: localhost\r\n"+
|
"Host: localhost\r\n" +
|
||||||
"Range: bytes=0-9\r\n"+
|
"Range: bytes=0-9\r\n" +
|
||||||
"\r\n");
|
"\r\n");
|
||||||
assertResponseContains("206 Partial",response);
|
assertResponseContains("206 Partial", response);
|
||||||
assertResponseContains("Content-Type: text/plain",response);
|
assertResponseContains("Content-Type: text/plain", response);
|
||||||
assertResponseContains("Content-Length: 10",response);
|
assertResponseContains("Content-Length: 10", response);
|
||||||
assertResponseContains("Content-Range: bytes 0-9/80",response);
|
assertResponseContains("Content-Range: bytes 0-9/80", response);
|
||||||
|
|
||||||
response= connector.getResponses(
|
response = connector.getResponses(
|
||||||
"GET /context/data.txt HTTP/1.1\r\n"+
|
"GET /context/data.txt HTTP/1.1\r\n" +
|
||||||
"Host: localhost\r\n"+
|
"Host: localhost\r\n" +
|
||||||
"Range: bytes=0-9,20-29,40-49\r\n"+
|
"Range: bytes=0-9,20-29,40-49\r\n" +
|
||||||
"\r\n");
|
"\r\n");
|
||||||
int start = response.indexOf("--jetty");
|
int start = response.indexOf("--jetty");
|
||||||
String body=response.substring(start);
|
String body = response.substring(start);
|
||||||
String boundary = body.substring(0,body.indexOf("\r\n"));
|
String boundary = body.substring(0, body.indexOf("\r\n"));
|
||||||
assertResponseContains("206 Partial",response);
|
assertResponseContains("206 Partial", response);
|
||||||
assertResponseContains("Content-Type: multipart/byteranges; boundary=",response);
|
assertResponseContains("Content-Type: multipart/byteranges; boundary=", response);
|
||||||
assertResponseContains("Content-Range: bytes 0-9/80",response);
|
assertResponseContains("Content-Range: bytes 0-9/80", response);
|
||||||
assertResponseContains("Content-Range: bytes 20-29/80",response);
|
assertResponseContains("Content-Range: bytes 20-29/80", response);
|
||||||
assertResponseContains("Content-Length: "+body.length(),response);
|
assertResponseContains("Content-Length: " + body.length(), response);
|
||||||
assertTrue(body.endsWith(boundary+"--\r\n"));
|
assertTrue(body.endsWith(boundary + "--\r\n"));
|
||||||
|
|
||||||
response= connector.getResponses(
|
response = connector.getResponses(
|
||||||
"GET /context/data.txt HTTP/1.1\r\n"+
|
"GET /context/data.txt HTTP/1.1\r\n" +
|
||||||
"Host: localhost\r\n"+
|
"Host: localhost\r\n" +
|
||||||
"Range: bytes=0-9,20-29,40-49,70-79\r\n"+
|
"Range: bytes=0-9,20-29,40-49,70-79\r\n" +
|
||||||
"\r\n");
|
"\r\n");
|
||||||
start = response.indexOf("--jetty");
|
start = response.indexOf("--jetty");
|
||||||
body=response.substring(start);
|
body = response.substring(start);
|
||||||
boundary = body.substring(0,body.indexOf("\r\n"));
|
boundary = body.substring(0, body.indexOf("\r\n"));
|
||||||
assertResponseContains("206 Partial",response);
|
assertResponseContains("206 Partial", response);
|
||||||
assertResponseContains("Content-Type: multipart/byteranges; boundary=",response);
|
assertResponseContains("Content-Type: multipart/byteranges; boundary=", response);
|
||||||
assertResponseContains("Content-Range: bytes 0-9/80",response);
|
assertResponseContains("Content-Range: bytes 0-9/80", response);
|
||||||
assertResponseContains("Content-Range: bytes 20-29/80",response);
|
assertResponseContains("Content-Range: bytes 20-29/80", response);
|
||||||
assertResponseContains("Content-Range: bytes 70-79/80",response);
|
assertResponseContains("Content-Range: bytes 70-79/80", response);
|
||||||
assertResponseContains("Content-Length: "+body.length(),response);
|
assertResponseContains("Content-Length: " + body.length(), response);
|
||||||
assertTrue(body.endsWith(boundary+"--\r\n"));
|
assertTrue(body.endsWith(boundary + "--\r\n"));
|
||||||
|
|
||||||
response= connector.getResponses(
|
response = connector.getResponses(
|
||||||
"GET /context/data.txt HTTP/1.1\r\n"+
|
"GET /context/data.txt HTTP/1.1\r\n" +
|
||||||
"Host: localhost\r\n"+
|
"Host: localhost\r\n" +
|
||||||
"Range: bytes=0-9,20-29,40-49,60-60,70-79\r\n"+
|
"Range: bytes=0-9,20-29,40-49,60-60,70-79\r\n" +
|
||||||
"\r\n");
|
"\r\n");
|
||||||
start = response.indexOf("--jetty");
|
start = response.indexOf("--jetty");
|
||||||
body=response.substring(start);
|
body = response.substring(start);
|
||||||
boundary = body.substring(0,body.indexOf("\r\n"));
|
boundary = body.substring(0, body.indexOf("\r\n"));
|
||||||
assertResponseContains("206 Partial",response);
|
assertResponseContains("206 Partial", response);
|
||||||
assertResponseContains("Content-Type: multipart/byteranges; boundary=",response);
|
assertResponseContains("Content-Type: multipart/byteranges; boundary=", response);
|
||||||
assertResponseContains("Content-Range: bytes 0-9/80",response);
|
assertResponseContains("Content-Range: bytes 0-9/80", response);
|
||||||
assertResponseContains("Content-Range: bytes 20-29/80",response);
|
assertResponseContains("Content-Range: bytes 20-29/80", response);
|
||||||
assertResponseContains("Content-Range: bytes 60-60/80",response);
|
assertResponseContains("Content-Range: bytes 60-60/80", response);
|
||||||
assertResponseContains("Content-Range: bytes 70-79/80",response);
|
assertResponseContains("Content-Range: bytes 70-79/80", response);
|
||||||
assertResponseContains("Content-Length: "+body.length(),response);
|
assertResponseContains("Content-Length: " + body.length(), response);
|
||||||
assertTrue(body.endsWith(boundary+"--\r\n"));
|
assertTrue(body.endsWith(boundary + "--\r\n"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
@ -520,31 +521,31 @@ public class DefaultServletTest
|
||||||
|
|
||||||
String resBasePath = resBase.getAbsolutePath();
|
String resBasePath = resBase.getAbsolutePath();
|
||||||
|
|
||||||
ServletHolder defholder = context.addServlet(DefaultServlet.class,"/");
|
ServletHolder defholder = context.addServlet(DefaultServlet.class, "/");
|
||||||
defholder.setInitParameter("dirAllowed","false");
|
defholder.setInitParameter("dirAllowed", "false");
|
||||||
defholder.setInitParameter("redirectWelcome","false");
|
defholder.setInitParameter("redirectWelcome", "false");
|
||||||
defholder.setInitParameter("welcomeServlets","false");
|
defholder.setInitParameter("welcomeServlets", "false");
|
||||||
defholder.setInitParameter("gzip","false");
|
defholder.setInitParameter("gzip", "false");
|
||||||
defholder.setInitParameter("resourceBase",resBasePath);
|
defholder.setInitParameter("resourceBase", resBasePath);
|
||||||
|
|
||||||
String response = connector.getResponses("GET /context/data0.txt HTTP/1.1\r\nHost:localhost:8080\r\n\r\n");
|
String response = connector.getResponses("GET /context/data0.txt HTTP/1.1\r\nHost:localhost:8080\r\n\r\n");
|
||||||
assertResponseContains("Content-Length: 12",response);
|
assertResponseContains("Content-Length: 12", response);
|
||||||
assertResponseNotContains("Extra Info",response);
|
assertResponseNotContains("Extra Info", response);
|
||||||
|
|
||||||
context.addFilter(OutputFilter.class,"/*",0);
|
context.addFilter(OutputFilter.class, "/*", 0);
|
||||||
response = connector.getResponses("GET /context/data0.txt HTTP/1.1\r\nHost:localhost:8080\r\n\r\n");
|
response = connector.getResponses("GET /context/data0.txt HTTP/1.1\r\nHost:localhost:8080\r\n\r\n");
|
||||||
assertResponseContains("Content-Length: 2",response); // 20 something long
|
assertResponseContains("Content-Length: 2", response); // 20 something long
|
||||||
assertResponseContains("Extra Info",response);
|
assertResponseContains("Extra Info", response);
|
||||||
assertResponseNotContains("Content-Length: 12",response);
|
assertResponseNotContains("Content-Length: 12", response);
|
||||||
|
|
||||||
context.getServletHandler().setFilterMappings(new FilterMapping[]{});
|
context.getServletHandler().setFilterMappings(new FilterMapping[]{});
|
||||||
context.getServletHandler().setFilters(new FilterHolder[]{});
|
context.getServletHandler().setFilters(new FilterHolder[]{});
|
||||||
|
|
||||||
context.addFilter(WriterFilter.class,"/*",0);
|
context.addFilter(WriterFilter.class, "/*", 0);
|
||||||
response = connector.getResponses("GET /context/data0.txt HTTP/1.1\r\nHost:localhost:8080\r\n\r\n");
|
response = connector.getResponses("GET /context/data0.txt HTTP/1.1\r\nHost:localhost:8080\r\n\r\n");
|
||||||
assertResponseContains("Content-Length: 2",response); // 20 something long
|
assertResponseContains("Content-Length: 2", response); // 20 something long
|
||||||
assertResponseContains("Extra Info",response);
|
assertResponseContains("Extra Info", response);
|
||||||
assertResponseNotContains("Content-Length: 12",response);
|
assertResponseNotContains("Content-Length: 12", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class OutputFilter implements Filter
|
public static class OutputFilter implements Filter
|
||||||
|
|
@ -556,7 +557,7 @@ public class DefaultServletTest
|
||||||
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
|
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
|
||||||
{
|
{
|
||||||
response.getOutputStream().println("Extra Info");
|
response.getOutputStream().println("Extra Info");
|
||||||
chain.doFilter(request,response);
|
chain.doFilter(request, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void destroy()
|
public void destroy()
|
||||||
|
|
@ -573,7 +574,7 @@ public class DefaultServletTest
|
||||||
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
|
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
|
||||||
{
|
{
|
||||||
response.getWriter().println("Extra Info");
|
response.getWriter().println("Extra Info");
|
||||||
chain.doFilter(request,response);
|
chain.doFilter(request, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void destroy()
|
public void destroy()
|
||||||
|
|
@ -584,11 +585,14 @@ public class DefaultServletTest
|
||||||
private void createFile(File file, String str) throws IOException
|
private void createFile(File file, String str) throws IOException
|
||||||
{
|
{
|
||||||
FileOutputStream out = null;
|
FileOutputStream out = null;
|
||||||
try {
|
try
|
||||||
|
{
|
||||||
out = new FileOutputStream(file);
|
out = new FileOutputStream(file);
|
||||||
out.write(str.getBytes(StringUtil.__UTF8));
|
out.write(str.getBytes(StringUtil.__UTF8));
|
||||||
out.flush();
|
out.flush();
|
||||||
} finally {
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
IO.close(out);
|
IO.close(out);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -624,15 +628,26 @@ public class DefaultServletTest
|
||||||
return idx;
|
return idx;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void deleteFile(File file) throws IOException {
|
private void deleteFile(File file) throws IOException
|
||||||
if(OS.IS_WINDOWS) {
|
{
|
||||||
// Since Windows doesn't seem to like to delete content that was recently created.
|
if (OS.IS_WINDOWS)
|
||||||
File deleted = MavenTestingUtils.getTargetFile(".deleted");
|
{
|
||||||
FS.ensureDirExists(deleted);
|
// Windows doesn't seem to like to delete content that was recently created
|
||||||
File dest = File.createTempFile(file.getName(), "deleted", deleted);
|
// Attempt a delete and if it fails, attempt a rename
|
||||||
Assert.assertTrue("Unable to move file out of the way: " + file.getName(), file.renameTo(dest));
|
boolean deleted = file.delete();
|
||||||
} else {
|
if (!deleted)
|
||||||
Assert.assertTrue("Deleting: " + file.getName(), file.delete());
|
{
|
||||||
}
|
File deletedDir = MavenTestingUtils.getTargetFile(".deleted");
|
||||||
|
FS.ensureDirExists(deletedDir);
|
||||||
|
File dest = File.createTempFile(file.getName(), "deleted", deletedDir);
|
||||||
|
boolean renamed = file.renameTo(dest);
|
||||||
|
if (!renamed)
|
||||||
|
System.err.println("WARNING: unable to move file out of the way: " + file.getName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Assert.assertTrue("Deleting: " + file.getName(), file.delete());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue