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

feat(ip): use larger IPv6 range by default

Browse source 
Some providers assign `/48` IPv6 blocks instead of `/64` so it sounds safer
to use this mask by default.

Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
This commit is contained in:
Benjamin Gaussorgues 2025-04-08 09:34:43 +02:00
parent ae0bb4eaa2
commit c4021c8d38
No known key found for this signature in database
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/Security/Normalizer/IpAddress.php
View file

@ -24,7 +24,7 @@ class IpAddress {
}
/**
* Return the given subnet for an IPv6 address (64 first bits)
* Return the given subnet for an IPv6 address (48 first bits)
*/
private function getIPv6Subnet(string $ip): string {
if ($ip[0] === '[' && $ip[-1] === ']') { // If IP is with brackets, for example [::1]
@ -36,9 +36,9 @@ class IpAddress {
}
$binary = \inet_pton($ip);
$mask = inet_pton('FFFF:FFFF:FFFF:FFFF::');
$mask = inet_pton('FFFF:FFFF:FFFF::');
return inet_ntop($binary & $mask) . '/64';
return inet_ntop($binary & $mask) . '/48';
}
/**
@ -63,7 +63,7 @@ class IpAddress {
/**
* Gets either the /32 (IPv4) or the /64 (IPv6) subnet of an IP address
* Gets either the /32 (IPv4) or the /48 (IPv6) subnet of an IP address
*/
public function getSubnet(): string {
if (filter_var($this->ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {

10
tests/lib/Security/Normalizer/IpAddressTest.php
View file

@ -36,20 +36,20 @@ class IpAddressTest extends TestCase {
'192.168.0.123/32',
],
[
'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
'2001:db8:85a3::/64',
'2001:0db8:0000:0000:0000:8a2e:0370:7334',
'2001:db8::/48',
],
[
'2001:db8:3333:4444:5555:6666:7777:8888',
'2001:db8:3333:4444::/64',
'2001:db8:3333::/48',
],
[
'::1234:5678',
'::/64',
'::/48',
],
[
'[::1]',
'::/64',
'::/48',
],
];
}