From 2b55c8563773748a19fddb32b7fc80a4a085d5f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20B=C3=B6h?= Date: Thu, 31 Oct 2024 21:36:44 +0100 Subject: [PATCH] Fix parsing of IPv6 addresses with zoneid (e.g %host0) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Böh --- lib/private/Net/IpAddressClassifier.php | 2 +- lib/private/Security/Ip/Address.php | 5 +++-- lib/private/Security/Ip/Range.php | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/private/Net/IpAddressClassifier.php b/lib/private/Net/IpAddressClassifier.php index 5f41f4a086aa1..b73d41fd79b7e 100644 --- a/lib/private/Net/IpAddressClassifier.php +++ b/lib/private/Net/IpAddressClassifier.php @@ -34,7 +34,7 @@ class IpAddressClassifier { public function isLocalAddress(string $ip): bool { $parsedIp = Factory::parseAddressString( $ip, - ParseStringFlag::IPV4_MAYBE_NON_DECIMAL | ParseStringFlag::IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED + ParseStringFlag::IPV4_MAYBE_NON_DECIMAL | ParseStringFlag::IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED | ParseStringFlag::MAY_INCLUDE_ZONEID ); if ($parsedIp === null) { /* Not an IP */ diff --git a/lib/private/Security/Ip/Address.php b/lib/private/Security/Ip/Address.php index e0bb906e82d7a..0e94ec2d9ea41 100644 --- a/lib/private/Security/Ip/Address.php +++ b/lib/private/Security/Ip/Address.php @@ -11,6 +11,7 @@ use InvalidArgumentException; use IPLib\Address\AddressInterface; use IPLib\Factory; +use IPLib\ParseStringFlag; use OCP\Security\Ip\IAddress; use OCP\Security\Ip\IRange; @@ -21,7 +22,7 @@ class Address implements IAddress { private readonly AddressInterface $ip; public function __construct(string $ip) { - $ip = Factory::parseAddressString($ip); + $ip = Factory::parseAddressString($ip, ParseStringFlag::MAY_INCLUDE_ZONEID); if ($ip === null) { throw new InvalidArgumentException('Given IP address can’t be parsed'); } @@ -29,7 +30,7 @@ public function __construct(string $ip) { } public static function isValid(string $ip): bool { - return Factory::parseAddressString($ip) !== null; + return Factory::parseAddressString($ip, ParseStringFlag::MAY_INCLUDE_ZONEID) !== null; } public function matches(IRange ... $ranges): bool { diff --git a/lib/private/Security/Ip/Range.php b/lib/private/Security/Ip/Range.php index 39c03677f8100..e32b7a5abc095 100644 --- a/lib/private/Security/Ip/Range.php +++ b/lib/private/Security/Ip/Range.php @@ -10,6 +10,7 @@ use InvalidArgumentException; use IPLib\Factory; +use IPLib\ParseStringFlag; use IPLib\Range\RangeInterface; use OCP\Security\Ip\IAddress; use OCP\Security\Ip\IRange; @@ -30,7 +31,7 @@ public static function isValid(string $range): bool { } public function contains(IAddress $address): bool { - return $this->range->contains(Factory::parseAddressString((string)$address)); + return $this->range->contains(Factory::parseAddressString((string)$address, ParseStringFlag::MAY_INCLUDE_ZONEID)); } public function __toString(): string {