diff options
| author | James Moger <james.moger@gitblit.com> | 2014-12-03 14:21:33 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-12-03 14:21:33 -0600 |
| commit | b9b8932e390d26ef3ad0b5c67e0b1200c50874f7 (patch) | |
| tree | 7b156631a09cdecaa0447aed1e4c1f9bcca2bbe8 /src | |
| parent | 713f30551c3b5b2d99a023d48a930475e1002c21 (diff) | |
| parent | fbc7a7dd5fa61486610cf11c09e0007f2900a3e1 (diff) | |
| download | gitblit-b9b8932e390d26ef3ad0b5c67e0b1200c50874f7.tar.gz gitblit-b9b8932e390d26ef3ad0b5c67e0b1200c50874f7.zip | |
Merged #228 "Add support for configurable HTTP proxy host/port in PluginManager.java"
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/distrib/data/defaults.properties | 15 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/manager/PluginManager.java | 13 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties index 056b47ad..ee78c80a 100644 --- a/src/main/distrib/data/defaults.properties +++ b/src/main/distrib/data/defaults.properties @@ -572,6 +572,21 @@ plugins.folder = ${baseFolder}/plugins # SINCE 1.5.0 plugins.registry = http://plugins.gitblit.com/plugins.json +# The HTTP proxy host for plugin manager. +# +# SINCE 1.7.0 +plugins.httpProxyHost = + +# The HTTP proxy port for plugin manager. +# +# 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 diff --git a/src/main/java/com/gitblit/manager/PluginManager.java b/src/main/java/com/gitblit/manager/PluginManager.java index 3e7bc1ff..bc3be52f 100644 --- a/src/main/java/com/gitblit/manager/PluginManager.java +++ b/src/main/java/com/gitblit/manager/PluginManager.java @@ -22,6 +22,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; +import java.net.InetSocketAddress; import java.net.Proxy; import java.net.URL; import java.net.URLConnection; @@ -586,11 +587,19 @@ public class PluginManager implements IPluginManager, PluginStateListener { } protected Proxy getProxy(URL url) { - return java.net.Proxy.NO_PROXY; + 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 { + return java.net.Proxy.NO_PROXY; + } } protected String getProxyAuthorization(URL url) { - return ""; + String proxyAuth = runtimeManager.getSettings().getString(Keys.plugins.httpProxyAuthorization, ""); + return proxyAuth; } /** |