idk/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Reseed: Add SOCKS proxy support (ticket #1130)

Browse Source
This commit is contained in:
zzz
2017-11-17 23:46:45 +00:00
parent d5cc1d83f3
commit 33aac1b125
8 changed files with 172 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 3;
public final static long BUILD = 4;
/** for example "-test" */
public final static String EXTRA = "";

25
router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
View File

@@ -145,6 +145,8 @@ public class Reseeder {
public static final String PROP_SPROXY_USERNAME = "router.reseedSSLProxy.username";
public static final String PROP_SPROXY_PASSWORD = "router.reseedSSLProxy.password";
public static final String PROP_SPROXY_AUTH_ENABLE = "router.reseedSSLProxy.authEnable";
/** @since 0.9.33 */
public static final String PROP_SPROXY_TYPE = "router.reseedSSLProxyType";
/** @since 0.9 */
public static final String PROP_DISABLE = "router.reseedDisable";
@@ -921,10 +923,11 @@ public class Reseeder {
boolean ssl = url.toString().startsWith("https");
if (ssl) {
boolean shouldProxy = _sproxyHost != null && _sproxyHost.length() > 0 && _sproxyPort > 0;
SSLEepGet.ProxyType ptype = getProxyType();
SSLEepGet sslget;
if (_sslState == null) {
if (shouldProxy)
sslget = new SSLEepGet(_context, SSLEepGet.ProxyType.HTTP, _sproxyHost, _sproxyPort,
sslget = new SSLEepGet(_context, ptype, _sproxyHost, _sproxyPort,
baos, url.toString());
else
sslget = new SSLEepGet(_context, baos, url.toString());
@@ -932,7 +935,7 @@ public class Reseeder {
_sslState = sslget.getSSLState();
} else {
if (shouldProxy)
sslget = new SSLEepGet(_context, SSLEepGet.ProxyType.HTTP, _sproxyHost, _sproxyPort,
sslget = new SSLEepGet(_context, ptype, _sproxyHost, _sproxyPort,
baos, url.toString(), _sslState);
else
sslget = new SSLEepGet(_context, baos, url.toString(), _sslState);
@@ -980,10 +983,11 @@ public class Reseeder {
boolean ssl = url.toString().startsWith("https");
if (ssl) {
boolean shouldProxy = _sproxyHost != null && _sproxyHost.length() > 0 && _sproxyPort > 0;
SSLEepGet.ProxyType ptype = getProxyType();
SSLEepGet sslget;
if (_sslState == null) {
if (shouldProxy)
sslget = new SSLEepGet(_context, SSLEepGet.ProxyType.HTTP, _sproxyHost, _sproxyPort,
sslget = new SSLEepGet(_context, ptype, _sproxyHost, _sproxyPort,
out.getPath(), url.toString());
else
sslget = new SSLEepGet(_context, out.getPath(), url.toString());
@@ -991,7 +995,7 @@ public class Reseeder {
_sslState = sslget.getSSLState();
} else {
if (shouldProxy)
sslget = new SSLEepGet(_context, SSLEepGet.ProxyType.HTTP, _sproxyHost, _sproxyPort,
sslget = new SSLEepGet(_context, ptype, _sproxyHost, _sproxyPort,
out.getPath(), url.toString(), _sslState);
else
sslget = new SSLEepGet(_context, out.getPath(), url.toString(), _sslState);
@@ -1060,6 +1064,19 @@ public class Reseeder {
return true;
}
/**
* @throws IOException if unknown, default is HTTP
* @return non-null
* @since 0.9.33
*/
private SSLEepGet.ProxyType getProxyType() throws IOException {
String sptype = _context.getProperty(PROP_SPROXY_TYPE, "HTTP").toUpperCase(Locale.US);
try {
return SSLEepGet.ProxyType.valueOf(sptype);
} catch (IllegalArgumentException iae) {
throw new IOException("Unsupported proxy type " + sptype);
}
}
}
private static final String BUNDLE_NAME = "net.i2p.router.web.messages";