X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FHTTPSignature.php;h=1d57f5ea8095ff791750f6eec2e2ff875d715735;hb=46cd39fb34613f4b331793f19c0e562f93125066;hp=3e22820e5c4e96349035b8561c8773e147d15285;hpb=ff83c170a64fab2aa1d25a4b6a45786539dd397e;p=friendica.git diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index 3e22820e5c..1d57f5ea80 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -1,6 +1,6 @@ post($target, $content, $headers); + $postResult = DI::httpClient()->post($target, $content, $headers, DI::config()->get('system', 'curl_timeout')); $return_code = $postResult->getReturnCode(); Logger::info('Transmit to ' . $target . ' returned ' . $return_code); - $success = ($return_code >= 200) && ($return_code <= 299); + self::setInboxStatus($target, ($return_code >= 200) && ($return_code <= 299)); + + return $postResult; + } - self::setInboxStatus($target, $success); + /** + * Transmit given data to a target for a user + * + * @param array $data Data that is about to be sent + * @param string $target The URL of the inbox + * @param array $owner Sender owner-vew record + * + * @return boolean Was the transmission successful? + */ + public static function transmit(array $data, string $target, array $owner): bool + { + $postResult = self::post($data, $target, $owner); + $return_code = $postResult->getReturnCode(); - return $success; + return ($return_code >= 200) && ($return_code <= 299); } /** @@ -321,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($url, $success, $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, '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) { @@ -338,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']); @@ -368,7 +396,19 @@ class HTTPSignature $fields['archive'] = false; } + if (empty($status['uri-id'])) { + $fields['uri-id'] = ItemURI::getIdByURI($url); + } + 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']); + } + } } /** @@ -380,21 +420,26 @@ class HTTPSignature * @return array JSON array * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function fetch($request, $uid) + public static function fetch(string $request, int $uid): 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 false; + return []; } if (!$curlResult->isSuccess() || empty($curlResult->getBody())) { - return false; + return []; } $content = json_decode($curlResult->getBody(), true); if (empty($content) || !is_array($content)) { - return false; + return []; } return $content; @@ -415,7 +460,7 @@ class HTTPSignature * @return \Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses CurlResult * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => ['application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"']]) + public static function fetchRaw(string $request, int $uid = 0, array $opts = [HttpClientOptions::ACCEPT_CONTENT => [HttpClientAccept::JSON_AS]]) { $header = []; @@ -453,7 +498,7 @@ class HTTPSignature if (!empty($opts['nobody'])) { $curlResult = DI::httpClient()->head($request, $curl_opts); } else { - $curlResult = DI::httpClient()->get($request, $curl_opts); + $curlResult = DI::httpClient()->get($request, HttpClientAccept::JSON_AS, $curl_opts); } $return_code = $curlResult->getReturnCode(); @@ -462,16 +507,41 @@ 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 * - * @param $content - * @param $http_headers + * @param string $content + * @param array $http_headers * - * @return string Signer + * @return string|null|false Signer * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function getSigner($content, $http_headers) + public static function getSigner(string $content, array $http_headers) { if (empty($http_headers['HTTP_SIGNATURE'])) { Logger::debug('No HTTP_SIGNATURE header'); @@ -485,7 +555,7 @@ class HTTPSignature return false; } - $actor = JsonLD::fetchElement($object, 'actor', 'id'); + $actor = JsonLD::fetchElement($object, 'actor', 'id') ?? ''; } else { $actor = ''; } @@ -509,6 +579,15 @@ class HTTPSignature $sig_block = self::parseSigHeader($http_headers['HTTP_SIGNATURE']); + // Add fields from the signature block to the header. See issue 8845 + if (!empty($sig_block['created']) && empty($headers['(created)'])) { + $headers['(created)'] = $sig_block['created']; + } + + if (!empty($sig_block['expires']) && empty($headers['(expires)'])) { + $headers['(expires)'] = $sig_block['expires']; + } + if (empty($sig_block) || empty($sig_block['headers']) || empty($sig_block['keyId'])) { Logger::info('No headers or keyId'); return false; @@ -518,6 +597,8 @@ class HTTPSignature foreach ($sig_block['headers'] as $h) { if (array_key_exists($h, $headers)) { $signed_data .= $h . ': ' . $headers[$h] . "\n"; + } else { + Logger::info('Requested header field not found', ['field' => $h, 'header' => $headers]); } } $signed_data = rtrim($signed_data, "\n"); @@ -546,7 +627,7 @@ class HTTPSignature } if (empty($algorithm)) { - Logger::info('No alagorithm'); + Logger::info('No algorithm'); return false; } @@ -572,7 +653,7 @@ class HTTPSignature } if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) { - Logger::info('Verification failed'); + Logger::info('Verification failed', ['signed_data' => $signed_data, 'algorithm' => $algorithm, 'header' => $sig_block['headers'], 'http_headers' => $http_headers]); return false; } @@ -598,13 +679,36 @@ class HTTPSignature $hasGoodSignedContent = true; } + if (in_array('date', $sig_block['headers']) && !empty($headers['date'])) { + $created = strtotime($headers['date']); + } elseif (in_array('(created)', $sig_block['headers']) && !empty($sig_block['created'])) { + $created = $sig_block['created']; + } else { + $created = 0; + } + + if (in_array('(expires)', $sig_block['headers']) && !empty($sig_block['expires'])) { + $expired = min($sig_block['expires'], $created + 300); + } else { + $expired = $created + 300; + } + // Check if the signed date field is in an acceptable range - if (in_array('date', $sig_block['headers'])) { - $diff = abs(strtotime($headers['date']) - time()); - if ($diff > 300) { - Logger::notice("Header date '" . $headers['date'] . "' is with " . $diff . " seconds out of the 300 second frame. The signature is invalid."); + if (!empty($created)) { + $current = time(); + + // Calculate with a grace period of 60 seconds to avoid slight time differences between the servers + if (($created - 60) > $current) { + Logger::notice('Signature created in the future', ['created' => date(DateTimeFormat::MYSQL, $created), 'expired' => date(DateTimeFormat::MYSQL, $expired), 'current' => date(DateTimeFormat::MYSQL, $current)]); return false; } + + if ($current > $expired) { + Logger::notice('Signature expired', ['created' => date(DateTimeFormat::MYSQL, $created), 'expired' => date(DateTimeFormat::MYSQL, $expired), 'current' => date(DateTimeFormat::MYSQL, $current)]); + return false; + } + + Logger::debug('Valid creation date', ['created' => date(DateTimeFormat::MYSQL, $created), 'expired' => date(DateTimeFormat::MYSQL, $expired), 'current' => date(DateTimeFormat::MYSQL, $current)]); $hasGoodSignedContent = true; } @@ -629,13 +733,13 @@ class HTTPSignature /** * fetches a key for a given id and actor * - * @param $id - * @param $actor + * @param string $id + * @param string $actor * * @return array with actor url and public key * @throws \Exception */ - private static function fetchKey($id, $actor) + private static function fetchKey(string $id, string $actor): array { $url = (strpos($id, '#') ? substr($id, 0, strpos($id, '#')) : $id); @@ -652,6 +756,6 @@ class HTTPSignature } Logger::notice('Key could not be fetched', ['url' => $url, 'actor' => $actor]); - return false; + return []; } }