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

Transports: Check for Java proxy settings that could interfere

Browse Source
This commit is contained in:
zzz
2020-05-27 12:07:50 +00:00
parent 4574ebd8a9
commit f8df7eba7f
1 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
router/java/src/net/i2p/router/transport/TransportManager.java
View File

@ -12,7 +12,11 @@ import java.io.IOException;
import java.io.Writer; import java.io.Writer;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.Inet6Address; import java.net.Inet6Address;
import java.net.Proxy;
import java.net.ProxySelector;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -81,6 +85,10 @@ public class TransportManager implements TransportEventListener {
public final static String PROP_ENABLE_NTCP = "i2np.ntcp.enable"; public final static String PROP_ENABLE_NTCP = "i2np.ntcp.enable";
/** default true */ /** default true */
public final static String PROP_ENABLE_UPNP = "i2np.upnp.enable"; public final static String PROP_ENABLE_UPNP = "i2np.upnp.enable";
private static final String PROP_JAVA_PROXY1 = "socksProxyHost";
private static final String PROP_JAVA_PROXY2 = "java.net.useSystemProxies";
private static final String PROP_JAVA_PROXY3 = "http.proxyHost";
private static final String PROP_JAVA_PROXY4 = "https.proxyHost";
/** default true */ /** default true */
private static final String PROP_NTCP1_ENABLE = "i2np.ntcp1.enable"; private static final String PROP_NTCP1_ENABLE = "i2np.ntcp1.enable";
@ -105,10 +113,10 @@ public class TransportManager implements TransportEventListener {
_context.statManager().createRateStat("transport.bidFailAllTransports", "Could not attempt to bid on message, as all of the transports had failed", "Transport", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); _context.statManager().createRateStat("transport.bidFailAllTransports", "Could not attempt to bid on message, as all of the transports had failed", "Transport", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
_transports = new ConcurrentHashMap<String, Transport>(2); _transports = new ConcurrentHashMap<String, Transport>(2);
_pluggableTransports = new HashMap<String, Transport>(2); _pluggableTransports = new HashMap<String, Transport>(2);
if (_context.getBooleanPropertyDefaultTrue(PROP_ENABLE_UPNP))
_upnpManager = new UPnPManager(context, this); boolean isProxied = isProxied();
else boolean enableUPnP = !isProxied && _context.getBooleanPropertyDefaultTrue(PROP_ENABLE_UPNP);
_upnpManager = null; _upnpManager = enableUPnP ? new UPnPManager(context, this) : null;
_enableUDP = _context.getBooleanPropertyDefaultTrue(PROP_ENABLE_UDP); _enableUDP = _context.getBooleanPropertyDefaultTrue(PROP_ENABLE_UDP);
_enableNTCP1 = isNTCPEnabled(context) && _enableNTCP1 = isNTCPEnabled(context) &&
context.getProperty(PROP_NTCP1_ENABLE, DEFAULT_NTCP1_ENABLE); context.getProperty(PROP_NTCP1_ENABLE, DEFAULT_NTCP1_ENABLE);
@ -119,6 +127,60 @@ public class TransportManager implements TransportEventListener {
_xdhThread = new X25519KeyFactory(context); _xdhThread = new X25519KeyFactory(context);
} }
/**
* Detect system settings and log warnings.
* ref: https://docs.oracle.com/javase/8/docs/api/java/net/doc-files/net-properties.html
*
* @since 0.9.47
*/
private boolean isProxied() {
boolean rv = false;
// These two affect all standard Sockets (but NOT NIO)
String proxy = System.getProperty(PROP_JAVA_PROXY1);
if (proxy != null && proxy.length() > 0) {
String msg = "UPnP disabled by system property " + PROP_JAVA_PROXY1 + '=' + proxy +
"\nI2P connections will not be proxied." +
"\nReseeding will be proxied.";
System.out.println(msg);
_log.logAlways(Log.WARN, msg);
rv = true;
} else if (!SystemVersion.isMac() && Boolean.valueOf(System.getProperty(PROP_JAVA_PROXY2))) {
try {
// Use ProxySelector to see if we would be proxied
// using a dummy address.
// This does not actually connect out.
ProxySelector ps = ProxySelector.getDefault();
List<Proxy> p = ps.select(new URI("socket://192.168.1.1:1234"));
if (p.get(0).type() != Proxy.Type.DIRECT) {
String msg = "UPnP disabled by system property " + PROP_JAVA_PROXY2 + "=true" +
"\nI2P connections will not be proxied." +
"\nReseeding will be proxied.";
System.out.println(msg);
_log.logAlways(Log.WARN, msg);
rv = true;
} else {
String msg = "System property " + PROP_JAVA_PROXY2 + "=true but no system proxy is enabled";
System.out.println(msg);
_log.logAlways(Log.WARN, msg);
}
} catch (URISyntaxException use) {}
}
// These only apply to Http/HttpsURLConnection
proxy = System.getProperty(PROP_JAVA_PROXY3);
if (proxy != null && proxy.length() > 0) {
String msg = "Ignoring proxy setting " + PROP_JAVA_PROXY3 + '=' + proxy;
System.out.println(msg);
_log.logAlways(Log.WARN, msg);
}
proxy = System.getProperty(PROP_JAVA_PROXY4);
if (proxy != null && proxy.length() > 0) {
String msg = "Ignoring proxy setting " + PROP_JAVA_PROXY4 + '=' + proxy;
System.out.println(msg);
_log.logAlways(Log.WARN, msg);
}
return rv;
}
/** /**
* Pluggable transports. Not for NTCP or SSU. * Pluggable transports. Not for NTCP or SSU.
* *