Merge pull request #279 from clue-labs/no-filter

WyriHaximus · web-flow · commit ead9efbc998c · 2021-12-06T09:41:58.000+01:00
Avoid dependency on `ext-filter`
diff --git a/src/DnsConnector.php b/src/DnsConnector.php
@@ -39,7 +39,7 @@ public function connect($uri)
         $connector = $this->connector;
 
         // skip DNS lookup / URI manipulation if this URI already contains an IP
-        if (false !== \filter_var($host, \FILTER_VALIDATE_IP)) {
+        if (@\inet_pton($host) !== false) {
             return $connector->connect($original);
         }
 
diff --git a/src/HappyEyeBallsConnector.php b/src/HappyEyeBallsConnector.php
@@ -50,7 +50,7 @@ public function connect($uri)
         $host = \trim($parts['host'], '[]');
 
         // skip DNS lookup / URI manipulation if this URI already contains an IP
-        if (false !== \filter_var($host, \FILTER_VALIDATE_IP)) {
+        if (@\inet_pton($host) !== false) {
             return $this->connector->connect($original);
         }
 
diff --git a/src/TcpConnector.php b/src/TcpConnector.php
@@ -34,7 +34,7 @@ public function connect($uri)
         }
 
         $ip = \trim($parts['host'], '[]');
-        if (false === \filter_var($ip, \FILTER_VALIDATE_IP)) {
+        if (@\inet_pton($ip) === false) {
             return Promise\reject(new \InvalidArgumentException(
                 'Given URI "' . $uri . '" does not contain a valid host IP (EINVAL)',
                 \defined('SOCKET_EINVAL') ? \SOCKET_EINVAL : 22
diff --git a/src/TcpServer.php b/src/TcpServer.php
@@ -160,7 +160,7 @@ public function __construct($uri, LoopInterface $loop = null, array $context = a
             );
         }
 
-        if (false === \filter_var(\trim($parts['host'], '[]'), \FILTER_VALIDATE_IP)) {
+        if (@\inet_pton(\trim($parts['host'], '[]')) === false) {
             throw new \InvalidArgumentException(
                 'Given URI "' . $uri . '" does not contain a valid host IP (EINVAL)',
                 \defined('SOCKET_EINVAL') ? \SOCKET_EINVAL : 22
diff --git a/tests/FunctionalConnectorTest.php b/tests/FunctionalConnectorTest.php
@@ -90,7 +90,7 @@ public function connectionToRemoteTCP4n6ServerShouldResultInOurIP()
 
         $ip = Block\await($this->request('dual.tlund.se', $connector), $loop, self::TIMEOUT);
 
-        $this->assertSame($ip, filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6), $ip);
+        $this->assertNotFalse(inet_pton($ip));
     }
 
     /**
@@ -110,8 +110,8 @@ public function connectionToRemoteTCP4ServerShouldResultInOurIP()
             throw $e;
         }
 
-        $this->assertSame($ip, filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4), $ip);
-        $this->assertFalse(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6), $ip);
+        $this->assertNotFalse(inet_pton($ip));
+        $this->assertEquals(4, strlen(inet_pton($ip)));
     }
 
     /**
@@ -131,8 +131,8 @@ public function connectionToRemoteTCP6ServerShouldResultInOurIP()
             throw $e;
         }
 
-        $this->assertFalse(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4), $ip);
-        $this->assertSame($ip, filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6), $ip);
+        $this->assertNotFalse(inet_pton($ip));
+        $this->assertEquals(16, strlen(inet_pton($ip)));
     }
 
     public function testCancelPendingTlsConnectionDuringTlsHandshakeShouldCloseTcpConnectionToServer()

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function connect($uri)`
`39`	`39`	`$connector = $this->connector;`
`40`	`40`
`41`	`41`	`// skip DNS lookup / URI manipulation if this URI already contains an IP`
`42`		`- if (false !== \filter_var($host, \FILTER_VALIDATE_IP)) {`
	`42`	`+ if (@\inet_pton($host) !== false) {`
`43`	`43`	`return $connector->connect($original);`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function connect($uri)`
`50`	`50`	`$host = \trim($parts['host'], '[]');`
`51`	`51`
`52`	`52`	`// skip DNS lookup / URI manipulation if this URI already contains an IP`
`53`		`- if (false !== \filter_var($host, \FILTER_VALIDATE_IP)) {`
	`53`	`+ if (@\inet_pton($host) !== false) {`
`54`	`54`	`return $this->connector->connect($original);`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function connect($uri)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`$ip = \trim($parts['host'], '[]');`
`37`		`- if (false === \filter_var($ip, \FILTER_VALIDATE_IP)) {`
	`37`	`+ if (@\inet_pton($ip) === false) {`
`38`	`38`	`return Promise\reject(new \InvalidArgumentException(`
`39`	`39`	`'Given URI "' . $uri . '" does not contain a valid host IP (EINVAL)',`
`40`	`40`	`\defined('SOCKET_EINVAL') ? \SOCKET_EINVAL : 22`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public function __construct($uri, LoopInterface $loop = null, array $context = a`
`160`	`160`	`);`
`161`	`161`	`}`
`162`	`162`
`163`		`- if (false === \filter_var(\trim($parts['host'], '[]'), \FILTER_VALIDATE_IP)) {`
	`163`	`+ if (@\inet_pton(\trim($parts['host'], '[]')) === false) {`
`164`	`164`	`throw new \InvalidArgumentException(`
`165`	`165`	`'Given URI "' . $uri . '" does not contain a valid host IP (EINVAL)',`
`166`	`166`	`\defined('SOCKET_EINVAL') ? \SOCKET_EINVAL : 22`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function connectionToRemoteTCP4n6ServerShouldResultInOurIP()`
`90`	`90`
`91`	`91`	`$ip = Block\await($this->request('dual.tlund.se', $connector), $loop, self::TIMEOUT);`
`92`	`92`
`93`		`- $this->assertSame($ip, filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 \| FILTER_FLAG_IPV6), $ip);`
	`93`	`+ $this->assertNotFalse(inet_pton($ip));`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`/**`
`@@ -110,8 +110,8 @@ public function connectionToRemoteTCP4ServerShouldResultInOurIP()`
`110`	`110`	`throw $e;`
`111`	`111`	`}`
`112`	`112`
`113`		`- $this->assertSame($ip, filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4), $ip);`
`114`		`- $this->assertFalse(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6), $ip);`
	`113`	`+ $this->assertNotFalse(inet_pton($ip));`
	`114`	`+ $this->assertEquals(4, strlen(inet_pton($ip)));`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`/**`
`@@ -131,8 +131,8 @@ public function connectionToRemoteTCP6ServerShouldResultInOurIP()`
`131`	`131`	`throw $e;`
`132`	`132`	`}`
`133`	`133`
`134`		`- $this->assertFalse(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4), $ip);`
`135`		`- $this->assertSame($ip, filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6), $ip);`
	`134`	`+ $this->assertNotFalse(inet_pton($ip));`
	`135`	`+ $this->assertEquals(16, strlen(inet_pton($ip)));`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`public function testCancelPendingTlsConnectionDuringTlsHandshakeShouldCloseTcpConnectionToServer()`