X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FHTTPSignature.php;h=9e130bc9166b00d86aaa7f0a3df1bcdaaa41e3cb;hb=d4a5a8051ad34a7be72238967afb3e6b140afdc8;hp=9f732acb6e1725aa9bbe5fb3be3ca510b677ea74;hpb=e90ad0c1cd24d88d428965c20829d2912e2e20a0;p=friendica.git diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index 9f732acb6e..9e130bc916 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -1,6 +1,6 @@ getReturnCode(); return ($return_code >= 200) && ($return_code <= 299); @@ -340,15 +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)) { - DBA::insert('inbox-status', ['url' => $url, 'uri-id' => ItemURI::getIdByURI($url), 'created' => $now, 'shared' => $shared], Database::INSERT_IGNORE); + $insertFields = ['url' => $url, 'uri-id' => ItemURI::getIdByURI($url), 'created' => $now, 'shared' => $shared]; + 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) { @@ -357,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']); @@ -392,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']); + } + } } /** @@ -403,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 []; } @@ -429,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 @@ -485,6 +508,31 @@ class HTTPSignature return $curlResult; } + /** + * Fetch the apcontact entry of the keyId in the given header + * + * @param array $http_headers + * + * @return array APContact entry + */ + public static function getKeyIdContact(array $http_headers): array + { + if (empty($http_headers['HTTP_SIGNATURE'])) { + Logger::debug('No HTTP_SIGNATURE header', ['header' => $http_headers]); + return []; + } + + $sig_block = self::parseSigHeader($http_headers['HTTP_SIGNATURE']); + + if (empty($sig_block['keyId'])) { + Logger::debug('No keyId', ['sig_block' => $sig_block]); + return []; + } + + $url = (strpos($sig_block['keyId'], '#') ? substr($sig_block['keyId'], 0, strpos($sig_block['keyId'], '#')) : $sig_block['keyId']); + return APContact::getByURL($url); + } + /** * Gets a signer from a given HTTP request * @@ -508,7 +556,7 @@ class HTTPSignature return false; } - $actor = JsonLD::fetchElement($object, 'actor', 'id'); + $actor = JsonLD::fetchElement($object, 'actor', 'id') ?? ''; } else { $actor = ''; } @@ -580,7 +628,7 @@ class HTTPSignature } if (empty($algorithm)) { - Logger::info('No alagorithm'); + Logger::info('No algorithm'); return false; }