checkAuthor not used anywhere

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

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 384506280d45d2f40e5af85ebb83221398ed1107..c6fbc0f3411376a9acafecfa280ba3ebf9a41c7f 100644 (file)
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -26,7 +26,6 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class MagicEnvelope
 {
     const ENCODING = 'base64url';
@@ -48,36 +47,51 @@ class MagicEnvelope
         return 'http://' . $user_id;
     }
 
+    /**
+     * Get the Salmon keypair from a URI, uses XRD Discovery etc.
+     *
+     * @return Magicsig with loaded keypair
+     */
     public function getKeyPair($signer_uri)
     {
         $disco = new Discovery();
 
-        try {
-            $xrd = $disco->lookup($signer_uri);
-        } catch (Exception $e) {
-            return false;
+        // Throws exception on lookup problems
+        $xrd = $disco->lookup($signer_uri);
+
+        $link = $xrd->get(Magicsig::PUBLICKEYREL);
+        if (is_null($link)) {
+            // TRANS: Exception.
+            throw new Exception(_m('Unable to locate signer public key.'));
         }
-        if ($xrd->links) {
-            if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) {
-                $keypair = false;
-                $parts = explode(',', $link['href']);
-                if (count($parts) == 2) {
-                    $keypair = $parts[1];
-                } else {
-                    // Backwards compatibility check for separator bug in 0.9.0
-                    $parts = explode(';', $link['href']);
-                    if (count($parts) == 2) {
-                        $keypair = $parts[1];
-                    }
-                }
 
-                if ($keypair) {
-                    return $keypair;
-                }
+        // We have a public key element, let's hope it has proper key data.
+        $keypair = false;
+        $parts = explode(',', $link->href);
+        if (count($parts) == 2) {
+            $keypair = $parts[1];
+        } else {
+            // Backwards compatibility check for separator bug in 0.9.0
+            $parts = explode(';', $link->href);
+            if (count($parts) == 2) {
+                $keypair = $parts[1];
             }
         }
-        // TRANS: Exception.
-        throw new Exception(_m('Unable to locate signer public key.'));
+
+        if ($keypair === false) {
+            // For debugging clarity. Keypair did not pass count()-check above. 
+            // TRANS: Exception when public key was not properly formatted.
+            throw new Exception(_m('Incorrectly formatted public key element.'));
+        }
+
+        $magicsig = Magicsig::fromString($keypair);
+        if (!$magicsig instanceof Magicsig) {
+            common_debug('Salmon error: unable to parse keypair: '.var_export($keypair,true));
+            // TRANS: Exception when public key was properly formatted but not parsable.
+            throw new ServerException(_m('Retrieved Salmon keypair could not be parsed.'));
+        }
+
+        return $magicsig;
     }
 
     /**
@@ -203,19 +217,6 @@ class MagicEnvelope
         }
     }
 
-    /**
-     * Check if the author in the Atom entry fragment claims to match
-     * the given identifier URI.
-     *
-     * @param string $text string containing Atom entry XML
-     * @param string $signer_uri
-     * @return boolean
-     */
-    public function checkAuthor($text, $signer_uri)
-    {
-        return ($this->getAuthor($text) == $signer_uri);
-    }
-
     /**
      * Attempt to verify cryptographic signing for parsed envelope data.
      * Requires network access to retrieve public key referenced by the envelope signer.
@@ -243,20 +244,13 @@ class MagicEnvelope
         $signer_uri = $this->getAuthor($text);
 
         try {
-            $keypair = $this->getKeyPair($signer_uri);
+            $magicsig = $this->getKeyPair($signer_uri);
         } catch (Exception $e) {
             common_log(LOG_DEBUG, "Salmon error: ".$e->getMessage());
             return false;
         }
 
-        $verifier = Magicsig::fromString($keypair);
-
-        if (!$verifier) {
-            common_log(LOG_DEBUG, "Salmon error: unable to parse keypair");
-            return false;
-        }
-
-        return $verifier->verify($this->signingText($env), $env['sig']);
+        return $magicsig->verify($this->signingText($env), $env['sig']);
     }
 
     /**
@@ -327,4 +321,3 @@ class MagicEnvelopeCompat extends MagicEnvelope {
         return $env['data'];
     }
 }
-