upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Use new dependency to normalize IPs

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2022-09-20 12:34:04 +02:00
parent 72f60a6f96
commit be070516a9
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/private/Http/Client/LocalAddressChecker.php
View file

@ -26,6 +26,8 @@ declare(strict_types=1);
namespace OC\Http\Client;
use OCP\ILogger;
use IPLib\Factory;
use IPLib\ParseStringFlag;
use OCP\Http\Client\LocalServerException;
use OC\Http\IpUtils;
@ -38,6 +40,17 @@ class LocalAddressChecker {
}
public function ThrowIfLocalIp(string $ip) : void {
$parsedIp = Factory::parseAddressString(
$ip,
ParseStringFlag::IPV4_MAYBE_NON_DECIMAL | ParseStringFlag::IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED
);
if ($parsedIp === null) {
/* Not an IP */
return;
}
/* Replace by normalized form */
$ip = (string)$parsedIp;
$localRanges = [
'100.64.0.0/10', // See RFC 6598
'192.0.0.0/24', // See RFC 6890