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;
/**
$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]);
}
}
$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']];
}
}