From 83cb1dfa682e957efb73b213b7c50b256a5d2613 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Thu, 14 Jan 2016 03:45:11 +0100
Subject: [PATCH] Salmon debugging

---
 plugins/OStatus/lib/magicenvelope.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 6786bfa298..da3106b2cf 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -340,26 +340,28 @@ class MagicEnvelope
     public function verify(Profile $profile)
     {
         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;
         }
 
         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;
         }
 
         try {
             $magicsig = $this->getKeyPair($profile, true);    // Do discovery too if necessary
         } 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;
         }
 
         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.
             throw new ClientException(_m('Salmon signature verification failed.'));
         }
+        common_debug('Salmon signature verification successful for profile id=='.$profile->getID());
         $this->setActor($profile);
         return true;
     }
-- 
2.39.5