X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FHTTPSignature.php;h=9e130bc9166b00d86aaa7f0a3df1bcdaaa41e3cb;hb=d4a5a8051ad34a7be72238967afb3e6b140afdc8;hp=84219b31148c499fdc2f1c52f97f3d3b6445dfdf;hpb=319857edaa1257c885ce7f3a91ee168b95feee10;p=friendica.git

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 84219b3114..9e130bc916 100644
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.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,11 +22,13 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
+use Friendica\Model\GServer;
 use Friendica\Model\ItemURI;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
@@ -332,21 +334,26 @@ class HTTPSignature
 	 * @param string  $url     The URL of the inbox
 	 * @param boolean $success Transmission status
 	 * @param boolean $shared  The inbox is a shared inbox
+	 * @param int     $gsid    Server ID
 	 * @throws \Exception
 	 */
-	static public function setInboxStatus(string $url, bool $success, bool $shared = false)
+	static public function setInboxStatus(string $url, bool $success, bool $shared = false, int $gsid = null)
 	{
 		$now = DateTimeFormat::utcNow();
 
 		$status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
 		if (!DBA::isResult($status)) {
 			$insertFields = ['url' => $url, 'uri-id' => ItemURI::getIdByURI($url), 'created' => $now, 'shared' => $shared];
-			if (!DBA::insert('inbox-status', $insertFields, Database::INSERT_IGNORE)) {
-				Logger::warning('Unable to insert inbox-status row', $insertFields);
-				return;
+			if (!empty($gsid)) {
+				$insertFields['gsid'] = $gsid;
 			}
+			DBA::insert('inbox-status', $insertFields, Database::INSERT_IGNORE);
 
 			$status = DBA::selectFirst('inbox-status', [], ['url' => $url]);
+			if (empty($status)) {
+				Logger::warning('Unable to insert inbox-status row', $insertFields);
+				return;
+			}
 		}
 
 		if ($success) {
@@ -355,6 +362,10 @@ class HTTPSignature
 			$fields = ['failure' => $now];
 		}
 
+		if (!empty($gsid)) {
+			$fields['gsid'] = $gsid;
+		}
+
 		if ($status['failure'] > DBA::NULL_DATETIME) {
 			$new_previous_stamp = strtotime($status['failure']);
 			$old_previous_stamp = strtotime($status['previous']);
@@ -390,6 +401,14 @@ class HTTPSignature
 		}
 
 		DBA::update('inbox-status', $fields, ['url' => $url]);
+
+		if (!empty($status['gsid'])) {
+			if ($success) {
+				GServer::setReachableById($status['gsid'], Protocol::ACTIVITYPUB);
+			} elseif ($status['shared']) {
+				GServer::setFailureById($status['gsid']);
+			}
+		}
 	}
 
 	/**
@@ -401,15 +420,21 @@ class HTTPSignature
 	 * @return array JSON array
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function fetch(string $request, int $uid): array
+	public static function fetch(string $request, int $uid = 0): array
 	{
-		$curlResult = self::fetchRaw($request, $uid);
+		try {
+			$curlResult = self::fetchRaw($request, $uid);
+		} catch (\Exception $exception) {
+			Logger::notice('Error fetching url', ['url' => $request, 'exception' => $exception]);
+			return [];
+		}
 
 		if (empty($curlResult)) {
 			return [];
 		}
 
 		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
+			Logger::debug('Fetching was unsuccessful', ['url' => $request, 'return-code' => $curlResult->getReturnCode(), 'error-number' => $curlResult->getErrorNumber(), 'error' => $curlResult->getError()]);
 			return [];
 		}
 
@@ -427,7 +452,7 @@ class HTTPSignature
 	 * @param string  $request request url
 	 * @param integer $uid     User id of the requester
 	 * @param boolean $binary  TRUE if asked to return binary results (file download) (default is "false")
-	 * @param array   $opts    (optional parameters) assoziative array with:
+	 * @param array   $opts    (optional parameters) associative array with:
 	 *                         'accept_content' => supply Accept: header with 'accept_content' as the value
 	 *                         'timeout' => int Timeout in seconds, default system config value or 60 seconds
 	 *                         'nobody' => only return the header
@@ -603,7 +628,7 @@ class HTTPSignature
 		}
 
 		if (empty($algorithm)) {
-			Logger::info('No alagorithm');
+			Logger::info('No algorithm');
 			return false;
 		}