opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  LuceneVersionManager: Fix log error messages
  Increase template test size for polygerrit
  Fixing registration redirect for new OpenID users
  Add config to disable private changes

Change-Id: If9af0e22d3059fc9d71619c429baa570df7f45ff
This commit is contained in:
David Pursehouse
2018-02-09 10:31:32 +09:00
parent b2f59952e6 ff0851edd3
commit 10b330bc50
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java
View File

@@ -487,10 +487,15 @@ class OpenIdServiceImpl {
final StringBuilder rdr = new StringBuilder(); final StringBuilder rdr = new StringBuilder();
rdr.append(urlProvider.get(req)); rdr.append(urlProvider.get(req));
String nextToken = Url.decode(token);
if (isNew && !token.startsWith(PageLinks.REGISTER + "/")) { if (isNew && !token.startsWith(PageLinks.REGISTER + "/")) {
rdr.append('#' + PageLinks.REGISTER); rdr.append('#' + PageLinks.REGISTER);
if (nextToken.startsWith("#")) {
// Need to strip the leading # off the token to fix registration page redirect
nextToken = nextToken.substring(1);
} }
rdr.append(Url.decode(token)); }
rdr.append(nextToken);
rsp.sendRedirect(rdr.toString()); rsp.sendRedirect(rdr.toString());
} }

2
java/com/google/gerrit/lucene/LuceneVersionManager.java
View File

@@ -78,7 +78,7 @@ public class LuceneVersionManager extends VersionManager {
Path p = getDir(sitePaths, def.getName(), schema); Path p = getDir(sitePaths, def.getName(), schema);
boolean isDir = Files.isDirectory(p); boolean isDir = Files.isDirectory(p);
if (Files.exists(p) && !isDir) { if (Files.exists(p) && !isDir) {
log.warn("Not a directory: %s", p.toAbsolutePath()); log.warn("Not a directory: {}", p.toAbsolutePath());
} }
int v = schema.getVersion(); int v = schema.getVersion();
versions.put(v, new Version<>(schema, v, isDir, cfg.getReady(def.getName(), v))); versions.put(v, new Version<>(schema, v, isDir, cfg.getReady(def.getName(), v)));