From f8df7eba7ffa9a28266ebc36d2a7689dc03c5bbf Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 27 May 2020 12:07:50 +0000
Subject: [PATCH] Transports: Check for Java proxy settings that could
interfere
---
.../router/transport/TransportManager.java | 70 +++++++++++++++++--
1 file changed, 66 insertions(+), 4 deletions(-)
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index 9a23cab232..6eb2a9f40e 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -12,7 +12,11 @@ import java.io.IOException;
import java.io.Writer;
import java.net.InetAddress;
import java.net.Inet6Address;
+import java.net.Proxy;
+import java.net.ProxySelector;
import java.net.UnknownHostException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -81,6 +85,10 @@ public class TransportManager implements TransportEventListener {
public final static String PROP_ENABLE_NTCP = "i2np.ntcp.enable";
/** default true */
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 */
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 });
_transports = new ConcurrentHashMap<String, Transport>(2);
_pluggableTransports = new HashMap<String, Transport>(2);
- if (_context.getBooleanPropertyDefaultTrue(PROP_ENABLE_UPNP))
- _upnpManager = new UPnPManager(context, this);
- else
- _upnpManager = null;
+
+ boolean isProxied = isProxied();
+ boolean enableUPnP = !isProxied && _context.getBooleanPropertyDefaultTrue(PROP_ENABLE_UPNP);
+ _upnpManager = enableUPnP ? new UPnPManager(context, this) : null;
_enableUDP = _context.getBooleanPropertyDefaultTrue(PROP_ENABLE_UDP);
_enableNTCP1 = isNTCPEnabled(context) &&
context.getProperty(PROP_NTCP1_ENABLE, DEFAULT_NTCP1_ENABLE);
@@ -119,6 +127,60 @@ public class TransportManager implements TransportEventListener {
_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.
*
--
GitLab