Removed MagicEnvelopeCompat, legacy from SN <0.9.7

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 8da2225952e603b4df0c2892f67f51f5c27cc7bc..4f2385130931b3eac1c8d6c1750f9e1e79fa1127 100644 (file)
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -286,23 +286,3 @@ class MagicEnvelope
         );
     }
 }
-
-/**
- * Variant of MagicEnvelope using the earlier signature form listed in the MagicEnvelope
- * spec in early 2010; this was used in StatusNet up through 0.9.6, so for backwards compatiblity
- * we still need to accept and sometimes send this format.
- */
-class MagicEnvelopeCompat extends MagicEnvelope {
-
-    /**
-     * StatusNet through 0.9.6 used an earlier version of the MagicEnvelope spec
-     * which used only the input data, without the additional fields, as the plaintext
-     * for signing.
-     *
-     * @param array $env
-     * @return string
-     */
-    public function signingText($env) {
-        return $env['data'];
-    }
-}

diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index 33c7c3d6e82f76a4274e0e16934dd6cc74d4ba44..8135568edbf2793fd68dd40e3b661d3ce6091e71 100644 (file)
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -53,45 +53,31 @@ class Salmon
             return false;
         }
 
-        foreach ($this->formatClasses() as $class) {
-            try {
-                $envelope = $this->createMagicEnv($xml, $actor, $class);
-            } catch (Exception $e) {
-                common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
-                return false;
-            }
-
-            $headers = array('Content-Type: application/magic-envelope+xml');
+        try {
+            $envelope = $this->createMagicEnv($xml, $actor);
+        } catch (Exception $e) {
+            common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
+            return false;
+        }
 
-            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());
-                continue;
-            }
-            if ($response->getStatus() != 200) {
-                common_log(LOG_ERR, "Salmon ($class) at $endpoint_uri returned status " .
-                    $response->getStatus() . ': ' . $response->getBody());
-                continue;
-            }
+        $headers = array('Content-Type: application/magic-envelope+xml');
 
-            // Success!
-            return true;
+        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());
+            return false;
         }
-        return false;
-    }
 
-    /**
-     * List the magic envelope signature class variants in the order we try them.
-     * Multiples are needed for backwards-compat with StatusNet prior to 0.9.7,
-     * which used a draft version of the magic envelope spec.
-     *
-     * FIXME: Deprecate and remove. GNU social shouldn't have to interface with SN<0.9.7
-     */
-    protected function formatClasses() {
-        return array('MagicEnvelope', 'MagicEnvelopeCompat');
+        // Success!
+        return true;
     }
 
     /**
@@ -104,20 +90,15 @@ class Salmon
      *
      * @param string $text XML fragment to sign, assumed to be Atom
      * @param Profile $actor Profile of a local user to use as signer
-     * @param string $class to override the magic envelope signature version, pass a MagicEnvelope subclass here
      *
      * @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, $class='MagicEnvelope')
+    public function createMagicEnv($text, $actor)
     {
-        if (!in_array($class, $this->formatClasses())) {
-            throw new ServerException('Bad class parameter for createMagicEnv');
-        }
-
-        $magic_env = new $class();
+        $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.
@@ -141,8 +122,8 @@ class Salmon
 
     /**
      * Check if the given magic envelope is well-formed and correctly signed.
-     * Needs to have network access to fetch public keys over the web.
-     * Both current and back-compat signature formats will be checked.
+     * 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.
@@ -153,18 +134,12 @@ class Salmon
      * @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)
-    {
-        foreach ($this->formatClasses() as $class) {
-            $magic_env = new $class();
+     public function verifyMagicEnv($text)
+     {
+        $magic_env = new MagicEnvelope();
 
-            $env = $magic_env->parse($text);
-
-            if ($magic_env->verify($env)) {
-                return true;
-            }
-        }
+        $env = $magic_env->parse($text);
 
-        return false;
+        return $magic_env->verify($env);
     }
 }

diff --git a/plugins/OStatus/tests/MagicEnvelopeTest.php b/plugins/OStatus/tests/MagicEnvelopeTest.php
index abed4959f950916a7d714d191c00d8698d62254c..ed17fdb09a8fad79c13b320144b374f2dc6f9330 100644 (file)
--- a/plugins/OStatus/tests/MagicEnvelopeTest.php
+++ b/plugins/OStatus/tests/MagicEnvelopeTest.php
@@ -41,21 +41,4 @@ class MagicEnvelopeTest extends PHPUnit_Framework_TestCase
             )
         );
     }
-
-
-    /**
-     * Test that MagicEnvelope builds the correct plaintext for signing.
-     * @dataProvider provider
-     */
-    public function testSignatureTextCompat($env, $expected)
-    {
-        // Our old code didn't add the extra fields, just used the armored text.
-        $alt = $env['data'];
-
-        $magic = new MagicEnvelopeCompat;
-        $text = $magic->signingText($env);
-
-        $this->assertEquals($alt, $text, "'$text' should be '$alt'");
-    }
-
 }