opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.10'

Browse Source 
* stable-2.10:
  Fix login redirect for non default (root) context

Conflicts:
	gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java

Change-Id: I5b6479eeaaca467b68c568e7bd372e61198e2165
This commit is contained in:
David Pursehouse
2014-11-06 11:42:14 +09:00
parent 7d9adda1d8 449eb895c5
commit fa10acc725
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
View File

@@ -344,14 +344,7 @@ public class Gerrit implements EntryPoint {
token = token.substring(1);
}
UrlBuilder builder = new UrlBuilder();
builder.setProtocol(Location.getProtocol());
builder.setHost(Location.getHost());
String port = Location.getPort();
if (port != null && !port.isEmpty()) {
builder.setPort(Integer.parseInt(port));
}
return builder.buildString() + ("/login/" + URL.encodePathSegment("#/" + token));
return selfRedirect("login/") + URL.encodePathSegment("#/" + token);
}
public static String selfRedirect(String suffix) {

7
gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java
View File

@@ -16,8 +16,6 @@ package com.google.gerrit.httpd.auth.become;
import static com.google.gerrit.reviewdb.client.AccountExternalId.SCHEME_USERNAME;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.extensions.registration.DynamicItem;
import com.google.gerrit.httpd.HtmlDomUtil;
@@ -120,9 +118,8 @@ class BecomeAnyAccountLoginServlet extends HttpServlet {
if (res != null) {
webSession.get().login(res, false);
final StringBuilder rdr = new StringBuilder();
rdr.append(MoreObjects.firstNonNull(
Strings.emptyToNull(req.getContextPath()),
"/"));
rdr.append(req.getContextPath());
rdr.append("/");
if (IS_DEV && req.getParameter("gwt.codesvr") != null) {
if (rdr.indexOf("?") < 0) {
rdr.append("?");

9
gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java
View File

@@ -409,8 +409,13 @@ class GitWebServlet extends HttpServlet {
}
private static String getLoginRedirectUrl(HttpServletRequest req) {
String loginUrl = req.getContextPath() + "/login/";
String token = req.getRequestURI().substring(1);
String contextPath = req.getContextPath();
String loginUrl = contextPath + "/login/";
String token = req.getRequestURI();
if (!contextPath.isEmpty()) {
token = token.substring(contextPath.length());
}
String queryString = req.getQueryString();
if (queryString != null && !queryString.isEmpty()) {
token = token.concat("?" + queryString);