diff options
| author | Josh <josh.t.richards@gmail.com> | 2024-11-04 09:31:48 -0500 |
|---|---|---|
| committer | Josh Richards <josh.t.richards@gmail.com> | 2024-11-07 09:30:06 -0500 |
| commit | fa17ed6fb4401ea991843275773ac521e5271a54 (patch) | |
| tree | 554cebcaee1c52a176019eae056183abe048acf4 | |
| parent | 7ff1654ed3bae0cf0bba9981b0bca7013b2b67f3 (diff) | |
| download | nextcloud-server-backport/49039/stable30.tar.gz nextcloud-server-backport/49039/stable30.zip | |
fix(tests): Add IpAddressClassifier v6 zone ID testbackport/49039/stable30
Signed-off-by: Josh <josh.t.richards@gmail.com>
| -rw-r--r-- | lib/private/Security/Ip/Range.php | 2 | ||||
| -rw-r--r-- | tests/lib/Net/IpAddressClassifierTest.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Security/Ip/Range.php b/lib/private/Security/Ip/Range.php index 4aac3956155..6c8aae4575a 100644 --- a/lib/private/Security/Ip/Range.php +++ b/lib/private/Security/Ip/Range.php @@ -31,7 +31,7 @@ class Range implements IRange { } 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 { diff --git a/tests/lib/Net/IpAddressClassifierTest.php b/tests/lib/Net/IpAddressClassifierTest.php index 616a6872bdb..803be00f740 100644 --- a/tests/lib/Net/IpAddressClassifierTest.php +++ b/tests/lib/Net/IpAddressClassifierTest.php @@ -43,6 +43,7 @@ class IpAddressClassifierTest extends TestCase { return [ ['192.168.0.1'], ['fe80::200:5aee:feaa:20a2'], + ['fe80::1fc4:15d8:78db:2319%enp4s0'], // v6 zone ID ['0:0:0:0:0:ffff:10.0.0.1'], ['0:0:0:0:0:ffff:127.0.0.0'], ['10.0.0.1'], |