Merge pull request #133 from cip4/jakarta2

Jakarta2 - better resource fowarding

Author: rainer-prosi

src/main/java/org/cip4/jdfutility/server/JettyServer.java

@@ -305,6 +305,7 @@ public void runServer() throws Exception
 		final Sequence handlers = createHandlerList();
 		final Sequence handlerbase = createBaseCollection(handlers);
 		server.setHandler(handlerbase);
+		server.setDefaultHandler(new RedirectHandler());
 		server.start();
 		log.info("completed starting new server: " + toString());
 	}

src/main/java/org/cip4/jdfutility/server/MyResourceHandler.java

@@ -61,7 +61,7 @@ public class MyResourceHandler extends ResourceHandler
 	public MyResourceHandler(final String strip, final String home)
 	{
 		super();
-		this.strip = StringUtil.getNonEmpty(strip);
+		this.strip = strip == null ? null : StringUtil.token(StringUtil.getNonEmpty(strip.toLowerCase()), 0, "/");
 		this.home = home;
 		whiteList = new HashSet<>();
 	}
@@ -70,19 +70,23 @@ public MyResourceHandler(final String strip, final String home)
 
 	String update(String url)
 	{
-
-		if (strip != null && url.startsWith(strip) && (url.length() == strip.length() || url.charAt(strip.length()) == '/'))
+		final String urlLow = url.toLowerCase();
+		int pos = StringUtil.posOfToken(urlLow, strip, "/", 0);
+		if (pos >= 0)
 		{
-			url = StringUtil.removeToken(url, 0, "/");
+			pos = urlLow.indexOf(strip);
+			url = url.substring(0, pos) + url.substring(pos + StringUtil.length(strip) + 1);
 		}
+
 		if ("".equals(url) || "/".equals(url))
 		{
 			return home;
 		}
 		else if (!whiteList.isEmpty())
 		{
 			final String base = StringUtil.token(url, 0, "/");
-			if (!whiteList.contains(base.toLowerCase()))
+			final String base2 = StringUtil.token(url, 2, "/"); // http://host:port/root
+			if (!whiteList.contains(base.toLowerCase()) && (base2 == null || !whiteList.contains(base2.toLowerCase())))
 			{
 				return null;
 			}
@@ -110,6 +114,9 @@ public String toString()
 	@Override
 	public boolean handle(final Request request, final Response response, final Callback callback) throws Exception
 	{
+		final String context = request.getContext().getContextPath();
+		if (StringUtil.isEmpty(context))
+			return false;
 		final HttpURI uri = request.getHttpURI();
 		final String uriString = update(uri.asString());
 		if (uriString == null)

src/test/java/org/cip4/jdfutility/server/JettyServerTest.java

@@ -170,7 +170,10 @@ public void testResHandler() throws InterruptedException
 	{
 		final MyResourceHandler rh = new MyResourceHandler("foo", "dummy");
 		assertEquals("nix", rh.update("nix"));
+		assertEquals("nix", rh.update("foo/nix"));
+		assertEquals("http://localhost/bar/nix", rh.update("http://localhost/bar/foo/nix"));
 		assertEquals("dummy", rh.update(""));
+		assertEquals("dummy", rh.update("/"));
 	}
 
 	@Test
@@ -181,6 +184,9 @@ public void testResHandlerWL() throws InterruptedException
 		assertEquals(null, rh.update("foo/nix"));
 		assertEquals("boo", rh.update("foo/boo"));
 		assertEquals("boo", rh.update("boo"));
+		assertEquals("http://localhost/boo/nix", rh.update("http://localhost/foo/boo/nix"));
+		assertEquals("http://localhost/BOO/nix", rh.update("http://localhost/foo/BOO/nix"));
+		assertEquals("http://localhost/BOO/nix", rh.update("http://localhost/FOO/BOO/nix"));
 	}
 
 	@Test