Merge remote-tracking branch 'upstream/2022.05-rc' into move-to-avatar-cache

src/Object/Image.php

@@ -159,15 +159,24 @@ class Image
 		}
 
 		$this->valid = false;
-		$this->image = @imagecreatefromstring($data);
+		try {
-		if ($this->image !== false) {
+			$this->image = @imagecreatefromstring($data);
-			$this->width  = imagesx($this->image);
+			if ($this->image !== false) {
-			$this->height = imagesy($this->image);
+				$this->width  = imagesx($this->image);
-			$this->valid  = true;
+				$this->height = imagesy($this->image);
-			imagealphablending($this->image, false);
+				$this->valid  = true;
-			imagesavealpha($this->image, true);
+				imagealphablending($this->image, false);
+				imagesavealpha($this->image, true);
 
-			return true;
+				return true;
+			}
+		} catch (\Throwable $error) {
+			/** @see https://github.com/php/doc-en/commit/d09a881a8e9059d11e756ee59d75bf404d6941ed */
+			if (strstr($error->getMessage(), "gd-webp cannot allocate temporary buffer")) {
+				DI::logger()->notice('Image is probably animated and therefore unsupported', ['error' => $error]);
+			} else {
+				DI::logger()->warning('Unexpected throwable.', ['error' => $error]);
+			}
 		}
 
 		return false;

src/Protocol/ActivityPub/Delivery.php

@@ -22,6 +22,7 @@
 namespace Friendica\Protocol\ActivityPub;
 
 use Friendica\Core\Logger;
+use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\GServer;
@@ -32,6 +33,12 @@ use Friendica\Worker\Delivery as WorkerDelivery;
 
 class Delivery
 {
+	/**
+	 * Deliver posts to the given inbox
+	 *
+	 * @param string $inbox
+	 * @return array with the elements "success" and "uri_ids" of the failed posts
+	 */
 	public static function deliver(string $inbox): array
 	{
 		$uri_ids    = [];
@@ -50,7 +57,7 @@ class Delivery
 				}
 			}
 
-			if ($serverfail || !$result['success']) {
+			if ($serverfail || (!$result['success'] && !$result['drop'])) {
 				$uri_ids[] = $post['uri-id'];
 			}
 		}
@@ -59,6 +66,17 @@ class Delivery
 		return ['success' => empty($uri_ids), 'uri_ids' => $uri_ids];
 	}
 
+	/**
+	 * Deliver the given post to the given inbox
+	 *
+	 * @param string $cmd
+	 * @param integer $item_id
+	 * @param string $inbox
+	 * @param integer $uid
+	 * @param array $receivers
+	 * @param integer $uri_id
+	 * @return array
+	 */
 	public static function deliverToInbox(string $cmd, int $item_id, string $inbox, int $uid, array $receivers, int $uri_id): array
 	{
 		if (empty($item_id) && !empty($uri_id) && !empty($uid)) {
@@ -74,6 +92,7 @@ class Delivery
 
 		$success    = true;
 		$serverfail = false;
+		$drop       = false;
 
 		if ($cmd == WorkerDelivery::MAIL) {
 			$data = ActivityPub\Transmitter::createActivityFromMail($item_id);
@@ -99,20 +118,42 @@ class Delivery
 				$success    = $response->isSuccess();
 				$serverfail = $response->isTimeout();
 				if (!$success) {
+					// 5xx errors are problems on the server. We don't need to continue delivery then.
 					if (!$serverfail && ($response->getReturnCode() >= 500) && ($response->getReturnCode() <= 599)) {
 						$serverfail = true;
 					}
 
+					// A 404 means that the inbox doesn't exist. We can stop the delivery here.
+					if (!$serverfail && ($response->getReturnCode() == 404)) {
+						$serverfail = true;
+					}
+
 					$xrd_timeout = DI::config()->get('system', 'xrd_timeout');
 					if (!$serverfail && $xrd_timeout && ($runtime > $xrd_timeout)) {
 						$serverfail = true;
 					}
+
 					$curl_timeout = DI::config()->get('system', 'curl_timeout');
 					if (!$serverfail && $curl_timeout && ($runtime > $curl_timeout)) {
 						$serverfail = true;
 					}
 
-					Logger::info('Delivery failed', ['retcode' => $response->getReturnCode(), 'serverfailure' => $serverfail, 'runtime' => round($runtime, 3), 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]);
+					// Resubscribe to relay server upon client error
+					if (!$serverfail && ($response->getReturnCode() >= 400) && ($response->getReturnCode() <= 499)) {
+						$actor = self:: fetchActorForRelayInbox($inbox);
+						if (!empty($actor)) {
+							$drop = !ActivityPub\Transmitter::sendRelayFollow($actor);
+							Logger::notice('Resubscribed to relay', ['url' => $actor, 'success' => !$drop]);
+						} elseif ($cmd = WorkerDelivery::DELETION) {
+							// Remote systems not always accept our deletion requests, so we drop them if rejected.
+							// Situation is: In Friendica we allow the thread owner to delete foreign comments to their thread.
+							// Most AP systems don't allow this, so they will reject the deletion request.
+							$drop = true;
+						}
+
+					}
+
+					Logger::info('Delivery failed', ['retcode' => $response->getReturnCode(), 'serverfailure' => $serverfail, 'drop' => $drop, 'runtime' => round($runtime, 3), 'uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox]);
 				}
 				if ($uri_id) {
 					if ($success) {
@@ -126,15 +167,35 @@ class Delivery
 
 		self::setSuccess($receivers, $success);
 
-		Logger::debug('Delivered', ['uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox, 'success' => $success]);
+		Logger::debug('Delivered', ['uri-id' => $uri_id, 'uid' => $uid, 'item_id' => $item_id, 'cmd' => $cmd, 'inbox' => $inbox, 'success' => $success, 'serverfailure' => $serverfail, 'drop' => $drop]);
 
-		if ($success && in_array($cmd, [WorkerDelivery::POST])) {
+		if (($success || $drop) && in_array($cmd, [WorkerDelivery::POST])) {
 			Post\DeliveryData::incrementQueueDone($uri_id, Post\DeliveryData::ACTIVITYPUB);
 		}
 
-		return ['success' => $success, 'serverfailure' => $serverfail];
+		return ['success' => $success, 'serverfailure' => $serverfail, 'drop' => $drop];
 	}
 
+	/**
+	 * Fetch the actor of the given inbox of an relay server
+	 *
+	 * @param string $inbox
+	 * @return string
+	 */
+	private static function fetchActorForRelayInbox(string $inbox): string
+	{
+		$apcontact = DBA::selectFirst('apcontact', ['url'], ["`sharedinbox` = ? AND `type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)",
+			$inbox, 'Application', 0, Contact::FRIEND]);
+		return $apcontact['url'] ?? '';
+	}
+
+	/**
+	 * mark or unmark the given receivers for archival upon succoess
+	 *
+	 * @param array $receivers
+	 * @param boolean $success
+	 * @return void
+	 */
 	private static function setSuccess(array $receivers, bool $success)
 	{
 		$gsid = null;

src/Protocol/Relay.php

@@ -341,4 +341,15 @@ class Relay
 		// It should never happen that we arrive here
 		return [];
 	}
+
+	/**
+	 * Resubscribe to all relay servers
+	 */
+	public static function reSubscribe()
+	{
+		foreach (self::getList() as $server) {
+			$success = ActivityPub\Transmitter::sendRelayFollow($server['url']);
+			Logger::debug('Resubscribed', ['profile' => $server['url'], 'success' => $success]);
+		}	
+	}
 }

src/Worker/APDelivery.php

@@ -66,14 +66,16 @@ class APDelivery
 		if (empty($uri_id)) {
 			$result  = ActivityPub\Delivery::deliver($inbox);
 			$success = $result['success'];
+			$drop    = false;
 			$uri_ids = $result['uri_ids'];
 		} else {
 			$result  = ActivityPub\Delivery::deliverToInbox($cmd, $item_id, $inbox, $uid, $receivers, $uri_id);
 			$success = $result['success'];
+			$drop    = $result['drop'];
 			$uri_ids = [$uri_id];
 		}
 
-		if (!$success && !Worker::defer() && !empty($uri_ids)) {
+		if (!$drop && !$success && !Worker::defer() && !empty($uri_ids)) {
 			foreach ($uri_ids as $uri_id) {
 				Post\Delivery::remove($uri_id, $inbox);
 				Post\DeliveryData::incrementQueueFailed($uri_id);

src/Worker/Cron.php

@@ -27,6 +27,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Tag;
+use Friendica\Protocol\Relay;
 
 class Cron
 {
@@ -125,6 +126,9 @@ class Cron
 			}
 	
 			DI::config()->set('system', 'last_cron_daily', time());
+
+			// Resubscribe to relay servers
+			Relay::reSubscribe();
 		}
 
 		Logger::notice('end');