Merge branch 'profile' into 'nightly'

[quix0rs-gnu-social.git] / plugins / OStatus / lib / salmon.php

diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index 8135568edbf2793fd68dd40e3b661d3ce6091e71..b964538cbcb33e31c62689722904095f00c69756 100644 (file)
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -39,14 +39,14 @@ class Salmon
      * Sign and post the given Atom entry as a Salmon message.
      *
      * Side effects: may generate a keypair on-demand for the given user,
-     * which can be very slow on some systems.
+     * which can be very slow on some systems (like those without php5-gmp).
      *
      * @param string $endpoint_uri
      * @param string $xml string representation of payload
-     * @param Profile $actor local user profile whose keys to sign with
+     * @param Profile $user profile whose keys we sign with (must be a local user)
      * @return boolean success
      */
-    public function post($endpoint_uri, $xml, Profile $actor)
+    public static function post($endpoint_uri, $xml, Profile $actor, Profile $target=null)
     {
         if (empty($endpoint_uri)) {
             common_debug('No endpoint URI for Salmon post to '.$actor->getUri());
@@ -54,92 +54,18 @@ class Salmon
         }
 
         try {
-            $envelope = $this->createMagicEnv($xml, $actor);
+            $magic_env = MagicEnvelope::signAsUser($xml, $actor->getUser());
         } catch (Exception $e) {
             common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
             return false;
         }
 
-        $headers = array('Content-Type: application/magic-envelope+xml');
-
-        try {
-            $client = new HTTPClient();
-            $client->setBody($envelope);
-            $response = $client->post($endpoint_uri, $headers);
-        } catch (HTTP_Request2_Exception $e) {
-            common_log(LOG_ERR, "Salmon ($class) post to $endpoint_uri failed: " . $e->getMessage());
-            return false;
-        }
-        if ($response->getStatus() != 200) {
-            common_log(LOG_ERR, "Salmon ($class) at $endpoint_uri returned status " .
-                $response->getStatus() . ': ' . $response->getBody());
+        // $target is so far only used in Diaspora, so it can be null
+        if (Event::handle('SalmonSlap', array($endpoint_uri, $magic_env, $target))) {
             return false;
+            //throw new ServerException('Could not distribute salmon slap as no plugin completed the event.');
         }
 
-        // Success!
         return true;
     }
-
-    /**
-     * Encode the given string as a signed MagicEnvelope XML document,
-     * using the keypair for the given local user profile.
-     *
-     * Side effects: will create and store a keypair on-demand if one
-     * hasn't already been generated for this user. This can be very slow
-     * on some systems.
-     *
-     * @param string $text XML fragment to sign, assumed to be Atom
-     * @param Profile $actor Profile of a local user to use as signer
-     *
-     * @return string XML string representation of magic envelope
-     *
-     * @throws Exception on bad profile input or key generation problems
-     * @fixme if signing fails, this seems to return the original text without warning. Is there a reason for this?
-     */
-    public function createMagicEnv($text, $actor)
-    {
-        $magic_env = new MagicEnvelope();
-
-        // We only generate keys for our local users of course, so let
-        // getUser throw an exception if the profile is not local.
-        $user = $actor->getUser();
-
-        // Find already stored key
-        $magicsig = Magicsig::getKV('user_id', $user->id);
-        if (!$magicsig instanceof Magicsig) {
-            // No keypair yet, let's generate one.
-            $magicsig = new Magicsig();
-            $magicsig->generate($user->id);
-        }
-
-        try {
-            $env = $magic_env->signMessage($text, 'application/atom+xml', $magicsig->toString());
-        } catch (Exception $e) {
-            return $text;
-        }
-        return $magic_env->toXML($env);
-    }
-
-    /**
-     * Check if the given magic envelope is well-formed and correctly signed.
-     * Needs to have network access to fetch public keys over the web if not
-     * already stored locally.
-     *
-     * Side effects: exceptions and caching updates may occur during network
-     * fetches.
-     *
-     * @param string $text XML fragment of magic envelope
-     * @return boolean
-     *
-     * @throws Exception on bad profile input or key generation problems
-     * @fixme could hit fatal errors or spew output on invalid XML
-     */
-     public function verifyMagicEnv($text)
-     {
-        $magic_env = new MagicEnvelope();
-
-        $env = $magic_env->parse($text);
-
-        return $magic_env->verify($env);
-    }
 }