From 27a31cdaf156795b3af70c341e8a5910590dfdfd Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 12 Dec 2019 10:05:36 +0100 Subject: [PATCH] Support more IPv6 addresses in the RefreshWebcalJob Signed-off-by: Georg Ehrke --- apps/dav/lib/BackgroundJob/RefreshWebcalJob.php | 11 +++++++++++ .../tests/unit/BackgroundJob/RefreshWebcalJobTest.php | 2 ++ 2 files changed, 13 insertions(+) diff --git a/apps/dav/lib/BackgroundJob/RefreshWebcalJob.php b/apps/dav/lib/BackgroundJob/RefreshWebcalJob.php index 3d0be2af9b..1c0d185e90 100644 --- a/apps/dav/lib/BackgroundJob/RefreshWebcalJob.php +++ b/apps/dav/lib/BackgroundJob/RefreshWebcalJob.php @@ -251,6 +251,17 @@ class RefreshWebcalJob extends Job { $this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules"); return null; } + + // Also check for IPv6 IPv4 nesting, because that's not covered by filter_var + if ((bool)filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && substr_count($host, '.') > 0) { + $delimiter = strrpos($host, ':'); // Get last colon + $ipv4Address = substr($host, $delimiter + 1); + + if (!filter_var($ipv4Address, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) { + $this->logger->warning("Subscription $subscriptionId was not refreshed because it violates local access rules"); + return null; + } + } } try { diff --git a/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php b/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php index 2d8d604212..088a723037 100644 --- a/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php +++ b/apps/dav/tests/unit/BackgroundJob/RefreshWebcalJobTest.php @@ -241,6 +241,8 @@ class RefreshWebcalJobTest extends TestCase { ['172.16.42.1'], ['[fdf8:f53b:82e4::53]/secret.ics'], ['[fe80::200:5aee:feaa:20a2]/secret.ics'], + ['[0:0:0:0:0:0:10.0.0.1]/secret.ics'], + ['[0:0:0:0:0:ffff:127.0.0.0]/secret.ics'], ['10.0.0.1'], ['another-host.local'], ['service.localhost'],