namespace Friendica\Util;
-use Friendica\Database\DBA;
use Friendica\Core\Logger;
+use Friendica\Database\Database;
+use Friendica\Database\DBA;
use Friendica\DI;
-use Friendica\Model\User;
use Friendica\Model\APContact;
+use Friendica\Model\Contact;
+use Friendica\Model\User;
/**
* Implements HTTP Signatures per draft-cavage-http-signatures-07.
$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);
*
* @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
* @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);
}
$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) {
}
$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;
}
$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']];
}
}
projects / friendica.git / blobdiff