clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9668 from annando/keywarning 

Fix warning "supplied key param cannot be coerced into a public key"
This commit is contained in:
Hypolite Petovan 2020-12-17 08:25:25 -05:00 committed by GitHub
parent 61c1c1f530 e713db4ac7
commit 38b17e1aae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Util/HTTPSignature.php
View File

@ -25,6 +25,7 @@ use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\APContact; use Friendica\Model\APContact;
use Friendica\Model\Contact;
use Friendica\Model\User; use Friendica\Model\User;
/** /**
@ -543,11 +544,22 @@ class HTTPSignature
} }
$key = self::fetchKey($sig_block['keyId'], $actor); $key = self::fetchKey($sig_block['keyId'], $actor);
if (empty($key)) { if (empty($key)) {
return false; 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)) { if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) {
return false; return false;
} }
@ -615,12 +627,12 @@ class HTTPSignature
$profile = APContact::getByURL($url); $profile = APContact::getByURL($url);
if (!empty($profile)) { if (!empty($profile)) {
Logger::log('Taking key from id ' . $id, Logger::DEBUG); 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) { } elseif ($url != $actor) {
$profile = APContact::getByURL($actor); $profile = APContact::getByURL($actor);
if (!empty($profile)) { if (!empty($profile)) {
Logger::log('Taking key from actor ' . $actor, Logger::DEBUG); Logger::log('Taking key from actor ' . $actor, Logger::DEBUG);
return ['url' => $actor, 'pubkey' => $profile['pubkey']]; return ['url' => $actor, 'pubkey' => $profile['pubkey'], 'type' => $profile['type']];
} }
} }