X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FUpdateGServer.php;h=4b4e40d7666cadb639788c6c7d9123b96be3d749;hb=4139134cfd2f86ba6fec2adef37bca16ab466514;hp=1085c467c7b9df2645256f91d769a80a65a7d04f;hpb=322b7c856ca9ba53bd9c7da50dd5c1e3c9197d56;p=friendica.git

diff --git a/src/Worker/UpdateGServer.php b/src/Worker/UpdateGServer.php
index 1085c467c7..4b4e40d766 100644
--- a/src/Worker/UpdateGServer.php
+++ b/src/Worker/UpdateGServer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,18 +22,26 @@
 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
 {
 	/**
 	 * Update the given server
+	 *
 	 * @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;
@@ -41,22 +49,48 @@ class UpdateGServer
 
 		$filtered = filter_var($server_url, FILTER_SANITIZE_URL);
 		if (substr(Strings::normaliseLink($filtered), 0, 7) != 'http://') {
-			GServer::setFailure($server_url);
+			GServer::setFailureByUrl($server_url);
+			return;
+		}
+
+		// Silently dropping the worker task if the server domain is blocked
+		if (Network::isUrlBlocked($filtered)) {
+			GServer::setBlockedByUrl($filtered);
 			return;
 		}
 
 		if (($filtered != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
-			GServer::setFailure($server_url);
+			GServer::setFailureByUrl($server_url);
 			return;
 		}
 
 		$cleaned = GServer::cleanURL($server_url);
 		if (($cleaned != $server_url) && DBA::exists('gserver', ['nurl' => Strings::normaliseLink($server_url)])) {
-			GServer::setFailure($server_url);
+			GServer::setFailureByUrl($server_url);
 			return;
 		}
 
 		$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)) {
+			GServer::setBlockedByUrl($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);
+	}
 }