GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Salmon debugging

This commit is contained in:
Mikael Nordfeldth 2016-01-14 03:45:11 +01:00
parent 6834f355f2
commit 83cb1dfa68
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/OStatus/lib/magicenvelope.php
View File

@ -340,26 +340,28 @@ class MagicEnvelope
public function verify(Profile $profile) public function verify(Profile $profile)
{ {
if ($this->alg != 'RSA-SHA256') { if ($this->alg != 'RSA-SHA256') {
common_log(LOG_DEBUG, "Salmon error: bad algorithm"); common_log(LOG_DEBUG, 'Salmon error: bad algorithm: '._ve($this->alg));
return false; return false;
} }
if ($this->encoding != self::ENCODING) { if ($this->encoding != self::ENCODING) {
common_log(LOG_DEBUG, "Salmon error: bad encoding"); common_log(LOG_DEBUG, 'Salmon error: bad encoding: '._ve($this->encoding));
return false; return false;
} }
try { try {
$magicsig = $this->getKeyPair($profile, true); // Do discovery too if necessary $magicsig = $this->getKeyPair($profile, true); // Do discovery too if necessary
} catch (Exception $e) { } catch (Exception $e) {
common_log(LOG_DEBUG, "Salmon error: ".$e->getMessage()); common_log(LOG_DEBUG, "Salmon error: getKeyPair for profile id=='.$profile->getID().': ".$e->getMessage());
return false; return false;
} }
if (!$magicsig->verify($this->signingText(), $this->getSignature())) { if (!$magicsig->verify($this->signingText(), $this->getSignature())) {
common_log(LOG_INFO, 'Salmon signature verification failed for profile id=='.$profile->getID());
// TRANS: Client error when incoming salmon slap signature does not verify cryptographically. // TRANS: Client error when incoming salmon slap signature does not verify cryptographically.
throw new ClientException(_m('Salmon signature verification failed.')); throw new ClientException(_m('Salmon signature verification failed.'));
} }
common_debug('Salmon signature verification successful for profile id=='.$profile->getID());
$this->setActor($profile); $this->setActor($profile);
return true; return true;
} }