<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Util;
use Friendica\Core\Logger;
+use Friendica\Database\Database;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\APContact;
+use Friendica\Model\Contact;
use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
/**
* Implements HTTP Signatures per draft-cavage-http-signatures-07.
// Decide if $data arrived via controller submission or curl.
$headers = [];
- $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']).' '.$_SERVER['REQUEST_URI'];
+ $headers['(request-target)'] = strtolower(DI::args()->getMethod()).' '.$_SERVER['REQUEST_URI'];
foreach ($_SERVER as $k => $v) {
if (strpos($k, 'HTTP_') === 0) {
$sig_block = self::parseSigheader($headers['authorization']);
if (!$sig_block) {
- Logger::log('no signature provided.');
+ Logger::notice('no signature provided.');
return $result;
}
$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;
$x = Crypto::rsaVerify($signed_data, $sig_block['signature'], $key, $algorithm);
- Logger::log('verified: ' . $x, Logger::DEBUG);
+ Logger::info('verified: ' . $x);
if (!$x) {
return $result;
public static function createSig($head, $prvkey, $keyid = 'Key')
{
$return_headers = [];
+ if (!empty($head)) {
+ $return_headers = $head;
+ }
$alg = 'sha512';
$algorithm = 'rsa-sha512';
$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;
}
$fields = '';
foreach ($head as $k => $v) {
+ if (is_array($v)) {
+ $v = implode(', ', $v);
+ }
$headers .= strtolower($k) . ': ' . trim($v) . "\n";
if ($fields) {
$fields .= ' ';
$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);
*
* @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]);
}
*/
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;
* @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
+ * @return \Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses 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; profile="https://www.w3.org/ns/activitystreams"']])
{
- $headers = [];
+ $header = [];
if (!empty($uid)) {
$owner = User::getOwnerDataById($uid);
$path = parse_url($request, PHP_URL_PATH);
$date = DateTimeFormat::utcNow(DateTimeFormat::HTTP);
- $headers = ['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'));
- $headers[] = '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['Signature'] = 'keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) date host",signature="' . $signature . '"';
}
- $curl_opts = $opts;
- $curl_opts['header'] = $headers;
+ $curl_opts = $opts;
+ $curl_opts[HttpClientOptions::HEADERS] = $header;
- $curlResult = DI::httpRequest()->get($request, false, $curl_opts);
+ if (!empty($opts['nobody'])) {
+ $curlResult = DI::httpClient()->head($request, $curl_opts);
+ } else {
+ $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;
}
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;
}
}
$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) {
$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;
}
$signed_data = rtrim($signed_data, "\n");
if (empty($signed_data)) {
+ Logger::info('Signed data is empty');
return false;
}
}
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]);
+
+ 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;
}
/// @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;
}
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;
// 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;
}
}
// 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;
}
$profile = APContact::getByURL($url);
if (!empty($profile)) {
- Logger::log('Taking key from id ' . $id, Logger::DEBUG);
- return ['url' => $url, 'pubkey' => $profile['pubkey']];
+ 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);
- return ['url' => $actor, 'pubkey' => $profile['pubkey']];
+ 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;
}
}
projects / friendica.git / blobdiff