Skip to content

[stable30] fix(net/security): Handle IPv6 zone IDs in link-local addresses #49107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 5 commits into from
Nov 8, 2024
Merged

[stable30] fix(net/security): Handle IPv6 zone IDs in link-local addresses #49107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b059bc9
fix(security): Handle IPv6 zone IDs used in link-local addresses
joshtrichards Oct 31, 2024
5fd9c03
fix(security): Handle IPv6 zone IDs used in link-local addresses
joshtrichards Oct 31, 2024
e7fa55d
fix(net): Add IPv6 zone handling to IpAddressClassifier
joshtrichards Oct 31, 2024
7ff1654
fix(tests): Add RemoteAddress v6 zone ID test
joshtrichards Nov 4, 2024
fa17ed6
fix(tests): Add IpAddressClassifier v6 zone ID test
joshtrichards Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/Net/IpAddressClassifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions lib/private/Security/Ip/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -21,15 +22,15 @@ 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');
}
$this->ip = $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 {
Expand Down
3 changes: 2 additions & 1 deletion lib/private/Security/Ip/Range.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions tests/lib/Net/IpAddressClassifierTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public function localIpAddressData(): array {
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'],
Expand Down
2 changes: 2 additions & 0 deletions tests/lib/Security/Ip/RemoteAddressTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public function dataProvider(): array {
// No configuration
['1.2.3.4', false, true],
['1234:4567:8910::', false, true],
// v6 Zone ID
['fe80::1fc4:15d8:78db:2319%enp4s0', false, true],
// Empty configuration
['1.2.3.4', [], true],
['1234:4567:8910::', [], true],
Expand Down
Loading