Deprecate passing null as $requestIp to IpUtils::checkIp(), checkIp4() and checkIp6()

W0rma · W0rma · commit 325749dc814e · 2021-10-15T19:19:33.000+02:00
diff --git a/NoPrivateNetworkHttpClient.php b/NoPrivateNetworkHttpClient.php
@@ -80,7 +80,7 @@ public function request(string $method, string $url, array $options = []): Respo
 
         $options['on_progress'] = function (int $dlNow, int $dlSize, array $info) use ($onProgress, $subnets, &$lastPrimaryIp): void {
             if ($info['primary_ip'] !== $lastPrimaryIp) {
-                if (IpUtils::checkIp($info['primary_ip'], $subnets ?? self::PRIVATE_SUBNETS)) {
+                if ($info['primary_ip'] && IpUtils::checkIp($info['primary_ip'], $subnets ?? self::PRIVATE_SUBNETS)) {
                     throw new TransportException(sprintf('IP "%s" is blocked for "%s".', $info['primary_ip'], $info['url']));
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function request(string $method, string $url, array $options = []): Respo`
`80`	`80`
`81`	`81`	`$options['on_progress'] = function (int $dlNow, int $dlSize, array $info) use ($onProgress, $subnets, &$lastPrimaryIp): void {`
`82`	`82`	`if ($info['primary_ip'] !== $lastPrimaryIp) {`
`83`		`- if (IpUtils::checkIp($info['primary_ip'], $subnets ?? self::PRIVATE_SUBNETS)) {`
	`83`	`+ if ($info['primary_ip'] && IpUtils::checkIp($info['primary_ip'], $subnets ?? self::PRIVATE_SUBNETS)) {`
`84`	`84`	`throw new TransportException(sprintf('IP "%s" is blocked for "%s".', $info['primary_ip'], $info['url']));`
`85`	`85`	`}`
`86`	`86`