opendev/gerrit
Code Issues Proposed changes

Only enable auth.allowGoogleAccountUpgrade when auth.type = OpenID

Browse Source 
Any other time this setting should always be false.

Change-Id: Ia590a07c8abf786ca204579409e6912c015dc42b
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-08-31 08:29:10 -07:00
parent f40b661e37
commit 2b644e2efa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/google/gerrit/server/config/AuthConfig.java
View File

@@ -61,8 +61,12 @@ public class AuthConfig {
anonymousGroups = Collections.singleton(s.anonymousGroupId); anonymousGroups = Collections.singleton(s.anonymousGroupId);
administratorGroup = s.adminGroupId; administratorGroup = s.adminGroupId;
allowGoogleAccountUpgrade = if (loginType == AuthType.OPENID) {
cfg.getBoolean("auth", "allowgoogleaccountupgrade", false); allowGoogleAccountUpgrade =
cfg.getBoolean("auth", "allowgoogleaccountupgrade", false);
} else {
allowGoogleAccountUpgrade = false;
}
} }
private String[] toTrusted(final Config cfg) { private String[] toTrusted(final Config cfg) {