commit aaaf45089a56f7be7e952555b10b4b2ca28104db
author Paladox none <thomasmulhall410@yahoo.com> Thu Jul 06 14:30:42 2017 +0000
committer David Pursehouse <dpursehouse@collab.net> Tue Jul 11 10:16:16 2017 +0900
tree d0ae08fc6928320eecca5872d53c94e8fb22f216
parent da7a5ca0e66a8f33c6de1148b527d3276a5d3de1

Fix StringIndexOutOfBoundsException on /register with URL prefix

HttpServletRequest#getPathInfo() raises StringIndexOutOfBoundsException
when the path was not set.

Add a pattern to detect this and don't attempt to call getPathInfo().

Bug: Issue 6205
Change-Id: If21d8cbebbedfc1d1aa1d12aee295d5a55d9da41

gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
index b6719e6..8dfe38c 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
@@ -88,7 +88,8 @@
     serve("/starred").with(query("is:starred"));
 
     serveRegex("^/settings/?$").with(screen(PageLinks.SETTINGS));
-    serveRegex("^/register(/.*)?$").with(registerScreen());
+    serveRegex("^/register$").with(registerScreen(false));
+    serveRegex("^/register/(.+)$").with(registerScreen(true));
     serveRegex("^/([1-9][0-9]*)/?$").with(directChangeById());
     serveRegex("^/p/(.*)$").with(queryProjectNew());
     serveRegex("^/r/(.+)/?$").with(DirectChangeByCommit.class);
@@ -251,7 +252,7 @@
     return srv;
   }
 
-  private Key<HttpServlet> registerScreen() {
+  private Key<HttpServlet> registerScreen(final Boolean slash) {
     return key(
         new HttpServlet() {
           private static final long serialVersionUID = 1L;
@@ -259,7 +260,8 @@
           @Override
           protected void doGet(final HttpServletRequest req, final HttpServletResponse rsp)
               throws IOException {
-            toGerrit("/register" + req.getPathInfo(), req, rsp);
+            String path = String.format("/register%s", slash ? req.getPathInfo() : "");
+            toGerrit(path, req, rsp);
           }
         });
   }