Drop UpdateGServer worker task if domain is blocked

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 9e32c7b0cb7e6a01b650256b39afd373ce59efa3..a3a3d1abbc6bcb94390a2ebaea48d975e60b5ace 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -44,6 +44,7 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use Friendica\Network\HTTPException;
+use Friendica\Worker\UpdateGServer;
 use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\UriInterface;
 
@@ -100,11 +101,11 @@ class GServer
         */
        public static function add(string $url, bool $only_nodeinfo = false)
        {
-               if (self::getID($url, false)) {
+               if (self::getID($url)) {
                        return;
                }
 
-               Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $url, $only_nodeinfo);
+               UpdateGServer::add(Worker::PRIORITY_LOW, $url, $only_nodeinfo);
        }
 
        /**
@@ -192,8 +193,9 @@ class GServer
                        return false;
                } else {
                        if (strtotime($gserver['next_contact']) < time()) {
-                               Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['url'], false);
+                               UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
                        }
+
                        return self::isDefunct($gserver);
                }
        }
@@ -211,8 +213,9 @@ class GServer
                        return true;
                } else {
                        if (strtotime($gserver['next_contact']) < time()) {
-                               Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['url'], false);
+                               UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
                        }
+
                        return !$gserver['failed'] && in_array($gserver['network'], Protocol::FEDERATED);
                }
        }
@@ -253,7 +256,7 @@ class GServer
                }
 
                if (!empty($server) && (empty($gserver) || strtotime($gserver['next_contact']) < time())) {
-                       Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $server, false);
+                       UpdateGServer::add(Worker::PRIORITY_LOW, $server);
                }
 
                return $reachable;
@@ -376,7 +379,7 @@ class GServer
                        Logger::info('Reset failed status for server', ['url' => $gserver['url']]);
 
                        if (strtotime($gserver['next_contact']) < time()) {
-                               Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['url'], false);
+                               UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
                        }
                }
        }
@@ -394,7 +397,7 @@ class GServer
                        Logger::info('Set failed status for server', ['url' => $gserver['url']]);
 
                        if (strtotime($gserver['next_contact']) < time()) {
-                               Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['url'], false);
+                               UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url']);
                        }
                }
        }

diff --git a/src/Worker/UpdateGServer.php b/src/Worker/UpdateGServer.php
index 9b111fceda5f5c61be0acf24a5204159638e9732..f6f33113f3ffacf9ca5c30a779a0af27c093cccd 100644 (file)
--- a/src/Worker/UpdateGServer.php
+++ b/src/Worker/UpdateGServer.php
@@ -22,9 +22,14 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
+use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\GServer;
+use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
+use GuzzleHttp\Psr7\Uri;
+use Psr\Http\Message\UriInterface;
 
 class UpdateGServer
 {
@@ -34,8 +39,9 @@ class UpdateGServer
         * @param string  $server_url    Server URL
         * @param boolean $only_nodeinfo Only use nodeinfo for server detection
         * @return void
+        * @throws \Exception
         */
-       public static function execute(string $server_url, bool $only_nodeinfo = false)
+       public static function execute(string $server_url, bool $only_nodeinfo)
        {
                if (empty($server_url)) {
                        return;
@@ -47,6 +53,11 @@ class UpdateGServer
                        return;
                }
 
+               // Silently dropping the worker task if the server domain is blocked
+               if (Network::isUrlBlocked($filtered)) {
+                       return;
+               }
+
                if (($filtered != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
                        GServer::setFailureByUrl($server_url);
                        return;
@@ -61,4 +72,23 @@ class UpdateGServer
                $ret = GServer::check($filtered, '', true, $only_nodeinfo);
                Logger::info('Updated gserver', ['url' => $filtered, 'result' => $ret]);
        }
+
+       /**
+        * @param array|int $run_parameters Priority constant or array of options described in Worker::add
+        * @param string    $serverUrl
+        * @param bool      $onlyNodeInfo   Only use NodeInfo for server detection
+        * @return int
+        * @throws InternalServerErrorException
+        */
+       public static function add($run_parameters, string $serverUrl, bool $onlyNodeInfo = false): int
+       {
+               // Dropping the worker task if the server domain is blocked
+               if (Network::isUrlBlocked($serverUrl)) {
+                       return 0;
+               }
+
+               // We have to convert the Uri back to string because worker parameters are saved in JSON format which
+               // doesn't allow for structured objects.
+               return Worker::add($run_parameters, 'UpdateGServer', $serverUrl, $onlyNodeInfo);
+       }
 }

diff --git a/src/Worker/UpdateGServers.php b/src/Worker/UpdateGServers.php
index ef76ca9bf5b9de604b3a9ccc82617572cfd5f3c6..12f3ff10e15a0148f40135a2879014f6f0324d59 100644 (file)
--- a/src/Worker/UpdateGServers.php
+++ b/src/Worker/UpdateGServers.php
@@ -27,6 +27,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
+use GuzzleHttp\Psr7\Uri;
 
 class UpdateGServers
 {
@@ -63,12 +64,12 @@ class UpdateGServers
                        // There are duplicated "url" but not "nurl". So we check both addresses instead of just overwriting them,
                        // since that would mean loosing data.
                        if (!empty($gserver['url'])) {
-                               if (Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['url'])) {
+                               if (UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['url'])) {
                                        $count++;
                                }
                        }
                        if (!empty($gserver['nurl']) && ($gserver['nurl'] != Strings::normaliseLink($gserver['url']))) {
-                               if (Worker::add(Worker::PRIORITY_LOW, 'UpdateGServer', $gserver['nurl'])) {
+                               if (UpdateGServer::add(Worker::PRIORITY_LOW, $gserver['nurl'])) {
                                        $count++;
                                }
                        }