Issue 2122: Make sure to always return the correct number of entries

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
index 3ccae2756a56028a0c235d1643574eba6c4ef4e6..a254fe7e97086953d4a8b1c607ad0e1feefd6b39 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -1,27 +1,13 @@
 <?php
 
-require_once('library/asn1.php');
+require_once('include/crypto.php');
 
-function salmon_key($pubkey) {
-       $lines = explode("\n",$pubkey);
-       unset($lines[0]);
-       unset($lines[count($lines)]);
-       $x = base64_decode(implode('',$lines));
-
-       $r = ASN_BASE::parseASNString($x);
-
-       $m = $r[0]->asnData[1]->asnData[0]->asnData[0]->asnData;
-       $e = $r[0]->asnData[1]->asnData[0]->asnData[1]->asnData;
-
-
-       return 'RSA' . '.' . $m . '.' . $e ;
-}
 
 
 function get_salmon_key($uri,$keyhash) {
        $ret = array();
 
-       logger('Fetching salmon key');
+       logger('Fetching salmon key for '.$uri);
 
        $arr = lrdd($uri);
 
@@ -58,10 +44,10 @@ function get_salmon_key($uri,$keyhash) {
        if(count($ret) == 1) {
 
                // We only found one one key so we don't care if the hash matches.
-               // If it's the wrong key we'll find out soon enough because 
-               // message verification will fail. This also covers some older 
+               // If it's the wrong key we'll find out soon enough because
+               // message verification will fail. This also covers some older
                // software which don't supply a keyhash. As long as they only
-               // have one key we'll be right. 
+               // have one key we'll be right.
 
                return $ret[0];
        }
@@ -76,17 +62,22 @@ function get_salmon_key($uri,$keyhash) {
        return '';
 }
 
-       
-               
-function slapper($owner,$url,$slap) {
 
-       logger('slapper called. Data: ' . $slap);
 
-       // does contact have a salmon endpoint? 
+function slapper($owner,$url,$slap) {
+
+       // does contact have a salmon endpoint?
 
        if(! strlen($url))
                return;
 
+
+       if(! $owner['sprvkey']) {
+               logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
+               $owner['username'],$owner['uid']));
+               return;
+       }
+
        // add all namespaces to item
 
 $namespaces = <<< EOT
@@ -103,7 +94,9 @@ $namespaces = <<< EOT
 EOT;
 
        $slap = str_replace('<entry>',$namespaces,$slap);
-       
+
+       logger('slapper called for '.$url.'. Data: ' . $slap);
+
        // create a magic envelope
 
        $data      = base64url_encode($slap);
@@ -112,24 +105,15 @@ EOT;
        $algorithm = 'RSA-SHA256';
        $keyhash   = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true);
 
-       // Setup RSA stuff to PKCS#1 sign the data
-
-       require_once('library/phpsec/Crypt/RSA.php');
-
-    $rsa = new CRYPT_RSA();
-    $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
-    $rsa->setHash('sha256');
-       $rsa->loadKey($owner['sprvkey']);
-
        // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods
 
        $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
 
-       $signature   = base64url_encode($rsa->sign(str_replace('=','',$data . $precomputed),true));
+       $signature   = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey']));
 
-       $signature2  = base64url_encode($rsa->sign($data . $precomputed));
+       $signature2  = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey']));
 
-       $signature3  = base64url_encode($rsa->sign($data));
+       $signature3  = base64url_encode(rsa_sign($data,$owner['sprvkey']));
 
        $salmon_tpl = get_markup_template('magicsig.tpl');
 
@@ -141,7 +125,7 @@ EOT;
                '$signature' => $signature
        ));
 
-       // slap them 
+       // slap them
        post_url($url,$salmon, array(
                'Content-type: application/magic-envelope+xml',
                'Content-length: ' . strlen($salmon)
@@ -154,7 +138,7 @@ EOT;
 
        if($return_code > 299) {
 
-               logger('slapper: compliant salmon failed. Falling back to status.net hack2');
+               logger('compliant salmon failed. Falling back to status.net hack2');
 
                // Entirely likely that their salmon implementation is
                // non-compliant. Let's try once more, this time only signing
@@ -168,7 +152,7 @@ EOT;
                        '$signature' => $signature2
                ));
 
-               // slap them 
+               // slap them
                post_url($url,$salmon, array(
                        'Content-type: application/magic-envelope+xml',
                        'Content-length: ' . strlen($salmon)
@@ -178,11 +162,11 @@ EOT;
 
                if($return_code > 299) {
 
-                       logger('slapper: compliant salmon failed. Falling back to status.net hack3');
+                       logger('compliant salmon failed. Falling back to status.net hack3');
 
                        // Entirely likely that their salmon implementation is
                        // non-compliant. Let's try once more, this time only signing
-                       // the data, without the precomputed blob 
+                       // the data, without the precomputed blob
 
                        $salmon = replace_macros($salmon_tpl,array(
                                '$data'      => $data,
@@ -192,7 +176,7 @@ EOT;
                                '$signature' => $signature3
                        ));
 
-                       // slap them 
+                       // slap them
                        post_url($url,$salmon, array(
                                'Content-type: application/magic-envelope+xml',
                                'Content-length: ' . strlen($salmon)
@@ -200,9 +184,12 @@ EOT;
                        $return_code = $a->get_curl_code();
                }
        }
-       logger('slapper returned ' . $return_code); 
+       logger('slapper for '.$url.' returned ' . $return_code);
        if(! $return_code)
                return(-1);
+       if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))
+               return(-1);
+
        return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
 }