Use a custom redirect mechanism to workaround servlet container interference

This mechanism bypasses the standard Wicket redirect mechanism because it
turns out that the servlet container reencodes Wicket's relative redirect urls.
This results in another way that parameters with forward-slashes can be borked.

Bad, bad servlet container.

org.eclipse.jetty.server.Response#L447: String path=uri.getDecodedPath();

diff --git a/src/com/gitblit/wicket/GitblitRedirectException.java b/src/com/gitblit/wicket/GitblitRedirectException.java
new file mode 100644 (file)
index 0000000..c3df1ac
--- /dev/null
+++ b/src/com/gitblit/wicket/GitblitRedirectException.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2012 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.wicket;
+
+import org.apache.wicket.AbstractRestartResponseException;
+import org.apache.wicket.Page;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.RequestCycle;
+import org.apache.wicket.protocol.http.RequestUtils;
+import org.apache.wicket.request.target.basic.RedirectRequestTarget;
+
+/**
+ * This exception bypasses the servlet container rewriting relative redirect
+ * urls.  The container can and does decode the carefully crafted %2F path
+ * separators on a redirect.  :(  Bad, bad servlet container.
+ * 
+ * org.eclipse.jetty.server.Response#L447: String path=uri.getDecodedPath();
+ * 
+ * @author James Moger
+ */
+public class GitblitRedirectException extends AbstractRestartResponseException {
+
+       private static final long serialVersionUID = 1L;
+
+       public <C extends Page> GitblitRedirectException(Class<C> pageClass) {
+               this(pageClass, null);
+       }
+
+       public <C extends Page> GitblitRedirectException(Class<C> pageClass, PageParameters params) {
+               RequestCycle cycle = RequestCycle.get();
+               String relativeUrl = cycle.urlFor(pageClass, params).toString();
+               String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl);
+               cycle.setRequestTarget(new RedirectRequestTarget(absoluteUrl));
+               cycle.setRedirect(true);
+       }
+}

diff --git a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
index e21d6162b66509b3becb3618b9d5bc540fd4e9f4..ad74af8cde6609e7fb936578c4e8299022df8c6c 100644 (file)
--- a/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EmptyRepositoryPage.java
@@ -20,13 +20,13 @@ import java.util.ArrayList;
 import java.util.List;\r
 \r
 import org.apache.wicket.PageParameters;\r
-import org.apache.wicket.RedirectException;\r
 import org.apache.wicket.markup.html.basic.Label;\r
 \r
 import com.gitblit.GitBlit;\r
 import com.gitblit.Keys;\r
 import com.gitblit.models.RepositoryModel;\r
 import com.gitblit.utils.ArrayUtils;\r
+import com.gitblit.wicket.GitblitRedirectException;\r
 import com.gitblit.wicket.WicketUtils;\r
 import com.gitblit.wicket.panels.RepositoryUrlPanel;\r
 \r
@@ -35,12 +35,14 @@ public class EmptyRepositoryPage extends RootPage {
        public EmptyRepositoryPage(PageParameters params) {\r
                super(params);\r
 \r
+               setVersioned(false);\r
+\r
                String repositoryName = WicketUtils.getRepositoryName(params);\r
                RepositoryModel repository = GitBlit.self().getRepositoryModel(repositoryName);\r
                \r
                if (repository.hasCommits) {\r
                        // redirect to the summary page if this repository is not empty\r
-                       throw new RedirectException(SummaryPage.class, params);\r
+                       throw new GitblitRedirectException(SummaryPage.class, params);\r
                }\r
                \r
                setupPage(repositoryName, getString("gb.emptyRepository"));\r

diff --git a/src/com/gitblit/wicket/pages/ProjectPage.java b/src/com/gitblit/wicket/pages/ProjectPage.java
index 3679a6f19fa078a3c526d3d9e48293a375a26eb9..bc546dfc38a64510563b87844d3adf4401ac3238 100644 (file)
--- a/src/com/gitblit/wicket/pages/ProjectPage.java
+++ b/src/com/gitblit/wicket/pages/ProjectPage.java
@@ -31,7 +31,6 @@ import java.util.Set;
 \r
 import org.apache.wicket.Component;\r
 import org.apache.wicket.PageParameters;\r
-import org.apache.wicket.RedirectException;\r
 import org.apache.wicket.behavior.HeaderContributor;\r
 import org.apache.wicket.markup.html.basic.Label;\r
 import org.apache.wicket.markup.html.link.ExternalLink;\r
@@ -53,6 +52,7 @@ import com.gitblit.utils.MarkdownUtils;
 import com.gitblit.utils.StringUtils;\r
 import com.gitblit.wicket.GitBlitWebApp;\r
 import com.gitblit.wicket.GitBlitWebSession;\r
+import com.gitblit.wicket.GitblitRedirectException;\r
 import com.gitblit.wicket.PageRegistration;\r
 import com.gitblit.wicket.PageRegistration.DropDownMenuItem;\r
 import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;\r
@@ -70,7 +70,7 @@ public class ProjectPage extends RootPage {
 \r
        public ProjectPage() {\r
                super();\r
-               throw new RedirectException(GitBlitWebApp.get().getHomePage());\r
+               throw new GitblitRedirectException(GitBlitWebApp.get().getHomePage());\r
        }\r
 \r
        public ProjectPage(PageParameters params) {\r
@@ -94,12 +94,12 @@ public class ProjectPage extends RootPage {
 \r
                String projectName = WicketUtils.getProjectName(params);\r
                if (StringUtils.isEmpty(projectName)) {\r
-                       throw new RedirectException(GitBlitWebApp.get().getHomePage());\r
+                       throw new GitblitRedirectException(GitBlitWebApp.get().getHomePage());\r
                }\r
                \r
                ProjectModel project = getProjectModel(projectName);\r
                if (project == null) {\r
-                       throw new RedirectException(GitBlitWebApp.get().getHomePage());\r
+                       throw new GitblitRedirectException(GitBlitWebApp.get().getHomePage());\r
                }\r
                \r
                add(new Label("projectTitle", project.getDisplayName()));\r

diff --git a/src/com/gitblit/wicket/pages/UserPage.java b/src/com/gitblit/wicket/pages/UserPage.java
index e36614626326797ce0c40ae770a8b3f517a46dbf..28450e94948433100e86c76c96db26598262ea59 100644 (file)
--- a/src/com/gitblit/wicket/pages/UserPage.java
+++ b/src/com/gitblit/wicket/pages/UserPage.java
@@ -21,7 +21,6 @@ import java.util.Comparator;
 import java.util.List;\r
 \r
 import org.apache.wicket.PageParameters;\r
-import org.apache.wicket.RedirectException;\r
 import org.apache.wicket.markup.html.basic.Label;\r
 import org.apache.wicket.markup.repeater.Item;\r
 import org.apache.wicket.markup.repeater.data.DataView;\r
@@ -36,6 +35,7 @@ import com.gitblit.models.UserModel;
 import com.gitblit.utils.StringUtils;\r
 import com.gitblit.wicket.GitBlitWebApp;\r
 import com.gitblit.wicket.GitBlitWebSession;\r
+import com.gitblit.wicket.GitblitRedirectException;\r
 import com.gitblit.wicket.PageRegistration;\r
 import com.gitblit.wicket.PageRegistration.DropDownMenuItem;\r
 import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;\r
@@ -50,7 +50,7 @@ public class UserPage extends RootPage {
 \r
        public UserPage() {\r
                super();\r
-               throw new RedirectException(GitBlitWebApp.get().getHomePage());\r
+               throw new GitblitRedirectException(GitBlitWebApp.get().getHomePage());\r
        }\r
 \r
        public UserPage(PageParameters params) {\r
@@ -74,7 +74,7 @@ public class UserPage extends RootPage {
 \r
                String userName = WicketUtils.getUsername(params);\r
                if (StringUtils.isEmpty(userName)) {\r
-                       throw new RedirectException(GitBlitWebApp.get().getHomePage());\r
+                       throw new GitblitRedirectException(GitBlitWebApp.get().getHomePage());\r
                }\r
 \r
                UserModel user = GitBlit.self().getUserModel(userName);\r