Update SOCKS dependency to improve error reporting and cancellation

composer.json

@@ -16,7 +16,7 @@
         "clue/commander": "^1.3",
         "clue/connection-manager-extra": "^1.1",
         "clue/http-proxy-react": "^1.4",
-        "clue/socks-react": "^0.8.7",
+        "clue/socks-react": "^1.0",
         "react/http": "^0.8.3",
         "react/http-client": "^0.5.9",
         "react/socket": "^1.1"

src/ConnectorFactory.php

@@ -59,7 +59,12 @@ public static function coerceProxyUri($uri)
             throw new \InvalidArgumentException('Upstream proxy "' . $uri . '" can not be parsed as a valid URI');
         }
 
-        if (!in_array($parts['scheme'], array('http', 'socks', 'socks5', 'socks4', 'socks4a'))) {
+        // deprecated, for BC only: map explicit SOCKS4a to SOCKS4, should be removed in the future
+        if ($parts['scheme'] === 'socks4a') {
+            $parts['scheme'] = 'socks4';
+        }
+
+        if (!in_array($parts['scheme'], array('http', 'socks', 'socks5', 'socks4'))) {
             throw new \InvalidArgumentException('Upstream proxy scheme "' . $parts['scheme'] . '://" not supported');
         }
 
@@ -82,6 +87,9 @@ public static function coerceProxyUri($uri)
 
             $parts += array('user' => '', 'pass' => '');
             $parts['host'] = $parts['user'] . ':' . $parts['pass'] . '@' . $parts['host'];
+        } elseif ($parts['scheme'] === 'socks') {
+            // deprecated, for BC only: map unspecified SOCKS to SOCKS4(a), should be SOCKS5 in the future
+            $parts['scheme'] = 'socks4';
         }
 
         return $parts['scheme'] . '://' . $parts['host'] . ':' . $parts['port'];

src/LeProxyServer.php

@@ -60,32 +60,37 @@ public function listen($listen, $allowUnprotected)
             $socket = new Socket($parts['host'] . ':' . $parts['port'], $this->loop);
         }
 
-        // start new proxy server which uses the given connector for forwarding/chaining
-        $unification = new ProtocolDetector($socket);
-        $http = new HttpProxyServer($this->loop, $unification->http, $this->connector);
-        $socks = new SocksServer(
-            $this->loop,
-            $unification->socks,
-            new SocksErrorConnector(
-                $this->connector,
-                !isset($parts['user']) && !isset($parts['pass']) && !$allowUnprotected
-            )
-        );
-
         // require authentication if listening URI contains username/password
+        $auth = null;
         if (isset($parts['user']) || isset($parts['pass'])) {
             $auth = array(
                 rawurldecode($parts['user']) => isset($parts['pass']) ? rawurldecode($parts['pass']) : ''
             );
+        }
 
+        // start new proxy server which uses the given connector for forwarding/chaining
+        $unification = new ProtocolDetector($socket);
+
+        // HTTP server with authentication required or protected mode by default
+        $http = new HttpProxyServer($this->loop, $unification->http, $this->connector);
+        if ($auth !== null) {
             $http->setAuthArray($auth);
-            $socks->setAuthArray($auth);
         } elseif (!$allowUnprotected) {
             // no authentication required, so only allow local HTTP requests (protected mode)
-            // SOCKS works slightly differently and simply rejects every non-local connection attempt, see SocksErrorConnector
             $http->allowUnprotected = false;
         }
 
+        // SOCKS server works slightly differently and simply rejects every non-local connection attempt via SocksErrorConnector
+        $socks = new SocksServer(
+            $this->loop,
+            new SocksErrorConnector(
+                $this->connector,
+                !isset($parts['user']) && !isset($parts['pass']) && !$allowUnprotected
+            ),
+            $auth
+        );
+        $socks->listen($unification->socks);
+
         return $socket;
     }
 }

tests/ConnectorFactoryTest.php

@@ -9,10 +9,10 @@ public function testCoerceProxyUri()
         $uris = array(
             'host' => 'http://host:8080',
             'host:1234' => 'http://host:1234',
-            'socks://host' => 'socks://host:8080',
+            'socks://host' => 'socks4://host:8080',
             'socks://user:pass@host' => 'socks5://user:pass@host:8080',
             'user@host' => 'http://user:@host:8080',
-            'socks4a://10.20.30.40:5060' => 'socks4a://10.20.30.40:5060',
+            'socks4a://10.20.30.40:5060' => 'socks4://10.20.30.40:5060',
 
             './proxy.sock' => 'http+unix://./proxy.sock',
             '/tmp/proxy.sock' => 'http+unix:///tmp/proxy.sock',