Browse Source

Merge pull request #13327 from nextcloud/allow-bracket-notation-for-remove-ipv6-address

Allow bracket IPv6 address format inside IPAdress Normalizer
tags/v16.0.0beta1
Morris Jobke 5 years ago
parent
commit
d004164fcc
No account linked to committer's email address

+ 3
- 0
lib/private/Security/Normalizer/IpAddress.php View File

* @return string * @return string
*/ */
private function getIPv6Subnet(string $ip, int $maskBits = 48): string { private function getIPv6Subnet(string $ip, int $maskBits = 48): string {
if ($ip[0] === '[' && $ip[-1] === ']') { // If IP is with brackets, for example [::1]
$ip = substr($ip, 1, strlen($ip) - 2);
}
$binary = \inet_pton($ip); $binary = \inet_pton($ip);
for ($i = 128; $i > $maskBits; $i -= 8) { for ($i = 128; $i > $maskBits; $i -= 8) {
$j = \intdiv($i, 8) - 1; $j = \intdiv($i, 8) - 1;

+ 4
- 0
tests/lib/Security/Normalizer/IpAddressTest.php View File

'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::8a2e:370:7334/128',
], ],
[
'[::1]',
'::1/128',
],
]; ];
} }



Loading…
Cancel
Save