Changeset d054e129

Timestamp:

Jan 5, 2014 12:52:00 AM (7 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

0fae064

Parents:

b59aa1fb

Message:

New interface and context hooks for in-jvm outproxy
Support in HTTP client proxy
All preliminary, maybe better to use ClientAppManager??

Files:

• apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java (modified) (9 diffs)
• core/java/src/net/i2p/I2PAppContext.java (modified) (4 diffs)
• core/java/src/net/i2p/outproxy/Outproxy.java (added)

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

@@ -30 +30 @@
 import net.i2p.data.Hash;
 import net.i2p.i2ptunnel.localServer.LocalHTTPServer;
+import net.i2p.outproxy.Outproxy;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.Log;
@@ -321 +322 @@
     public static final String PROP_JUMP_SERVERS = "i2ptunnel.httpclient.jumpServers";
     public static final String PROP_DISABLE_HELPER = "i2ptunnel.httpclient.disableAddressHelper";
+    public static final String PROP_OUTPROXY = "i2ptunnel.useLocalOutproxy";
 
     protected void clientConnectionRun(Socket s) {
@@ -331 +333 @@
 
         boolean usingWWWProxy = false;
+        boolean usingOutproxy = false;
+        Outproxy outproxy = null;
         boolean usingInternalServer = false;
         String internalPath = null;
@@ -678 +682 @@
                         return;
                     } else if(host.contains(".") || host.startsWith("[")) {
-                        if(port >= 0) {
-                            host = host + ':' + port;
-                        }
-                        // The request must be forwarded to a WWW proxy
-                        if(_log.shouldLog(Log.DEBUG)) {
-                            _log.debug("Before selecting outproxy for " + host);
-                        }
-                        currentProxy = selectProxy();
-                        if(_log.shouldLog(Log.DEBUG)) {
-                            _log.debug("After selecting outproxy for " + host + ": " + currentProxy);
-                        }
-                        if(currentProxy == null) {
-                            if(_log.shouldLog(Log.WARN)) {
-                                _log.warn(getPrefix(requestId) + "Host wants to be outproxied, but we dont have any!");
+                        if (Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_OUTPROXY)) &&
+                            (outproxy = _context.outproxy()) != null) {
+                            int rPort = requestURI.getPort();
+                            if (rPort > 0)
+                                remotePort = rPort;
+                            else
+                                remotePort = 80;
+                            usingOutproxy = true;
+                            targetRequest = requestURI.toASCIIString();
+                            if(_log.shouldLog(Log.DEBUG))
+                                _log.debug(getPrefix(requestId) + " [" + host + "]: outproxy!");
+                        } else {
+                            if(port >= 0) {
+                                host = host + ':' + port;
                             }
-                            l.log("No HTTP outproxy found for the request.");
-                            if(out != null) {
-                                out.write(getErrorPage("noproxy", _ERR_NO_OUTPROXY));
-                                writeFooter(out);
+                            // The request must be forwarded to a WWW proxy
+                            if(_log.shouldLog(Log.DEBUG)) {
+                                _log.debug("Before selecting outproxy for " + host);
                             }
-                            s.close();
-                            return;
-                        }
-                        destination = currentProxy;
-                        usingWWWProxy = true;
-                        targetRequest = requestURI.toASCIIString();
-                        if(_log.shouldLog(Log.DEBUG)) {
-                            _log.debug(getPrefix(requestId) + " [" + host + "]: wwwProxy!");
+                            currentProxy = selectProxy();
+                            if(_log.shouldLog(Log.DEBUG)) {
+                                _log.debug("After selecting outproxy for " + host + ": " + currentProxy);
+                            }
+                            if(currentProxy == null) {
+                                if(_log.shouldLog(Log.WARN)) {
+                                    _log.warn(getPrefix(requestId) + "Host wants to be outproxied, but we dont have any!");
+                                }
+                                l.log("No HTTP outproxy found for the request.");
+                                if(out != null) {
+                                    out.write(getErrorPage("noproxy", _ERR_NO_OUTPROXY));
+                                    writeFooter(out);
+                                }
+                                s.close();
+                                return;
+                            }
+                            destination = currentProxy;
+                            usingWWWProxy = true;
+                            targetRequest = requestURI.toASCIIString();
+                            if(_log.shouldLog(Log.DEBUG)) {
+                                _log.debug(getPrefix(requestId) + " [" + host + "]: wwwProxy!");
+                            }
                         }
                     } else {
@@ -723 +740 @@
                     }   // end host name processing
 
-                    boolean isValid = usingWWWProxy || usingInternalServer || isSupportedAddress(host, protocol);
+                    boolean isValid = usingOutproxy || usingWWWProxy ||
+                                      usingInternalServer || isSupportedAddress(host, protocol);
                     if(!isValid) {
                         if(_log.shouldLog(Log.INFO)) {
@@ -744 +762 @@
 
                 } else {
-                    if(lowercaseLine.startsWith("host: ") && !usingWWWProxy) {
+                    if(lowercaseLine.startsWith("host: ") && !usingWWWProxy && !usingOutproxy) {
                         // Note that we only pass the original Host: line through to the outproxy
                         // But we don't create a Host: line if it wasn't sent to us
@@ -816 +834 @@
                         if(!Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_USER_AGENT))) {
                             // let's not advertise to external sites that we are from I2P
-                            if(usingWWWProxy) {
+                            if(usingWWWProxy || usingOutproxy) {
                                 newRequest.append("User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6\r\n");
                             } else {
@@ -849 +867 @@
             }
 
-            if(method == null || destination == null) {
+            if(method == null || (destination == null && !usingOutproxy)) {
                 //l.log("No HTTP method found in the request.");
                 if(out != null) {
@@ -894 +912 @@
                 }
                 s.close();
+                return;
+            }
+
+            // no destination, going to outproxy plugin
+            if (usingOutproxy) {
+                Socket outSocket = outproxy.connect(host, remotePort);
+                byte[] data = newRequest.toString().getBytes("ISO-8859-1");
+                Runnable onTimeout = new OnTimeout(s, s.getOutputStream(), targetRequest, usingWWWProxy, currentProxy, requestId);
+                new I2PTunnelOutproxyRunner(s, outSocket, sockLock, data, onTimeout);
                 return;
             }

core/java/src/net/i2p/I2PAppContext.java

@@ -26 +26 @@
 import net.i2p.data.RoutingKeyGenerator;
 import net.i2p.internal.InternalClientManager;
+import net.i2p.outproxy.Outproxy;
 import net.i2p.stat.StatManager;
 import net.i2p.update.UpdateManager;
@@ -95 +96 @@
     private SimpleTimer2 _simpleTimer2;
     private final PortMapper _portMapper;
+    private Outproxy _outproxy;
     private volatile boolean _statManagerInitialized;
     private volatile boolean _sessionKeyManagerInitialized;
@@ -128 +130 @@
                          _lock9 = new Object(), _lock10 = new Object(), _lock11 = new Object(), _lock12 = new Object(),
                          _lock13 = new Object(), _lock14 = new Object(), _lock15 = new Object(), _lock16 = new Object(),
-                         _lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object();
+                         _lock17 = new Object(), _lock18 = new Object(), _lock19 = new Object(), _lock20 = new Object(),
+                         _lock21 = new Object();
 
     /**
@@ -1024 +1027 @@
         return null;
     }
+
+    /**
+     *  A local outproxy
+     *  @return The outproxy if it is registered, else null
+     *  @since 0.9.11
+     */
+    public Outproxy outproxy() {
+        return _outproxy;
+    }
+
+    /**
+     *  Register as the outproxy. For now, only one.
+     *  @throws IllegalStateException if one was already registered
+     *  @since 0.9.11
+     */
+    public void registerOutproxy(Outproxy oproxy) {
+        synchronized(_lock21) {
+            if (_outproxy != null)
+                throw new IllegalStateException();
+            _outproxy = oproxy;
+        }
+    }
+
+    /**
+     *  Unregister the outproxy.
+     *  @throws IllegalStateException if it was not registered
+     *  @since 0.9.11
+     */
+    public void unregisterOutproxy(Outproxy oproxy) {
+        synchronized(_lock21) {
+            if (_outproxy != oproxy)
+                throw new IllegalStateException();
+            _outproxy = null;
+        }
+    }
 }