opendev/gerrit
Code Issues Proposed changes

Merge "Implements OpenID domain filtering"

Browse Source
This commit is contained in:
Shawn Pearce
2013-01-15 01:40:33 +00:00
committed by Gerrit Code Review
parent 1756441516 d2ab0cda62
commit c7abbfbbc1
3 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import com.google.inject.Singleton;
import org.eclipse.jgit.lib.Config;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -40,6 +41,7 @@ public class AuthConfig {
private final boolean gitBasicAuth;
private final String logoutUrl;
private final String openIdSsoUrl;
private final List<String> openIdDomains;
private final List<OpenIdProviderPattern> trustedOpenIDs;
private final List<OpenIdProviderPattern> allowedOpenIDs;
private final String cookiePath;
@@ -56,6 +58,7 @@ public class AuthConfig {
httpHeader = cfg.getString("auth", null, "httpheader");
logoutUrl = cfg.getString("auth", null, "logouturl");
openIdSsoUrl = cfg.getString("auth", null, "openidssourl");
openIdDomains = Arrays.asList(cfg.getStringList("auth", null, "openIdDomain"));
trustedOpenIDs = toPatterns(cfg, "trustedOpenID");
allowedOpenIDs = toPatterns(cfg, "allowedOpenID");
cookiePath = cfg.getString("auth", null, "cookiepath");
@@ -127,6 +130,10 @@ public class AuthConfig {
return openIdSsoUrl;
}
public List<String> getOpenIdDomains() {
return openIdDomains;
}
public String getCookiePath() {
return cookiePath;
}