mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #26513 from nextcloud/backport/26439/stable19 

[stable19] Increase subnet matcher
This commit is contained in:
Roeland Jago Douma 2021-04-12 13:32:32 +02:00 committed by GitHub
parent 0de63d7751 a55715d9ed
commit 248efed7fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Security/Normalizer/IpAddress.php
View File

@ -92,7 +92,7 @@ class IpAddress {
} }
/** /**
* Gets either the /32 (IPv4) or the /128 (IPv6) subnet of an IP address * Gets either the /32 (IPv4) or the /64 (IPv6) subnet of an IP address
* *
* @return string * @return string
*/ */
@ -105,7 +105,7 @@ class IpAddress {
} }
return $this->getIPv6Subnet( return $this->getIPv6Subnet(
$this->ip, $this->ip,
128 64
); );
} }

12
tests/lib/Security/Normalizer/IpAddressTest.php
View File

@ -37,11 +37,19 @@ class IpAddressTest extends TestCase {
], ],
[ [
'2001:0db8:85a3:0000:0000:8a2e:0370:7334', '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
'2001:db8:85a3::8a2e:370:7334/128', '2001:db8:85a3::/64',
],
[
'2001:db8:3333:4444:5555:6666:7777:8888',
'2001:db8:3333:4444::/64',
],
[
'::1234:5678',
'::/64',
], ],
[ [
'[::1]', '[::1]',
'::1/128', '::/64',
], ],
]; ];
} }