Merge pull request clue#15 from clue-labs/fix-invalid-url

clue · web-flow · commit 835e7ea2c388 · 2020-05-04T10:19:51.000+02:00
Fix error reporting when parsing invalid SOCKS server URL
diff --git a/src/SshProcessConnector.php b/src/SshProcessConnector.php
@@ -34,7 +34,7 @@ public function __construct($uri, LoopInterface $loop)
         // URI must use optional ssh:// scheme, must contain host and neither pass nor target must start with dash
         $parts = \parse_url((\strpos($uri, '://') === false ? 'ssh://' : '') . $uri);
         $pass = isset($parts['pass']) ? \rawurldecode($parts['pass']) : null;
-        $target = (isset($parts['user']) ? \rawurldecode($parts['user']) . '@' : '') . $parts['host'];
+        $target = (isset($parts['user']) ? \rawurldecode($parts['user']) . '@' : '') . (isset($parts['host']) ? $parts['host'] : '');
         if (!isset($parts['scheme'], $parts['host']) || $parts['scheme'] !== 'ssh' || (isset($pass[0]) && $pass[0] === '-') || $target[0] === '-') {
             throw new \InvalidArgumentException('Invalid SSH server URI');
         }
diff --git a/src/SshSocksConnector.php b/src/SshSocksConnector.php
@@ -45,7 +45,7 @@ public function __construct($uri, LoopInterface $loop)
         // URI must use optional ssh:// scheme, must contain host and neither pass nor target must start with dash
         $parts = \parse_url((\strpos($uri, '://') === false ? 'ssh://' : '') . $uri);
         $pass = isset($parts['pass']) ? \rawurldecode($parts['pass']) : null;
-        $target = (isset($parts['user']) ? \rawurldecode($parts['user']) . '@' : '') . $parts['host'];
+        $target = (isset($parts['user']) ? \rawurldecode($parts['user']) . '@' : '') . (isset($parts['host']) ? $parts['host'] : '');
         if (!isset($parts['scheme'], $parts['host']) || $parts['scheme'] !== 'ssh' || (isset($pass[0]) && $pass[0] === '-') || $target[0] === '-') {
             throw new \InvalidArgumentException('Invalid SSH server URI');
         }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct($uri, LoopInterface $loop)`
`34`	`34`	`// URI must use optional ssh:// scheme, must contain host and neither pass nor target must start with dash`
`35`	`35`	`$parts = \parse_url((\strpos($uri, '://') === false ? 'ssh://' : '') . $uri);`
`36`	`36`	`$pass = isset($parts['pass']) ? \rawurldecode($parts['pass']) : null;`
`37`		`- $target = (isset($parts['user']) ? \rawurldecode($parts['user']) . '@' : '') . $parts['host'];`
	`37`	`+ $target = (isset($parts['user']) ? \rawurldecode($parts['user']) . '@' : '') . (isset($parts['host']) ? $parts['host'] : '');`
`38`	`38`	`if (!isset($parts['scheme'], $parts['host']) \|\| $parts['scheme'] !== 'ssh' \|\| (isset($pass[0]) && $pass[0] === '-') \|\| $target[0] === '-') {`
`39`	`39`	`throw new \InvalidArgumentException('Invalid SSH server URI');`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function __construct($uri, LoopInterface $loop)`
`45`	`45`	`// URI must use optional ssh:// scheme, must contain host and neither pass nor target must start with dash`
`46`	`46`	`$parts = \parse_url((\strpos($uri, '://') === false ? 'ssh://' : '') . $uri);`
`47`	`47`	`$pass = isset($parts['pass']) ? \rawurldecode($parts['pass']) : null;`
`48`		`- $target = (isset($parts['user']) ? \rawurldecode($parts['user']) . '@' : '') . $parts['host'];`
	`48`	`+ $target = (isset($parts['user']) ? \rawurldecode($parts['user']) . '@' : '') . (isset($parts['host']) ? $parts['host'] : '');`
`49`	`49`	`if (!isset($parts['scheme'], $parts['host']) \|\| $parts['scheme'] !== 'ssh' \|\| (isset($pass[0]) && $pass[0] === '-') \|\| $target[0] === '-') {`
`50`	`50`	`throw new \InvalidArgumentException('Invalid SSH server URI');`
`51`	`51`	`}`