opendev/gerrit
Code Issues Proposed changes

Merge "Allow admins to configure URL aliases"

Browse Source
This commit is contained in:
Edwin Kempin
2015-08-05 07:35:03 +00:00
committed by Gerrit Code Review
parent eba4bbf5db fa0d494d11
commit 74e21ae5ac
8 changed files with 140 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
View File

@@ -47,6 +47,10 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
public class GetServerInfo implements RestReadView<ConfigResource> {
private final static String URL_ALIAS = "urlAlias";
private final static String KEY_MATCH = "match";
private final static String KEY_TOKEN = "token";
private final Config config;
private final AuthConfig authConfig;
private final Realm realm;
@@ -102,6 +106,10 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
info.plugin = getPluginInfo();
info.sshd = getSshdInfo(config);
info.suggest = getSuggestInfo(config);
Map<String, String> urlAliases = getUrlAliasesInfo(config);
info.urlAliases = !urlAliases.isEmpty() ? urlAliases : null;
info.user = getUserInfo(anonymousCowardName);
info.receive = getReceiveInfo(config);
return info;
@@ -267,6 +275,15 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
return info;
}
private Map<String, String> getUrlAliasesInfo(Config cfg) {
Map<String, String> urlAliases = new HashMap<>();
for (String subsection : cfg.getSubsections(URL_ALIAS)) {
urlAliases.put(cfg.getString(URL_ALIAS, subsection, KEY_MATCH),
cfg.getString(URL_ALIAS, subsection, KEY_TOKEN));
}
return urlAliases;
}
private SshdInfo getSshdInfo(Config cfg) {
String[] addr = cfg.getStringList("sshd", null, "listenAddress");
if (addr.length == 1 && isOff(addr[0])) {
@@ -313,6 +330,7 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
public PluginConfigInfo plugin;
public SshdInfo sshd;
public SuggestInfo suggest;
public Map<String, String> urlAliases;
public UserConfigInfo user;
public ReceiveInfo receive;
}