<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
+use Friendica\Model\ItemURI;
use Friendica\Model\User;
-use Friendica\Network\CurlResult;
-use Friendica\Network\IHTTPResult;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+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;
$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);
$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]);
}
$fields['archive'] = false;
}
+ if (empty($status['uri-id'])) {
+ $fields['uri-id'] = ItemURI::getIdByURI($url);
+ }
+
DBA::update('inbox-status', $fields, ['url' => $url]);
}
* '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 = [];
$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;
}
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;
}
}
$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']);
+ // 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;
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");
}
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;
}
$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;
}
projects / friendica.git / blobdiff