Changeset 7cb5dab

Timestamp:

Jan 30, 2017 12:33:43 AM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

890ad25

Parents:

1cf6030

Message:

i2ptunnel: Add support for outproxy plugin to CONNECT proxy (tickets #1364, #1895)
Add support for ports to CONNECT proxy

Location:

apps/i2ptunnel/java/src/net/i2p/i2ptunnel

Files:

• I2PTunnelConnectClient.java (modified) (9 diffs)
• I2PTunnelHTTPClient.java (modified) (1 diff)
• I2PTunnelHTTPClientBase.java (modified) (1 diff)
• socks/SOCKSServer.java (modified) (2 diffs)
• ui/GeneralHelper.java (modified) (1 diff)
• ui/TunnelConfig.java (modified) (2 diffs)
• web/IndexBean.java (modified) (1 diff)

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java

@@ -15 +15 @@
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
+import net.i2p.app.ClientApp;
+import net.i2p.app.ClientAppManager;
+import net.i2p.app.Outproxy;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketOptions;
@@ -35 +38 @@
  *   )
  *
- *   (port and protocol are ignored for i2p destinations)
+ *   (protocol is ignored for i2p destinations)
  *   CONNECT host
  *   CONNECT host protocol
@@ -148 +151 @@
         boolean usingWWWProxy = false;
         String currentProxy = null;
+        // local outproxy plugin
+        boolean usingInternalOutproxy = false;
+        Outproxy outproxy = null;
         long requestId = __requestId.incrementAndGet();
         try {
@@ -155 +161 @@
             StringBuilder newRequest = new StringBuilder();
             String authorization = null;
+            int remotePort = 443;
             while (true) {
                 // Use this rather than BufferedReader because we can't have readahead,
@@ -173 +180 @@
 
                     pos = request.indexOf(':');
-                    if (pos == -1)
+                    if (pos == -1) {
                        pos = request.indexOf(' ');
+                    } else {
+                       int spos = request.indexOf(' ');
+                       if (spos > 0) {
+                           try {
+                               remotePort = Integer.parseInt(request.substring(pos + 1, spos));
+                           } catch (NumberFormatException nfe) {
+                               break;
+                           } catch (IndexOutOfBoundsException ioobe) {
+                               break;
+                           }
+                       }
+                    }
                     if (pos == -1) {
                         host = request;
@@ -186 +205 @@
                         // Destination gets the host name
                         destination = host;
-                    } else if (host.indexOf('.') != -1) {
-                        // The request must be forwarded to a outproxy
-                        currentProxy = selectProxy();
-                        if (currentProxy == null) {
-                            if (_log.shouldLog(Log.WARN))
-                                _log.warn(getPrefix(requestId) + "Host wants to be outproxied, but we dont have any!");
-                            writeErrorMessage(ERR_NO_OUTPROXY, out);
-                            s.close();
-                            return;
+                    } else if (host.contains(".") || host.startsWith("[")) {
+                        if (Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_USE_OUTPROXY_PLUGIN, "true"))) {
+                            ClientAppManager mgr = _context.clientAppManager();
+                            if (mgr != null) {
+                                ClientApp op = mgr.getRegisteredApp(Outproxy.NAME);
+                                if (op != null) {
+                                    outproxy = (Outproxy) op;
+                                    usingInternalOutproxy = true;
+                                    if (host.startsWith("[")) {
+                                        host = host.substring(1);
+                                        if (host.endsWith("]"))
+                                            host = host.substring(0, host.length() - 1);
+                                    }
+                                }
+                            }
                         }
-                        destination = currentProxy;
-                        usingWWWProxy = true;
-                        newRequest.append("CONNECT ").append(host).append(restofline).append("\r\n"); // HTTP spec
+                        if (!usingInternalOutproxy) {
+                            // The request must be forwarded to a outproxy
+                            currentProxy = selectProxy();
+                            if (currentProxy == null) {
+                                if (_log.shouldLog(Log.WARN))
+                                    _log.warn(getPrefix(requestId) + "Host wants to be outproxied, but we dont have any!");
+                                writeErrorMessage(ERR_NO_OUTPROXY, out);
+                                s.close();
+                                return;
+                            }
+                            destination = currentProxy;
+                            usingWWWProxy = true;
+                            newRequest.append("CONNECT ").append(host).append(restofline).append("\r\n"); // HTTP spec
+                         }
                     } else if (host.toLowerCase(Locale.US).equals("localhost")) {
                         writeErrorMessage(ERR_LOCALHOST, out);
@@ -209 +245 @@
 
                     if (_log.shouldLog(Log.DEBUG)) {
-                        _log.debug(getPrefix(requestId) + "METHOD:" + method + ":");
-                        _log.debug(getPrefix(requestId) + "HOST  :" + host + ":");
-                        _log.debug(getPrefix(requestId) + "REST  :" + restofline + ":");
-                        _log.debug(getPrefix(requestId) + "DEST  :" + destination + ":");
+                        _log.debug(getPrefix(requestId) + "METHOD:" + method + ":\n" +
+                                   "HOST  :" + host + ":\n" +
+                                   "PORT  :" + remotePort + ":\n" +
+                                   "REST  :" + restofline + ":\n" +
+                                   "DEST  :" + destination + ":\n" +
+                                   "www proxy? " + usingWWWProxy + " internal proxy? " + usingInternalOutproxy);
                     }
                 } else if (line.toLowerCase(Locale.US).startsWith("proxy-authorization: ")) {
@@ -251 +289 @@
             }
 
-            if (destination == null || method == null || !"CONNECT".equals(method.toUpperCase(Locale.US))) {
+            if (method == null || !"CONNECT".equals(method.toUpperCase(Locale.US))) {
+                writeErrorMessage(ERR_BAD_PROTOCOL, out);
+                s.close();
+                return;
+            }
+            
+            // no destination, going to outproxy plugin
+            if (usingInternalOutproxy) {
+                Socket outSocket = outproxy.connect(host, remotePort);
+                OnTimeout onTimeout = new OnTimeout(s, s.getOutputStream(), targetRequest, usingWWWProxy, currentProxy, requestId);
+                byte[] response = SUCCESS_RESPONSE.getBytes("UTF-8");
+                Thread t = new I2PTunnelOutproxyRunner(s, outSocket, sockLock, null, response, onTimeout);
+                // we are called from an unlimited thread pool, so run inline
+                t.run();
+                return;
+            }
+
+            if (destination == null) {
                 writeErrorMessage(ERR_BAD_PROTOCOL, out);
                 s.close();
@@ -283 +338 @@
             }
 
-            I2PSocket i2ps = createI2PSocket(clientDest, getDefaultOptions());
+            I2PSocketOptions sktOpts = getDefaultOptions();
+            if (!usingWWWProxy && remotePort > 0)
+                sktOpts.setPort(remotePort);
+            I2PSocket i2ps = createI2PSocket(clientDest, sktOpts);
             byte[] data = null;
             byte[] response = null;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -357 +357 @@
     public static final String PROP_JUMP_SERVERS = "i2ptunnel.httpclient.jumpServers";
     public static final String PROP_DISABLE_HELPER = "i2ptunnel.httpclient.disableAddressHelper";
-    /** @since 0.9.11 */
-    public static final String PROP_USE_OUTPROXY_PLUGIN = "i2ptunnel.useLocalOutproxy";
     /** @since 0.9.11 */
     public static final String PROP_SSL_OUTPROXIES = "i2ptunnel.httpclient.SSLOutproxies";

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java

@@ -60 +60 @@
     private static final long MAX_NONCE_AGE = 60*60*1000L;
     private static final int MAX_NONCE_COUNT = 1024;
+    /** @since 0.9.11, moved to Base in 0.9.29 */
+    public static final String PROP_USE_OUTPROXY_PLUGIN = "i2ptunnel.useLocalOutproxy";
 
     private static final String ERR_AUTH1 =

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServer.java

@@ -15 +15 @@
 import net.i2p.app.Outproxy;
 import net.i2p.client.streaming.I2PSocket;
-import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
+import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase;
 import net.i2p.util.Log;
 
@@ -90 +90 @@
      */
     private boolean shouldUseOutproxyPlugin() {
-        return Boolean.parseBoolean(props.getProperty(I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN, "true"));
+        return Boolean.parseBoolean(props.getProperty(I2PTunnelHTTPClientBase.PROP_USE_OUTPROXY_PLUGIN, "true"));
     }
 

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java

@@ -580 +580 @@
      */
     public boolean getUseOutproxyPlugin(int tunnel) {
-        return getBooleanProperty(tunnel, I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN, true);
+        return getBooleanProperty(tunnel, I2PTunnelHTTPClientBase.PROP_USE_OUTPROXY_PLUGIN, true);
     }
 

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java

@@ -410 +410 @@
     public void setUseOutproxyPlugin(boolean val) {
         if (val)
-            _booleanOptions.add(I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN);
-        else
-            _booleanOptions.remove(I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN);
+            _booleanOptions.add(I2PTunnelHTTPClientBase.PROP_USE_OUTPROXY_PLUGIN);
+        else
+            _booleanOptions.remove(I2PTunnelHTTPClientBase.PROP_USE_OUTPROXY_PLUGIN);
     }
     
@@ -696 +696 @@
     private static final String _booleanProxyOpts[] = {
         I2PTunnelHTTPClientBase.PROP_OUTPROXY_AUTH,
-        I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN,
+        I2PTunnelHTTPClientBase.PROP_USE_OUTPROXY_PLUGIN,
         I2PTunnelHTTPClient.PROP_USER_AGENT,
         I2PTunnelHTTPClient.PROP_REFERER,

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

@@ -500 +500 @@
             if (TunnelController.TYPE_HTTP_CLIENT.equals(tun.getType())) {
                 Properties opts = tun.getClientOptionProps();
-                if (Boolean.parseBoolean(opts.getProperty(I2PTunnelHTTPClient.PROP_USE_OUTPROXY_PLUGIN, "true"))) {
+                if (Boolean.parseBoolean(opts.getProperty(I2PTunnelHTTPClientBase.PROP_USE_OUTPROXY_PLUGIN, "true"))) {
                     ClientAppManager mgr = _context.clientAppManager();
                     if (mgr != null)