X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FHTTPSignature.php;h=3e22820e5c4e96349035b8561c8773e147d15285;hb=720a43461d67ab229de0aecfc5008f22cc4c1c54;hp=d03e671421f381b56813f34b0d92a7bf4226d88c;hpb=38b17e1aae00d13a1a90da0b3ac105da5cb140f9;p=friendica.git diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php index d03e671421..3e22820e5c 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) { @@ -76,7 +78,7 @@ class HTTPSignature $sig_block = self::parseSigheader($headers['authorization']); if (!$sig_block) { - Logger::log('no signature provided.'); + Logger::notice('no signature provided.'); return $result; } @@ -106,7 +108,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; @@ -114,7 +116,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; @@ -137,6 +139,9 @@ class HTTPSignature public static function createSig($head, $prvkey, $keyid = 'Key') { $return_headers = []; + if (!empty($head)) { + $return_headers = $head; + } $alg = 'sha512'; $algorithm = 'rsa-sha512'; @@ -146,15 +151,7 @@ class HTTPSignature $headerval = 'keyId="' . $keyid . '",algorithm="' . $algorithm . '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"'; - $sighead = 'Authorization: Signature ' . $headerval; - - if ($head) { - foreach ($head as $k => $v) { - $return_headers[] = $k . ': ' . $v; - } - } - - $return_headers[] = $sighead; + $return_headers['Authorization'] = ['Signature ' . $headerval]; return $return_headers; } @@ -173,6 +170,9 @@ class HTTPSignature $fields = ''; foreach ($head as $k => $v) { + if (is_array($v)) { + $v = implode(', ', $v); + } $headers .= strtolower($k) . ': ' . trim($v) . "\n"; if ($fields) { $fields .= ' '; @@ -288,20 +288,25 @@ class HTTPSignature $content_length = strlen($content); $date = DateTimeFormat::utcNow(DateTimeFormat::HTTP); - $headers = ['Date: ' . $date, 'Content-Length: ' . $content_length, 'Digest: ' . $digest, 'Host: ' . $host]; + $headers = [ + 'Date' => $date, + 'Content-Length' => $content_length, + 'Digest' => $digest, + 'Host' => $host + ]; $signed_data = "(request-target): post " . $path . "\ndate: ". $date . "\ncontent-length: " . $content_length . "\ndigest: " . $digest . "\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 content-length digest host",signature="' . $signature . '"'; + $headers['Signature'] = 'keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date content-length digest host",signature="' . $signature . '"'; - $headers[] = 'Content-Type: application/activity+json'; + $headers['Content-Type'] = 'application/activity+json'; - $postResult = DI::httpRequest()->post($target, $content, $headers); + $postResult = DI::httpClient()->post($target, $content, $headers); $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); @@ -323,7 +328,7 @@ class HTTPSignature $status = DBA::selectFirst('inbox-status', [], ['url' => $url]); if (!DBA::isResult($status)) { - DBA::insert('inbox-status', ['url' => $url, 'created' => $now, 'shared' => $shared]); + DBA::insert('inbox-status', ['url' => $url, 'created' => $now, 'shared' => $shared], Database::INSERT_IGNORE); $status = DBA::selectFirst('inbox-status', [], ['url' => $url]); } @@ -407,10 +412,10 @@ class HTTPSignature * 'nobody' => only return the header * 'cookiejar' => path to cookie jar file * - * @return object 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 = ['accept_content' => ['application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"']]) { $header = []; @@ -432,30 +437,27 @@ class HTTPSignature $path = parse_url($request, PHP_URL_PATH); $date = DateTimeFormat::utcNow(DateTimeFormat::HTTP); - $header = ['Date: ' . $date, 'Host: ' . $host]; + $header['Date'] = $date; + $header['Host'] = $host; $signed_data = "(request-target): get " . $path . "\ndate: ". $date . "\nhost: " . $host; $signature = base64_encode(Crypto::rsaSign($signed_data, $owner['uprvkey'], 'sha256')); - $header[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"'; - } - - if (!empty($opts['accept_content'])) { - $header[] = 'Accept: ' . $opts['accept_content']; + $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, $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; } @@ -472,12 +474,14 @@ class HTTPSignature public static function getSigner($content, $http_headers) { if (empty($http_headers['HTTP_SIGNATURE'])) { + Logger::debug('No HTTP_SIGNATURE header'); return false; } if (!empty($content)) { $object = json_decode($content, true); if (empty($object)) { + Logger::info('No object'); return false; } @@ -487,7 +491,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) { @@ -506,6 +510,7 @@ class HTTPSignature $sig_block = self::parseSigHeader($http_headers['HTTP_SIGNATURE']); if (empty($sig_block) || empty($sig_block['headers']) || empty($sig_block['keyId'])) { + Logger::info('No headers or keyId'); return false; } @@ -518,6 +523,7 @@ class HTTPSignature $signed_data = rtrim($signed_data, "\n"); if (empty($signed_data)) { + Logger::info('Signed data is empty'); return false; } @@ -540,27 +546,33 @@ class HTTPSignature } if (empty($algorithm)) { + Logger::info('No alagorithm'); return false; } $key = self::fetchKey($sig_block['keyId'], $actor); if (empty($key)) { + Logger::info('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 (!Contact::isLocal($key['url'])) { + // We now delete everything that we possibly knew from this actor + Contact::deleteContactByUrl($key['url']); + } + return null; } if (empty($key['pubkey'])) { + Logger::info('Empty pubkey'); return false; } if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) { + Logger::info('Verification failed'); return false; } @@ -579,6 +591,7 @@ class HTTPSignature /// @todo add all hashes from the rfc if (!empty($hashalg) && base64_encode(hash($hashalg, $content, true)) != $digest[1]) { + Logger::info('Digest does not match'); return false; } @@ -589,7 +602,7 @@ class HTTPSignature 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."); + Logger::notice("Header date '" . $headers['date'] . "' is with " . $diff . " seconds out of the 300 second frame. The signature is invalid."); return false; } $hasGoodSignedContent = true; @@ -598,6 +611,7 @@ class HTTPSignature // Check the content-length when it is part of the signed data if (in_array('content-length', $sig_block['headers'])) { if (strlen($content) != $headers['content-length']) { + Logger::info('Content length does not match'); return false; } } @@ -605,6 +619,7 @@ class HTTPSignature // Ensure that the authentication had been done with some content // Without this check someone could authenticate with fakeable data if (!$hasGoodSignedContent) { + Logger::info('No good signed content'); return false; } @@ -626,16 +641,17 @@ class HTTPSignature $profile = APContact::getByURL($url); if (!empty($profile)) { - Logger::log('Taking key from id ' . $id, Logger::DEBUG); + Logger::info('Taking key from id', ['id' => $id]); 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); + Logger::info('Taking key from actor', ['actor' => $actor]); return ['url' => $actor, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']]; } } + Logger::notice('Key could not be fetched', ['url' => $url, 'actor' => $actor]); return false; } }