X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FHTTPSignature.php;h=cede21b3c40039a6cd6d421aeebb2b272a7676f0;hb=c1e8dbdbae47e79d6c9b82f4183182b0b533fb6a;hp=8a058c3b5c7e45d15bd4737daf29dc41b76b5890;hpb=1de3960e267a8d298348fbca18cf1be1f6a20f7a;p=friendica.git diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index 8a058c3b5c..cede21b3c4 100644 --- a/src/Util/HTTPSignature.php +++ b/src/Util/HTTPSignature.php @@ -1,18 +1,36 @@ . + * */ + namespace Friendica\Util; -use Friendica\Database\DBA; -use Friendica\Core\Config; use Friendica\Core\Logger; -use Friendica\Model\User; +use Friendica\Database\Database; +use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\APContact; +use Friendica\Model\Contact; +use Friendica\Model\User; /** - * @brief Implements HTTP Signatures per draft-cavage-http-signatures-07. + * Implements HTTP Signatures per draft-cavage-http-signatures-07. * * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/Zotlabs/Web/HTTPSig.php * @@ -26,7 +44,7 @@ class HTTPSignature { // See draft-cavage-http-signatures-08 /** - * @brief Verifies a magic request + * Verifies a magic request * * @param $key * @@ -111,8 +129,6 @@ class HTTPSignature } /** - * @brief - * * @param array $head * @param string $prvkey * @param string $keyid (optional, default 'Key') @@ -145,8 +161,6 @@ class HTTPSignature } /** - * @brief - * * @param array $head * @param string $prvkey * @param string $alg (optional) default 'sha256' @@ -178,11 +192,11 @@ class HTTPSignature } /** - * @brief - * * @param string $header - * @return array associate array with + * @return array associative array with * - \e string \b keyID + * - \e string \b created + * - \e string \b expires * - \e string \b algorithm * - \e array \b headers * - \e string \b signature @@ -190,80 +204,55 @@ class HTTPSignature */ public static function parseSigheader($header) { - $ret = []; - $matches = []; + // Remove obsolete folds + $header = preg_replace('/\n\s+/', ' ', $header); - // if the header is encrypted, decrypt with (default) site private key and continue - if (preg_match('/iv="(.*?)"/ism', $header, $matches)) { - $header = self::decryptSigheader($header); - } + $token = "[!#$%&'*+.^_`|~0-9A-Za-z-]"; - if (preg_match('/keyId="(.*?)"/ism', $header, $matches)) { - $ret['keyId'] = $matches[1]; - } + $quotedString = '"(?:\\\\.|[^"\\\\])*"'; - if (preg_match('/algorithm="(.*?)"/ism', $header, $matches)) { - $ret['algorithm'] = $matches[1]; - } else { - $ret['algorithm'] = 'rsa-sha256'; - } + $regex = "/($token+)=($quotedString|$token+)/ism"; - if (preg_match('/headers="(.*?)"/ism', $header, $matches)) { - $ret['headers'] = explode(' ', $matches[1]); - } + $matches = []; + preg_match_all($regex, $header, $matches, PREG_SET_ORDER); - if (preg_match('/signature="(.*?)"/ism', $header, $matches)) { - $ret['signature'] = base64_decode(preg_replace('/\s+/', '', $matches[1])); + $headers = []; + foreach ($matches as $match) { + $headers[$match[1]] = trim($match[2] ?: $match[3], '"'); } - if (!empty($ret['signature']) && !empty($ret['algorithm']) && empty($ret['headers'])) { - $ret['headers'] = ['date']; + // if the header is encrypted, decrypt with (default) site private key and continue + if (!empty($headers['iv'])) { + $header = self::decryptSigheader($headers, DI::config()->get('system', 'prvkey')); + return self::parseSigheader($header); + } + + $return = [ + 'keyId' => $headers['keyId'] ?? '', + 'algorithm' => $headers['algorithm'] ?? 'rsa-sha256', + 'created' => $headers['created'] ?? null, + 'expires' => $headers['expires'] ?? null, + 'headers' => explode(' ', $headers['headers'] ?? ''), + 'signature' => base64_decode(preg_replace('/\s+/', '', $headers['signature'] ?? '')), + ]; + + if (!empty($return['signature']) && !empty($return['algorithm']) && empty($return['headers'])) { + $return['headers'] = ['date']; } - return $ret; + return $return; } /** - * @brief - * - * @param string $header - * @param string $prvkey (optional), if not set use site private key - * - * @return array|string associative array, empty string if failue - * - \e string \b iv - * - \e string \b key - * - \e string \b alg - * - \e string \b data + * @param array $headers Signature headers + * @param string $prvkey The site private key + * @return string Decrypted signature string * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function decryptSigheader($header, $prvkey = null) + private static function decryptSigheader(array $headers, string $prvkey) { - $iv = $key = $alg = $data = null; - - if (!$prvkey) { - $prvkey = Config::get('system', 'prvkey'); - } - - $matches = []; - - if (preg_match('/iv="(.*?)"/ism', $header, $matches)) { - $iv = $matches[1]; - } - - if (preg_match('/key="(.*?)"/ism', $header, $matches)) { - $key = $matches[1]; - } - - if (preg_match('/alg="(.*?)"/ism', $header, $matches)) { - $alg = $matches[1]; - } - - if (preg_match('/data="(.*?)"/ism', $header, $matches)) { - $data = $matches[1]; - } - - if ($iv && $key && $alg && $data) { - return Crypto::unencapsulate(['iv' => $iv, 'key' => $key, 'alg' => $alg, 'data' => $data], $prvkey); + if (!empty($headers['iv']) && !empty($headers['key']) && !empty($headers['data'])) { + return Crypto::unencapsulate($headers, $prvkey); } return ''; @@ -274,7 +263,7 @@ class HTTPSignature */ /** - * @brief Transmit given data to a target for a user + * 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 @@ -310,7 +299,7 @@ class HTTPSignature $headers[] = 'Content-Type: application/activity+json'; - $postResult = Network::post($target, $content, $headers); + $postResult = DI::httpRequest()->post($target, $content, $headers); $return_code = $postResult->getReturnCode(); Logger::log('Transmit to ' . $target . ' returned ' . $return_code, Logger::DEBUG); @@ -323,18 +312,19 @@ class HTTPSignature } /** - * @brief Set the delivery status for a given inbox + * Set the delivery status for a given inbox * * @param string $url The URL of the inbox * @param boolean $success Transmission status + * @param boolean $shared The inbox is a shared inbox */ - static private function setInboxStatus($url, $success) + static public function setInboxStatus($url, $success, $shared = false) { $now = DateTimeFormat::utcNow(); $status = DBA::selectFirst('inbox-status', [], ['url' => $url]); if (!DBA::isResult($status)) { - DBA::insert('inbox-status', ['url' => $url, 'created' => $now]); + DBA::insert('inbox-status', ['url' => $url, 'created' => $now, 'shared' => $shared], Database::INSERT_IGNORE); $status = DBA::selectFirst('inbox-status', [], ['url' => $url]); } @@ -378,7 +368,7 @@ class HTTPSignature } /** - * @brief Fetches JSON data for a user + * Fetches JSON data for a user * * @param string $request request url * @param integer $uid User id of the requester @@ -388,8 +378,7 @@ class HTTPSignature */ public static function fetch($request, $uid) { - $opts = ['accept_content' => 'application/activity+json, application/ld+json']; - $curlResult = self::fetchRaw($request, $uid, false, $opts); + $curlResult = self::fetchRaw($request, $uid); if (empty($curlResult)) { return false; @@ -408,7 +397,7 @@ class HTTPSignature } /** - * @brief Fetches raw data for a user + * Fetches raw data for a user * * @param string $request request url * @param integer $uid User id of the requester @@ -416,46 +405,55 @@ class HTTPSignature * @param array $opts (optional parameters) assoziative 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 - * 'http_auth' => username:password - * 'novalidate' => do not validate SSL certs, default is to validate using our CA list * 'nobody' => only return the header * 'cookiejar' => path to cookie jar file * * @return object CurlResult * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function fetchRaw($request, $uid = 0, $binary = false, $opts = []) + public static function fetchRaw($request, $uid = 0, $opts = ['accept_content' => 'application/activity+json, application/ld+json']) { + $header = []; + if (!empty($uid)) { $owner = User::getOwnerDataById($uid); if (!$owner) { return; } + } else { + $owner = User::getSystemAccount(); + if (!$owner) { + return; + } + } + if (!empty($owner['uprvkey'])) { // Header data that is about to be signed. $host = parse_url($request, PHP_URL_HOST); $path = parse_url($request, PHP_URL_PATH); $date = DateTimeFormat::utcNow(DateTimeFormat::HTTP); - $headers = ['Date: ' . $date, 'Host: ' . $host]; + $header = ['Date: ' . $date, 'Host: ' . $host]; $signed_data = "(request-target): get " . $path . "\ndate: ". $date . "\nhost: " . $host; $signature = base64_encode(Crypto::rsaSign($signed_data, $owner['uprvkey'], 'sha256')); - $headers[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"'; - } else { - $headers = []; + $header[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"'; } if (!empty($opts['accept_content'])) { - $headers[] = 'Accept: ' . $opts['accept_content']; + $header[] = 'Accept: ' . $opts['accept_content']; } $curl_opts = $opts; - $curl_opts['header'] = $headers; + $curl_opts['header'] = $header; - $curlResult = Network::curl($request, false, $curl_opts); + if (!empty($opts['nobody'])) { + $curlResult = DI::httpRequest()->head($request, $curl_opts); + } else { + $curlResult = DI::httpRequest()->get($request, $curl_opts); + } $return_code = $curlResult->getReturnCode(); Logger::log('Fetched for user ' . $uid . ' from ' . $request . ' returned ' . $return_code, Logger::DEBUG); @@ -464,7 +462,7 @@ class HTTPSignature } /** - * @brief Gets a signer from a given HTTP request + * Gets a signer from a given HTTP request * * @param $content * @param $http_headers @@ -490,7 +488,7 @@ class HTTPSignature } $headers = []; - $headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . $http_headers['REQUEST_URI']; + $headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . parse_url($http_headers['REQUEST_URI'], PHP_URL_PATH); // First take every header foreach ($http_headers as $k => $v) { @@ -526,6 +524,14 @@ class HTTPSignature $algorithm = null; + // Wildcard value where signing algorithm should be derived from keyId + // @see https://tools.ietf.org/html/draft-ietf-httpbis-message-signatures-00#section-4.1 + // Defaulting to SHA256 as it seems to be the prevalent implementation + // @see https://arewehs2019yet.vpzom.click + if ($sig_block['algorithm'] === 'hs2019') { + $algorithm = 'sha256'; + } + if ($sig_block['algorithm'] === 'rsa-sha256') { $algorithm = 'sha256'; } @@ -539,11 +545,22 @@ class HTTPSignature } $key = self::fetchKey($sig_block['keyId'], $actor); - if (empty($key)) { return false; } + if (!empty($key['url']) && !empty($key['type']) && ($key['type'] == 'Tombstone')) { + Logger::info('Actor is a tombstone', ['key' => $key]); + + // We now delete everything that we possibly knew from this actor + Contact::deleteContactByUrl($key['url']); + return false; + } + + if (empty($key['pubkey'])) { + return false; + } + if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) { return false; } @@ -596,7 +613,7 @@ class HTTPSignature } /** - * @brief fetches a key for a given id and actor + * fetches a key for a given id and actor * * @param $id * @param $actor @@ -611,12 +628,12 @@ class HTTPSignature $profile = APContact::getByURL($url); if (!empty($profile)) { Logger::log('Taking key from id ' . $id, Logger::DEBUG); - return ['url' => $url, 'pubkey' => $profile['pubkey']]; + return ['url' => $url, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']]; } elseif ($url != $actor) { $profile = APContact::getByURL($actor); if (!empty($profile)) { Logger::log('Taking key from actor ' . $actor, Logger::DEBUG); - return ['url' => $actor, 'pubkey' => $profile['pubkey']]; + return ['url' => $actor, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']]; } }