X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Flib%2Fsalmonaction.php;h=8bfd7c8261e81ef3ca021d481854c63468289aa3;hb=b54ea6767a510f0d7c9af140bb16a0b9ecc4f0ce;hp=9aac2ed52f802078cd683a2f51263598a0e20d0e;hpb=daea98878692cadc9406be16fe2e15a419add3c4;p=quix0rs-gnu-social.git

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 9aac2ed52f..8bfd7c8261 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -30,6 +30,7 @@ class SalmonAction extends Action
 {
     var $xml      = null;
     var $activity = null;
+    var $target   = null;
 
     function prepare($args)
     {
@@ -38,33 +39,38 @@ class SalmonAction extends Action
         parent::prepare($args);
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(_('This method requires a POST.'));
+            // TRANS: Client error. POST is a HTTP command. It should not be translated.
+            $this->clientError(_m('This method requires a POST.'));
         }
 
-        if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/atom+xml') {
-            $this->clientError(_('Salmon requires application/atom+xml'));
+        if (empty($_SERVER['CONTENT_TYPE']) || $_SERVER['CONTENT_TYPE'] != 'application/magic-envelope+xml') {
+            // TRANS: Client error. Do not translate "application/magic-envelope+xml"
+            $this->clientError(_m('Salmon requires "application/magic-envelope+xml".'));
         }
 
         $xml = file_get_contents('php://input');
 
-        $dom = DOMDocument::loadXML($xml);
+        // Check the signature
+        $salmon = new Salmon;
+        if (!$salmon->verifyMagicEnv($xml)) {
+            common_log(LOG_DEBUG, "Salmon signature verification failed.");
+            // TRANS: Client error.
+            $this->clientError(_m('Salmon signature verification failed.'));
+        } else {
+            $magic_env = new MagicEnvelope();
+            $env = $magic_env->parse($xml);
+            $xml = $magic_env->unfold($env);
+        }
 
+        $dom = DOMDocument::loadXML($xml);
         if ($dom->documentElement->namespaceURI != Activity::ATOM ||
             $dom->documentElement->localName != 'entry') {
             common_log(LOG_DEBUG, "Got invalid Salmon post: $xml");
+            // TRANS: Client error.
             $this->clientError(_m('Salmon post must be an Atom entry.'));
         }
 
-        // Check the signature
-        $salmon = new Salmon;
-        if (!common_config('ostatus', 'skip_signatures')) {
-            if (!$salmon->verifyMagicEnv($dom)) {
-                common_log(LOG_DEBUG, "Salmon signature verification failed.");
-                $this->clientError(_m('Salmon signature verification failed.'));
-            }
-        }
-
-        $this->act = new Activity($dom->documentElement);
+        $this->activity = new Activity($dom->documentElement);
         return true;
     }
 
@@ -76,10 +82,10 @@ class SalmonAction extends Action
     {
         StatusNet::setApi(true); // Send smaller error pages
 
-        // TODO : Insert new $xml -> notice code
-
-        if (Event::handle('StartHandleSalmon', array($this->activity))) {
-            switch ($this->act->verb)
+        common_log(LOG_DEBUG, "Got a " . $this->activity->verb);
+        if (Event::handle('StartHandleSalmonTarget', array($this->activity, $this->target)) &&
+            Event::handle('StartHandleSalmon', array($this->activity))) {
+            switch ($this->activity->verb)
             {
             case ActivityVerb::POST:
                 $this->handlePost();
@@ -106,65 +112,79 @@ class SalmonAction extends Action
             case ActivityVerb::LEAVE:
                 $this->handleLeave();
                 break;
+            case ActivityVerb::UPDATE_PROFILE:
+                $this->handleUpdateProfile();
+                break;
             default:
-                throw new ClientException(_("Unimplemented."));
+                // TRANS: Client exception.
+                throw new ClientException(_m("Unrecognized activity type."));
             }
             Event::handle('EndHandleSalmon', array($this->activity));
+            Event::handle('EndHandleSalmonTarget', array($this->activity, $this->target));
         }
     }
 
     function handlePost()
     {
-        throw new ClientException(_("Unimplemented!"));
+        // TRANS: Client exception.
+        throw new ClientException(_m("This target doesn't understand posts."));
     }
 
     function handleFollow()
     {
-        throw new ClientException(_("Unimplemented!"));
+        // TRANS: Client exception.
+        throw new ClientException(_m("This target doesn't understand follows."));
     }
 
     function handleUnfollow()
     {
-        throw new ClientException(_("Unimplemented!"));
+        // TRANS: Client exception.
+        throw new ClientException(_m("This target doesn't understand unfollows."));
     }
 
     function handleFavorite()
     {
-        throw new ClientException(_("Unimplemented!"));
+        // TRANS: Client exception.
+        throw new ClientException(_m("This target doesn't understand favorites."));
     }
 
-    /**
-     * Remote user doesn't like one of our posts after all!
-     * Confirm the post is ours, and delete a local favorite event.
-     */
-
     function handleUnfavorite()
     {
-        throw new ClientException(_("Unimplemented!"));
+        // TRANS: Client exception.
+        throw new ClientException(_m("This target doesn't understand unfavorites."));
     }
 
-    /**
-     * Hmmmm
-     */
     function handleShare()
     {
-        throw new ClientException(_("Unimplemented!"));
+        // TRANS: Client exception.
+        throw new ClientException(_m("This target doesn't understand share events."));
     }
 
-    /**
-     * Hmmmm
-     */
     function handleJoin()
     {
-        throw new ClientException(_("Unimplemented!"));
+        // TRANS: Client exception.
+        throw new ClientException(_m("This target doesn't understand joins."));
+    }
+
+    function handleLeave()
+    {
+        // TRANS: Client exception.
+        throw new ClientException(_m("This target doesn't understand leave events."));
     }
 
     /**
-     * Hmmmm
+     * Remote user sent us an update to their profile.
+     * If we already know them, accept the updates.
      */
-    function handleLeave()
+    function handleUpdateProfile()
     {
-        throw new ClientException(_("Unimplemented!"));
+        $oprofile = Ostatus_profile::getActorProfile($this->activity);
+        if ($oprofile) {
+            common_log(LOG_INFO, "Got a profile-update ping from $oprofile->uri");
+            $oprofile->updateFromActivityObject($this->activity->actor);
+        } else {
+            common_log(LOG_INFO, "Ignoring profile-update ping from unknown " . $this->activity->actor->id);
+        }
     }
 
     /**
@@ -172,11 +192,12 @@ class SalmonAction extends Action
      */
     function ensureProfile()
     {
-        $actor = $this->act->actor;
+        $actor = $this->activity->actor;
         if (empty($actor->id)) {
             common_log(LOG_ERR, "broken actor: " . var_export($actor, true));
-            common_log(LOG_ERR, "activity with no actor: " . var_export($this->act, true));
-            throw new Exception("Received a salmon slap from unidentified actor.");
+            common_log(LOG_ERR, "activity with no actor: " . var_export($this->activity, true));
+            // TRANS: Exception.
+            throw new Exception(_m('Received a salmon slap from unidentified actor.'));
         }
 
         return Ostatus_profile::ensureActivityObjectProfile($actor);
@@ -185,6 +206,6 @@ class SalmonAction extends Action
     function saveNotice()
     {
         $oprofile = $this->ensureProfile();
-        return $oprofile->processPost($this->act, 'salmon');
+        return $oprofile->processPost($this->activity, 'salmon');
     }
 }