Issue 10747: Improved check for blocked domains

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 13add7e658939fdd92b9d6871eaf537aebe86c4b..a919a67f30e740c88d1e2e13b7d5bd73be34a9ae 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -119,7 +119,8 @@ class APContact
         */
        public static function getByURL($url, $update = null)
        {
-               if (empty($url)) {
+               if (empty($url) || Network::isUrlBlocked($url)) {
+                       Logger::info('Domain is blocked', ['url' => $url]);
                        return [];
                }
 

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index bb805b2d051f71a0386c13609c084ea0889310e8..4aa50b4be5a71b91438ab7025192a106314e6349 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -231,6 +231,11 @@ class Probe
                        }
                }
 
+               if (Network::isUrlBlocked($host_url)) {
+                       Logger::info('Domain is blocked', ['url' => $host]);
+                       return [];
+               }
+
                self::$baseurl = $host_url;
 
                Logger::info('Probing successful', ['host' => $host]);
@@ -625,6 +630,11 @@ class Probe
         */
        private static function getWebfinger(string $template, string $type, string $uri, string $addr)
        {
+               if (Network::isUrlBlocked($template)) {
+                       Logger::info('Domain is blocked', ['url' => $template]);
+                       return [];
+               }
+
                // First try the address because this is the primary purpose of webfinger
                if (!empty($addr)) {
                        $detected = $addr;