Changeset 07caf2e

Timestamp:

Jun 13, 2012 7:02:09 PM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

ad1b356

Parents:

6e52ae3

Message:

• I2PSocketEepGet: Set port to 80
• I2PTunnel:
  • Pass port through HTTP client proxy
  • HTTP server proxy sets host header to the value of "spoofedhost.xx" option for port xx
  • Set client options more efficiently

Location:

apps

Files:

• i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java (modified) (3 diffs)
• i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java (modified) (4 diffs)
• i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java (modified) (4 diffs)
• i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java (modified) (1 diff)
• i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java (modified) (1 diff)
• i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java (modified) (2 diffs)
• ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java (modified) (1 diff)

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

@@ -47 +47 @@
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -331 +332 @@
      * Sets the event "clientoptions_onResult" = "ok" after completion.
      *
+     * Deprecated use setClientOptions()
+     *
      * @param args each args[i] is a key=value pair to add to the options
      * @param l logger to receive events and output
@@ -344 +347 @@
                 _clientOptions.setProperty(key, val);
             }
+        }
+        notifyEvent("clientoptions_onResult", "ok");
+    }
+
+    /**
+     * A more efficient runClientOptions()
+     *
+     * @param opts non-null
+     * @since 0.9.1
+     */
+    public void setClientOptions(Properties opts) {
+        _clientOptions.clear();
+        for (Map.Entry e : opts.entrySet()) {
+             String key = (String) e.getKey();
+             String val = (String) e.getValue();
+             _clientOptions.setProperty(key, val);
         }
         notifyEvent("clientoptions_onResult", "ok");

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

@@ -331 +331 @@
             String userAgent = null;
             String authorization = null;
+            int remotePort = 0;
             while((line = reader.readLine(method)) != null) {
                 line = line.trim();
@@ -487 +488 @@
                         host = getHostName(destination);
 
-                        if(requestURI.getPort() >= 0) {
-                            // TODO support I2P ports someday
-                            //if (port >= 0)
-                            //    host = host + ':' + port;
+                        int rPort = requestURI.getPort();
+                        if (rPort > 0) {
+                            // Save it to put in the I2PSocketOptions,
+                            // but strip it from the URL
+                            remotePort = rPort;
                             if(_log.shouldLog(Log.WARN)) {
                                 _log.warn(getPrefix(requestId) + "Removing port from [" + request + "]");
@@ -501 +503 @@
                                 break;
                             }
+                        } else {
+                            remotePort = 80;
                         }
 
@@ -965 +969 @@
             // dont want to hard link to here
             //opts.setProperty("i2p.streaming.inactivityTimeoutAction", ""+1);
-            I2PSocket i2ps = createI2PSocket(clientDest, getDefaultOptions(opts));
+            I2PSocketOptions sktOpts = getDefaultOptions(opts);
+            if (remotePort > 0)
+                sktOpts.setPort(remotePort);
+            I2PSocket i2ps = createI2PSocket(clientDest, sktOpts);
             byte[] data = newRequest.toString().getBytes("ISO-8859-1");
             Runnable onTimeout = new OnTimeout(s, s.getOutputStream(), targetRequest, usingWWWProxy, currentProxy, requestId);

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

@@ -78 +78 @@
 
     private void setupI2PTunnelHTTPServer(String spoofHost) {
-        _spoofHost = spoofHost;
+        _spoofHost = (spoofHost != null && spoofHost.trim().length() > 0) ? spoofHost.trim() : null;
         getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpserver.blockingHandleTime", "how long the blocking handle takes to complete", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000, 3*60*60*1000 });
         getTunnel().getContext().statManager().createRateStat("i2ptunnel.httpNullWorkaround", "How often an http server works around a streaming lib or i2ptunnel bug", "I2PTunnel.HTTPServer", new long[] { 60*1000, 10*60*1000 });
@@ -97 +97 @@
     @Override
     protected void blockingHandle(I2PSocket socket) {
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Incoming connection to '" + toString() + "' port " + socket.getLocalPort() +
+                      " from: " + socket.getPeerDestination().calculateHash() + " port " + socket.getPort());
         long afterAccept = getTunnel().getContext().clock().now();
         long afterSocket = -1;
@@ -116 +119 @@
             addEntry(headers, DEST64_HEADER, socket.getPeerDestination().toBase64());
 
-            if ( (_spoofHost != null) && (_spoofHost.trim().length() > 0) )
-                setEntry(headers, "Host", _spoofHost);
+            // Port-specific spoofhost
+            Properties opts = getTunnel().getClientOptions();
+            String spoofHost;
+            int ourPort = socket.getLocalPort();
+            if (ourPort != 80 && ourPort > 0 && ourPort < 65535 && opts != null) {
+                String portSpoof = opts.getProperty("spoofedHost." + ourPort);
+                if (portSpoof != null)
+                    spoofHost = portSpoof.trim();
+                else
+                    spoofHost = _spoofHost;
+            } else {
+                spoofHost = _spoofHost;
+            }
+            if (spoofHost != null)
+                setEntry(headers, "Host", spoofHost);
             setEntry(headers, "Connection", "close");
             // we keep the enc sent by the browser before clobbering it, since it may have 
@@ -135 +151 @@
             // server, reads the response headers, rewriting to include Content-encoding: x-i2p-gzip
             // if it was one of the Accept-encoding: values, and gzip the payload       
-            Properties opts = getTunnel().getClientOptions();
             boolean allowGZIP = true;
             if (opts != null) {

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

@@ -112 +112 @@
     @Override
     protected void blockingHandle(I2PSocket socket) {
+        if (_log.shouldLog(Log.INFO))
+            _log.info("Incoming connection to '" + toString() + "' port " + socket.getLocalPort() +
+                      " from: " + socket.getPeerDestination().calculateHash() + " port " + socket.getPort());
         try {
                         String modifiedRegistration;

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

@@ -409 +409 @@
     protected void blockingHandle(I2PSocket socket) {
         if (_log.shouldLog(Log.INFO))
-            _log.info("Incoming connection to '" + toString() + "' from: " + socket.getPeerDestination().calculateHash().toBase64());
+            _log.info("Incoming connection to '" + toString() + "' port " + socket.getLocalPort() +
+                      " from: " + socket.getPeerDestination().calculateHash() + " port " + socket.getPort());
         long afterAccept = I2PAppContext.getGlobalContext().clock().now();
         long afterSocket = -1;

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

@@ -5 +5 @@
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Random;
@@ -386 +388 @@
     
     private void setSessionOptions() {
-        List opts = new ArrayList();
-        for (Iterator iter = _config.keySet().iterator(); iter.hasNext(); ) {
-            String key = (String)iter.next();
-            String val = _config.getProperty(key);
+        Properties opts = new Properties();
+        for (Map.Entry e : _config.entrySet()) {
+            String key = (String) e.getKey();
             if (key.startsWith("option.")) {
                 key = key.substring("option.".length());
-                opts.add(key + "=" + val);
-            }
-        }
-        String args[] = new String[opts.size()];
-        for (int i = 0; i < opts.size(); i++)
-            args[i] = (String)opts.get(i);
-        _tunnel.runClientOptions(args, this);
+                String val = (String) e.getValue();
+                opts.setProperty(key, val);
+            }
+        }
+        _tunnel.setClientOptions(opts);
     }
     

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java

@@ -144 +144 @@
                 props.setProperty(PROP_CONNECT_DELAY, CONNECT_DELAY);
                 I2PSocketOptions opts = _socketManager.buildOptions(props);
+                // TODO pull port out of URL
+                opts.setPort(80);
                 _socket = _socketManager.connect(dest, opts);
             } else {