salmon protocol changes magicsig draft-experimental, fixes to hostxrd

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 3ace417cd86fd8f7fdb79088be87cb99226b0b81..300ad87466806cf2d982673f66b4d30d6b4b2f03 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -72,12 +72,16 @@ function salmon_post(&$a) {
        $encoding = $base->encoding;
        $alg = $base->alg;
 
-       // If we're talking to status.net or one of their ilk, they aren't following the magic envelope spec
-       // and only signed the data element. We'll be nice and let them validate anyway. 
+       // Salmon magic signatures have evolved and there is no way of knowing ahead of time which
+       // flavour we have. We'll try and verify it regardless.
 
        $stnet_signed_data = $data;
+
        $signed_data = $data  . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg);
 
+       $compliant_format = str_replace('=','',$signed_data);
+
+
        // decode the data
        $data = base64url_decode($data);
 
@@ -130,7 +134,7 @@ function salmon_post(&$a) {
 
        // Setup RSA stuff to verify the signature
 
-       set_include_path(get_include_path() . PATH_SEPARATOR . 'library' . PATH_SEPARATOR . 'phpsec');
+       set_include_path(get_include_path() . PATH_SEPARATOR . 'library/phpsec');
 
        require_once('library/phpsec/Crypt/RSA.php');
 
@@ -150,13 +154,16 @@ function salmon_post(&$a) {
     $rsa->exponent = new Math_BigInteger($e, 256);
 
        // We should have everything we need now. Let's see if it verifies.
-       // If it fails with the proper data format, try again using just the data
-       // (e.g. status.net)
 
-    $verify = $rsa->verify($signed_data,$signature);
+    $verify = $rsa->verify($compliant_format,$signature);
+
+       if(! $verify) {
+               logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
+           $verify = $rsa->verify($signed_data,$signature);
+    }
 
        if(! $verify) {
-               logger('mod-salmon: message did not verify using protocol. Trying statusnet hack.');
+               logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.');
            $verify = $rsa->verify($stnet_signed_data,$signature);
     }
 
@@ -183,7 +190,11 @@ function salmon_post(&$a) {
        if(! count($r)) {
                logger('mod-salmon: Author unknown to us.');
        }       
-       if((count($r)) && ($r[0]['readonly'])) {
+
+       // is this a follower? Or have we ignored the person?
+       // If so we can not accept this post.
+
+       if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == REL_VIP) || ($r[0]['blocked']))) {
                logger('mod-salmon: Ignoring this author.');
                salmon_return(202);
                // NOTREACHED