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

Allow bracket IPv6 address format inside IPAdress Normalizer 

When run with php's build-in server (for instance on localhost:8080), IP provided through $this->server['REMOTE_ADDR'] is [::1], which is not an acceptable format for \inet_pton. This removes the brackets if there's any.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-01-03 10:03:46 +01:00
parent 4d8f2c2418
commit c9b588774b
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,9 @@ class IpAddress {
* @return 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);
for ($i = 128; $i > $maskBits; $i -= 8) {
$j = \intdiv($i, 8) - 1;

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

@ -40,6 +40,10 @@ class IpAddressTest extends TestCase {
'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
'2001:db8:85a3::8a2e:370:7334/128',
],
[
'[::1]',
'::1/128',
],
];
}