X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FHTTPSignature.php;h=4a4f6a5710d306936d9058861fee379988f02e1b;hb=c33611c484e2cf5a3c626566588e26a1d14e12c6;hp=eab778b82027f92d3d30dacfb4895cecea9e77e4;hpb=befd5c860d6af9c2ba7cdcade898e54b53d2060b;p=friendica.git diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index eab778b820..4a4f6a5710 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -1,6 +1,6 @@ getMethod()).' '.$_SERVER['REQUEST_URI']; foreach ($_SERVER as $k => $v) { if (strpos($k, 'HTTP_') === 0) { @@ -79,7 +81,7 @@ class HTTPSignature $sig_block = self::parseSigheader($headers['authorization']); if (!$sig_block) { - Logger::log('no signature provided.'); + Logger::notice('no signature provided.'); return $result; } @@ -109,7 +111,7 @@ class HTTPSignature $key = $key($sig_block['keyId']); } - Logger::log('Got keyID ' . $sig_block['keyId'], Logger::DEBUG); + Logger::info('Got keyID ' . $sig_block['keyId']); if (!$key) { return $result; @@ -117,7 +119,7 @@ class HTTPSignature $x = Crypto::rsaVerify($signed_data, $sig_block['signature'], $key, $algorithm); - Logger::log('verified: ' . $x, Logger::DEBUG); + Logger::info('verified: ' . $x); if (!$x) { return $result; @@ -263,21 +265,21 @@ class HTTPSignature */ /** - * Transmit given data to a target for a user + * Post given data to a target for a user, returns the result class * * @param array $data Data that is about to be send * @param string $target The URL of the inbox * @param integer $uid User id of the sender * - * @return boolean Was the transmission successful? + * @return ICanHandleHttpResponses * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function transmit($data, $target, $uid) + public static function post(array $data, string $target, int $uid): ICanHandleHttpResponses { $owner = User::getOwnerDataById($uid); if (!$owner) { - return; + return null; } $content = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); @@ -304,16 +306,32 @@ class HTTPSignature $headers['Content-Type'] = 'application/activity+json'; - $postResult = DI::httpRequest()->post($target, $content, $headers); + $postResult = DI::httpClient()->post($target, $content, $headers, DI::config()->get('system', 'curl_timeout')); $return_code = $postResult->getReturnCode(); - Logger::log('Transmit to ' . $target . ' returned ' . $return_code, Logger::DEBUG); + 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 send + * @param string $target The URL of the inbox + * @param integer $uid User id of the sender + * + * @return boolean Was the transmission successful? + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + public static function transmit(array $data, string $target, int $uid): bool + { + $postResult = self::post($data, $target, $uid); + $return_code = $postResult->getReturnCode(); - return $success; + return ($return_code >= 200) && ($return_code <= 299); } /** @@ -329,7 +347,7 @@ class HTTPSignature $status = DBA::selectFirst('inbox-status', [], ['url' => $url]); if (!DBA::isResult($status)) { - DBA::insert('inbox-status', ['url' => $url, 'created' => $now, 'shared' => $shared], Database::INSERT_IGNORE); + DBA::insert('inbox-status', ['url' => $url, 'uri-id' => ItemURI::getIdByURI($url), 'created' => $now, 'shared' => $shared], Database::INSERT_IGNORE); $status = DBA::selectFirst('inbox-status', [], ['url' => $url]); } @@ -369,6 +387,10 @@ class HTTPSignature $fields['archive'] = false; } + if (empty($status['uri-id'])) { + $fields['uri-id'] = ItemURI::getIdByURI($url); + } + DBA::update('inbox-status', $fields, ['url' => $url]); } @@ -413,10 +435,10 @@ class HTTPSignature * 'nobody' => only return the header * 'cookiejar' => path to cookie jar file * - * @return IHTTPResult CurlResult + * @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']]) + public static function fetchRaw($request, $uid = 0, $opts = [HttpClientOptions::ACCEPT_CONTENT => [HttpClientAccept::JSON_AS]]) { $header = []; @@ -448,17 +470,17 @@ class HTTPSignature $header['Signature'] = 'keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"'; } - $curl_opts = $opts; - $curl_opts['header'] = $header; + $curl_opts = $opts; + $curl_opts[HttpClientOptions::HEADERS] = $header; if (!empty($opts['nobody'])) { - $curlResult = DI::httpRequest()->head($request, $curl_opts); + $curlResult = DI::httpClient()->head($request, $curl_opts); } else { - $curlResult = DI::httpRequest()->get($request, $curl_opts); + $curlResult = DI::httpClient()->get($request, HttpClientAccept::JSON_AS, $curl_opts); } $return_code = $curlResult->getReturnCode(); - Logger::log('Fetched for user ' . $uid . ' from ' . $request . ' returned ' . $return_code, Logger::DEBUG); + Logger::info('Fetched for user ' . $uid . ' from ' . $request . ' returned ' . $return_code); return $curlResult; } @@ -475,7 +497,7 @@ class HTTPSignature public static function getSigner($content, $http_headers) { if (empty($http_headers['HTTP_SIGNATURE'])) { - Logger::info('No HTTP_SIGNATURE header'); + Logger::debug('No HTTP_SIGNATURE header'); return false; } @@ -492,7 +514,7 @@ class HTTPSignature } $headers = []; - $headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . parse_url($http_headers['REQUEST_URI'], PHP_URL_PATH); + $headers['(request-target)'] = strtolower(DI::args()->getMethod()) . ' ' . parse_url($http_headers['REQUEST_URI'], PHP_URL_PATH); // First take every header foreach ($http_headers as $k => $v) { @@ -510,6 +532,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; @@ -519,6 +550,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"); @@ -573,7 +606,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; } @@ -599,13 +632,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::log("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; }