From f2d3e34c96ded153a095508f4dcd4fc76d9a9a8c Mon Sep 17 00:00:00 2001
From: Konrad Bucheli <kb@open.ch>
Date: Tue, 10 Dec 2019 22:16:03 +0100
Subject: [PATCH] handle IPv6 addresses with an explict incoming interface at
the end (e.g fe80::ae2d:d1e7:fe1e:9a8d%enp2s0)
Signed-off-by: Konrad Bucheli <konrad.bucheli@gmx.ch>
Signed-off-by: Konrad Bucheli <kb@open.ch>
---
lib/private/Security/Normalizer/IpAddress.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/private/Security/Normalizer/IpAddress.php b/lib/private/Security/Normalizer/IpAddress.php
index 3bac6d8b103..8fb7b1003c4 100644
--- a/lib/private/Security/Normalizer/IpAddress.php
+++ b/lib/private/Security/Normalizer/IpAddress.php
@@ -75,6 +75,10 @@ class IpAddress {
if ($ip[0] === '[' && $ip[-1] === ']') { // If IP is with brackets, for example [::1]
$ip = substr($ip, 1, strlen($ip) - 2);
}
+ $pos = strpos($ip, '%'); // if there is an explicit interface added to the IP, e.g. fe80::ae2d:d1e7:fe1e:9a8d%enp2s0
+ if ($pos !== false) {
+ $ip = substr($ip, 0, $pos-1);
+ }
$binary = \inet_pton($ip);
for ($i = 128; $i > $maskBits; $i -= 8) {
$j = \intdiv($i, 8) - 1;
--
GitLab