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:
parent
4d8f2c2418
commit
c9b588774b
|
@ -68,6 +68,9 @@ class IpAddress {
|
||||||
* @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;
|
||||||
|
|
|
@ -40,6 +40,10 @@ 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::8a2e:370:7334/128',
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'[::1]',
|
||||||
|
'::1/128',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue