Преглед на файлове

Add support for specifying the `Proxy-Authorization` header for the PluginManager

tags/v1.7.0
James Moger преди 9 години
родител
ревизия
fbc7a7dd5f
променени са 2 файла, в които са добавени 8 реда и са изтрити 2 реда
  1. 5
    0
      src/main/distrib/data/defaults.properties
  2. 3
    2
      src/main/java/com/gitblit/manager/PluginManager.java

+ 5
- 0
src/main/distrib/data/defaults.properties Целия файл

@@ -582,6 +582,11 @@ plugins.httpProxyHost =
# SINCE 1.7.0
plugins.httpProxyPort =

# The HTTP proxy authorization header for plugin manager.
#
# SINCE 1.7.0
plugins.httpProxyAuthorization =

# Number of threads used to handle miscellaneous tasks in the background.
#
# SINCE 1.6.0

+ 3
- 2
src/main/java/com/gitblit/manager/PluginManager.java Целия файл

@@ -589,7 +589,7 @@ public class PluginManager implements IPluginManager, PluginStateListener {
protected Proxy getProxy(URL url) {
String proxyHost = runtimeManager.getSettings().getString(Keys.plugins.httpProxyHost, "");
String proxyPort = runtimeManager.getSettings().getString(Keys.plugins.httpProxyPort, "");
if (!StringUtils.isEmpty(proxyHost) && !StringUtils.isEmpty(proxyPort)) {
return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, Integer.parseInt(proxyPort)));
} else {
@@ -598,7 +598,8 @@ public class PluginManager implements IPluginManager, PluginStateListener {
}

protected String getProxyAuthorization(URL url) {
return "";
String proxyAuth = runtimeManager.getSettings().getString(Keys.plugins.httpProxyAuthorization, "");
return proxyAuth;
}

/**

Loading…
Отказ
Запис