Don't accept non-objects before testing with "instanceof".

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

diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index ef7719a40c3861513549b11dc6096e89d25d56b5..b964538cbcb33e31c62689722904095f00c69756 100644 (file)
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -31,82 +31,41 @@ class Salmon
     const REL_SALMON = 'salmon';
     const REL_MENTIONED = 'mentioned';
 
-    // XXX: these are deprecated 
+    // XXX: these are deprecated
     const NS_REPLIES = "http://salmon-protocol.org/ns/salmon-replies";
     const NS_MENTIONS = "http://salmon-protocol.org/ns/salmon-mention";
-    
+
     /**
      * Sign and post the given Atom entry as a Salmon message.
      *
-     * @fixme pass through the actor for signing?
+     * Side effects: may generate a keypair on-demand for the given user,
+     * which can be very slow on some systems (like those without php5-gmp).
      *
      * @param string $endpoint_uri
-     * @param string $xml
+     * @param string $xml string representation of payload
+     * @param Profile $user profile whose keys we sign with (must be a local user)
      * @return boolean success
      */
-    public function post($endpoint_uri, $xml, $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());
             return false;
         }
 
         try {
-            $xml = $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($xml);
-            $response = $client->post($endpoint_uri, $headers);
-        } catch (HTTP_Request2_Exception $e) {
-            common_log(LOG_ERR, "Salmon post to $endpoint_uri failed: " . $e->getMessage());
-            return false;
-        }
-        if ($response->getStatus() != 200) {
-            common_log(LOG_ERR, "Salmon 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.');
         }
-        return true;
-    }
-
-    public function createMagicEnv($text, $actor)
-    {
-        $magic_env = new MagicEnvelope();
-
-        $user = User::staticGet('id', $actor->id);
-        if ($user->id) {
-            // Use local key
-            $magickey = Magicsig::staticGet('user_id', $user->id);
-            if (!$magickey) {
-                // No keypair yet, let's generate one.
-                $magickey = new Magicsig();
-                $magickey->generate($user->id);
-            } 
-        } else {
-            throw new Exception("Salmon invalid actor for signing");
-        }
-
-        try {
-            $env = $magic_env->signMessage($text, 'application/atom+xml', $magickey->toString());
-        } catch (Exception $e) {
-            return $text;
-        }
-        return $magic_env->toXML($env);
-    }
-
 
-    public function verifyMagicEnv($text)
-    {
-        $magic_env = new MagicEnvelope();
-        
-        $env = $magic_env->parse($text);
-
-        return $magic_env->verify($env);
+        return true;
     }
 }