Close streams in SOCKS4ClientTest

It's good form.

apps/routerconsole/jsp/confignet.jsp

@@ -46,7 +46,7 @@
   </td>
  </tr>
  <tr>
-  <th id="upnpconfig"><%=intl._t("UPnP Configuration")%>&nbsp;<a href="peers#upnp">[<%=intl._t("UPnP Status")%>]</a></th>
+  <th id="upnpconfig"><%=intl._t("UPnP Configuration")%>&nbsp;<a href="peers?tx=upnp">[<%=intl._t("UPnP Status")%>]</a></th>
  </tr>
  <tr>
   <td>

core/java/test/junit/net/i2p/socks/SOCKS4ClientTest.java

@@ -0,0 +1,195 @@
+package net.i2p.socks;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import sun.net.util.IPAddressUtil;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.Socket;
+import java.nio.charset.StandardCharsets;
+
+import static net.i2p.socks.SOCKS4Constants.SOCKS_VERSION_4;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThrows;
+
+/**
+ * @since 0.9.49
+ */
+public class SOCKS4ClientTest {
+
+    ByteArrayInputStream inputStream;
+    ByteArrayOutputStream outputStream;
+
+    @Before
+    public void openStreams(){
+        outputStream = new ByteArrayOutputStream();
+    }
+
+    @After
+    public void closeStreams() throws IOException {
+        if (inputStream != null) {
+            inputStream.close();
+        }
+        if (outputStream != null) {
+            outputStream.close();
+        }
+    }
+
+    /**
+     * A successful connection to an IPv4 host
+     */
+    @Test
+    public void connect() throws IOException {
+        _testConnect(false);
+    }
+
+    /**
+     * A successful connection to an IPv4 host using a socket
+     */
+    @Test
+    public void connect__withSocket() throws IOException {
+        _testConnect(true);
+    }
+
+    private void _testConnect(boolean useSocket) throws IOException {
+        String hostIPv4 = "11.22.33.44";
+        int connectionPort = 8080;
+        byte[] hostIPv4Bin = IPAddressUtil.textToNumericFormatV4(hostIPv4);
+
+        // Build sequence of bytes to be expected
+        ByteArrayOutputStream expectedByteStream = new ByteArrayOutputStream();
+        DataOutputStream writerStream = new DataOutputStream(expectedByteStream);
+        writerStream.writeByte(SOCKS_VERSION_4);
+        writerStream.writeByte(SOCKS4Constants.Command.CONNECT);
+        writerStream.writeShort(connectionPort);
+        writerStream.write(hostIPv4Bin);
+        writerStream.write((byte) 0);
+
+        inputStream = new ByteArrayInputStream(new byte[]{
+            0, // dummy
+            SOCKS4Constants.Reply.SUCCEEDED, // Connection succeeded
+            0, 0, 0, 0, 0, 0 // filler
+        });
+        outputStream = new ByteArrayOutputStream();
+
+        // Test overloaded function
+        try {
+            if (useSocket) {
+                Socket socket = Mockito.mock(Socket.class);
+                Mockito.when(socket.getInputStream()).thenReturn(inputStream);
+                Mockito.when(socket.getOutputStream()).thenReturn(outputStream);
+
+                SOCKS4Client.connect(socket, hostIPv4, connectionPort);
+            } else {
+                SOCKS4Client.connect(inputStream, outputStream, hostIPv4, connectionPort);
+            }
+        } finally {
+            writerStream.close();
+        }
+        assertArrayEquals(expectedByteStream.toByteArray(), outputStream.toByteArray());
+    }
+
+    /**
+     * Connect proxy with a domain name
+     */
+    @Test
+    public void connect__host() throws IOException {
+        String host = "stats.i2p";
+        int connectionPort = 80;
+
+        // Build sequence of bytes to be expected
+        ByteArrayOutputStream expectedByteStream = new ByteArrayOutputStream();
+        DataOutputStream writerStream = new DataOutputStream(expectedByteStream);
+        writerStream.writeByte(SOCKS_VERSION_4);
+        writerStream.writeByte(SOCKS4Constants.Command.CONNECT);
+        writerStream.writeShort(connectionPort);
+        writerStream.write(new byte[]{0,0,0,1});  // 0.0.0.1
+        writerStream.write((byte) 0); // empty userID
+        writerStream.write(host.getBytes(StandardCharsets.ISO_8859_1));
+        writerStream.write((byte) 0);
+
+        inputStream = new ByteArrayInputStream(new byte[]{
+            0, // dummy
+            SOCKS4Constants.Reply.SUCCEEDED, // Connection succeeded
+            0, 0, 0, 0, 0, 0 // filler
+        });
+        try {
+            SOCKS4Client.connect(SOCKS4ClientTest.this.inputStream, outputStream, host, connectionPort);
+        } finally {
+            expectedByteStream.close();
+        }
+        assertArrayEquals(expectedByteStream.toByteArray(), outputStream.toByteArray());
+    }
+
+    /**
+     * Run into IOException while trying to connect due to no input/response
+     */
+    @Test
+    public void connect__ioException() {
+        inputStream = new ByteArrayInputStream(new byte[]{});
+        assertThrows(IOException.class, () -> {
+            SOCKS4Client.connect(
+                inputStream,
+                outputStream,
+                "127.0.0.1",
+                80);
+        });
+    }
+
+    /**
+     * Run into IOException while trying to connect due to closed input stream
+     */
+    @Test
+    public void connect__ioExceptionWithSocket() {
+        inputStream = new ByteArrayInputStream(new byte[]{});
+        assertThrows(IOException.class, () -> {
+            Socket socket = Mockito.mock(Socket.class);
+            Mockito.when(socket.getInputStream()).thenReturn(inputStream);
+            Mockito.when(socket.getOutputStream()).thenReturn(outputStream);
+
+            SOCKS4Client.connect(
+                socket,
+                "127.0.0.1",
+                80
+            );
+        });
+    }
+
+    /**
+     * Check that CONNECTION_REFUSED throws exception
+     */
+    @Test
+    public void connect__responseCONNECTION_REFUSED() throws IOException {
+        inputStream = new ByteArrayInputStream(new byte[]{
+            0, // dummy
+            SOCKS4Constants.Reply.CONNECTION_REFUSED, // Connection succeeded
+        });
+        assertThrows(SOCKSException.class, () -> {
+            SOCKS4Client.connect(inputStream,
+                outputStream,
+                "1.1.1.1",
+                80
+            );
+        });
+    }
+
+    /**
+     * IPv6 is not supported by this SOCKS client so it just throws an exception
+     */
+    @Test
+    public void connect__IPv6() {
+        inputStream = new ByteArrayInputStream(new byte[]{});
+        assertThrows(SOCKSException.class, () -> {
+            SOCKS4Client.connect(
+                inputStream,
+                outputStream,
+                "::1",
+                80);
+        });
+    }
+}

history.txt

@@ -1,3 +1,22 @@
+2021-01-20 zzz
+ * Console: Fix link to UPnP status
+ * SSU: Fix deadlock with router restart
+
+2021-01-14 zzz
+ * Router:
+   - Change default encryption type to ECIES-X25519 (proposal 156)
+   - Move Sybil subsystem from console to router
+   - Limit max addresses in RI
+
+2021-01-13 zzz
+ * Jetty: Fix URI in request logs
+
+2021-01-12 zzz
+ * i2psnark: Don't decrement downloaded counter after receiving bad piece
+
+2021-01-11 zzz
+ * Console: Delete rrd files for no-longer-configured stats at startup
+
 2021-01-08 zzz
  * i2ptunnel: Disable shared clients (DSA) (part 2)
  * SSU: Fix bandwidth estimator deadlock (ticket #2798)

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 13;
+    public final static long BUILD = 14;
 
     /** for example "-test" */
     public final static String EXTRA = "";

router/java/src/net/i2p/router/startup/WorkingDir.java

@@ -81,22 +81,33 @@ public class WorkingDir {
             String home = System.getProperty("user.home");
             if (isWindows) {
                 String appdata = System.getenv("LOCALAPPDATA");
-                if (appdata != null)
+                if (appdata != null) {
                     home = appdata;
+                }
                 // Don't mess with existing Roaming Application Data installs,
                 // in case somebody is using roaming appdata for a reason
                 // already. In new installs, use local appdata by default. -idk
                 appdata = System.getenv("APPDATA");
                 if (appdata != null) {
                     File checkOld = new File(appdata, WORKING_DIR_DEFAULT_WINDOWS);
-                    if (checkOld.exists() && checkOld.isDirectory())
-                        home = appdata;
+                    if (checkOld.exists() && checkOld.isDirectory()){
+                        File routerConfig = new File(checkOld.getAbsolutePath(), "router.config");
+                        // The Firefox profile installer was mistakenly using the Roaming application data
+                        // which is synced between devices on some Windows machines using MS cloud services,
+                        // instead of the local application data which is used by default.
+                        // It would create the router.config file in an empty directory, which the router would
+                        // then attempt to use, resulting in a router with no client applications. Checking
+                        // for clients.config.d determines if the directory is "Real" or not.
+                        File clientAppsConfig = new File(checkOld.getAbsolutePath(), "clients.config.d");
+                        if (routerConfig.exists() && clientAppsConfig.exists() && clientAppsConfig.isDirectory())
+                            home = appdata;
+                    }
                 }
                 dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS);
             } else if (SystemVersion.isMac()) {
                 String appdata = "/Library/Application Support/";
-		File old = new File(home,WORKING_DIR_DEFAULT);
-		if (old.exists() && old.isDirectory())
+                File old = new File(home,WORKING_DIR_DEFAULT);
+                if (old.exists() && old.isDirectory())
                     dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT);
                 else {
                     home = home+appdata;

router/java/src/net/i2p/router/transport/udp/UDPTransport.java

@@ -2455,7 +2455,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 // warning, this calls back into us with allowRebuildRouterInfo = false,
                 // via CSFI.createAddresses->TM.getAddresses()->updateAddress()->REA
                 if (allowRebuildRouterInfo)
-                    _context.router().rebuildRouterInfo();
+                    rebuildRouterInfo();
             } else {
                 addr = null;
             }
@@ -2510,11 +2510,35 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 // warning, this calls back into us with allowRebuildRouterInfo = false,
                 // via CSFI.createAddresses->TM.getAddresses()->updateAddress()->REA
                 if (allowRebuildRouterInfo)
-                    _context.router().rebuildRouterInfo();
+                    rebuildRouterInfo();
             }
         }
     }
 
+    /**
+     *  Avoid deadlocks part 999
+     *  @since 0.9.49
+     */
+    private void rebuildRouterInfo() {
+        (new RebuildEvent()).schedule(0);
+    }
+
+    /**
+     *  @since 0.9.49
+     */
+    private class RebuildEvent extends SimpleTimer2.TimedEvent {
+        /**
+         *  Caller must schedule
+         */
+        public RebuildEvent() {
+            super(_context.simpleTimer2());
+        }
+        public void timeReached() {
+            _context.router().rebuildRouterInfo(true);
+        }
+    }
+
+
     /**
      *  Simple fetch of stored IP and port, since
      *  we don't put them in the real, published RouterAddress anymore