From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 2 Jun 2014 14:10:26 +0000 (+0200)
Subject: Don't ensureProfile before we verify signature
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=dc52a8ff437d7997beedc0def56d706fd0737c83;p=quix0rs-gnu-social.git

Don't ensureProfile before we verify signature
---

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index e217fd5a00..b0365d161d 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -49,14 +49,15 @@ class SalmonAction extends Action
 
             $entry = $magic_env->getPayload();  // Not cryptographically verified yet!
             $this->activity = new Activity($entry->documentElement);
-            $oprofile = $this->ensureProfile();
+            $profile = Profile::fromUri($this->activity->actor->id);
+            assert($profile instanceof Profile);
         } catch (Exception $e) {
             common_debug('Salmon envelope parsing failed with: '.$e->getMessage());
             $this->clientError($e->getMessage());
         }
 
         // Cryptographic verification test
-        if (!$magic_env->verify($oprofile->localProfile())) {
+        if (!$magic_env->verify($profile)) {
             common_log(LOG_DEBUG, "Salmon signature verification failed.");
             // TRANS: Client error.
             $this->clientError(_m('Salmon signature verification failed.'));