Defaultrefererfix

vraptor-core/src/main/java/br/com/caelum/vraptor/view/DefaultRefererResult.java

@@ -21,6 +21,8 @@
 import static br.com.caelum.vraptor.view.Results.page;
 import static com.google.common.base.Preconditions.checkState;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 
 import javax.enterprise.context.RequestScoped;
@@ -91,12 +93,22 @@ public void redirect() throws IllegalStateException {
 		}
 	}
 
-	private String getReferer() {
+	protected String getReferer() {
 		String referer = request.getHeader("Referer");
 		checkState(referer != null, "The Referer header was not specified");
 
-		String path = request.getContextPath();
-		return referer.substring(referer.indexOf(path) + path.length());
+		String refererPath = null;
+		try {
+			refererPath = new URL(referer).getPath();
+		} catch(MalformedURLException e) {
+			//Maybe a relative path?
+			refererPath = referer;
+		}
+		String ctxPath = request.getContextPath();
+
+		//if the context path is not in the beggining we should return the entire path
+		//this is useful for proxied app servers which hide the ctx path from url
+		return refererPath.startsWith(ctxPath) ? refererPath.substring(ctxPath.length()) : refererPath;
 	}
 
 }

vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultRefererResultTest.java

@@ -17,6 +17,7 @@
 
 import static br.com.caelum.vraptor.view.Results.logic;
 import static br.com.caelum.vraptor.view.Results.page;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -150,4 +151,24 @@ public void whenRefererMatchesAControllerShouldForwardToIt() throws Exception {
 		verify(logic).forwardTo(RefererController.class);
 		verify(controller).index();
 	}
+
+	@Test
+	public void getRefererShouldReturnCorrectValue() throws Exception {
+		when(request.getHeader("Referer")).thenReturn("http://vraptor.caelum.com.br/test/anything/ok"); //Regular case
+		when(request.getContextPath()).thenReturn("/test");
+		assertEquals("/anything/ok", refererResult.getReferer());
+
+		when(request.getHeader("Referer")).thenReturn("http://vraptor.caelum.com.br/anything/ok/test"); //URL without context path (it appears in the path but not in in the right place)
+		when(request.getContextPath()).thenReturn("/test");
+		assertEquals("/anything/ok/test", refererResult.getReferer());
+
+		when(request.getHeader("Referer")).thenReturn("http://vraptor.caelum.com.br/vrap/anything/ok"); //URL host starts with ctx path string (/vrap)
+		when(request.getContextPath()).thenReturn("/vrap");
+		assertEquals("/anything/ok", refererResult.getReferer());
+
+		when(request.getHeader("Referer")).thenReturn("/vrap/anything/ok/vrap"); //relative path in the referer (not common but predicted by http spec)
+		when(request.getContextPath()).thenReturn("/vrap");
+		assertEquals("/anything/ok/vrap", refererResult.getReferer());
+	}
+
 }