finish dipsy light colour fixes

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
index a12b7391e06cdf7a59273d2db18d5cd144bfe6e3..3d525f51ad36d0a2d55349937c140e404f8b56ea 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -1,55 +1,8 @@
 <?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 base64url_encode($s) {
-       $s = strtr(base64_encode($s),'+/','-_');
-/*
- *  // placeholder for un-padded base64url_encode 
- *  // per latest salmon rev
- *
- *  $s = str_replace('=','',$s);
- *
- */
-       return $s;
-}
-
-function base64url_decode($s) {
-
-/*
- *  // Placeholder for new rev of salmon which strips base64 padding.
- *  // PHP base64_decode handles the un-padded input without requiring this step
- *  // Uncomment if you find you need it.
- *
- *     $l = strlen($s);
- *     if(! strpos($s,'=')) {
- *             $m = $l % 4;
- *             if($m == 2)
- *                     $s .= '==';
- *             if($m == 3)
- *                     $s .= '=';
- *     }
- *
- */
-
-       return base64_decode(strtr($s,'-_','+/'));
-}
 
 function get_salmon_key($uri,$keyhash) {
        $ret = array();
@@ -120,6 +73,13 @@ function slapper($owner,$url,$slap) {
        if(! strlen($url))
                return;
 
+
+       if(! $owner['sprvkey']) {
+               logger(sprintf("slapper: user '%s' (%d) does not have a salmon private key. Send failed.",
+               $owner['username'],$owner['uid']));
+               return;
+       }
+
        // add all namespaces to item
 
 $namespaces = <<< EOT
@@ -130,7 +90,9 @@ $namespaces = <<< EOT
       xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
       xmlns:as="http://activitystrea.ms/spec/1.0/"
       xmlns:georss="http://www.georss.org/georss" 
-      xmlns:poco="http://portablecontacts.net/spec/1.0" >
+      xmlns:poco="http://portablecontacts.net/spec/1.0" 
+      xmlns:ostatus="http://ostatus.org/schema/1.0" 
+         xmlns:statusnet="http://status.net/schema/api/1/" >                                                                                                   >
 EOT;
 
        $slap = str_replace('<entry>',$namespaces,$slap);
@@ -141,28 +103,20 @@ EOT;
        $data_type = 'application/atom+xml';
        $encoding  = 'base64url';
        $algorithm = 'RSA-SHA256';
-       $keyhash   = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])));
-
-       // Setup RSA stuff to PKCS#1 sign the data
-
-       set_include_path(get_include_path() . PATH_SEPARATOR . 'phpsec');
-
-       require_once('phpsec/Crypt/RSA.php');
-
-    $rsa = new CRYPT_RSA();
-    $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
-    $rsa->setHash('sha256');
-       $rsa->loadKey($owner['sprvkey']);
+       $keyhash   = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true);
 
        // precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods
 
        $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
 
-       $signature  = base64url_encode($rsa->sign($data . $precomputed));
+       $signature   = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey']));
+
+       $signature2  = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey']));
 
-       $signature2  = base64url_encode($rsa->sign($data));
+       $signature3  = base64url_encode(rsa_sign($data,$owner['sprvkey']));
+
+       $salmon_tpl = get_markup_template('magicsig.tpl');
 
-       $salmon_tpl = load_view_file('view/magicsig.tpl');
        $salmon = replace_macros($salmon_tpl,array(
                '$data'      => $data,
                '$encoding'  => $encoding,
@@ -178,15 +132,17 @@ EOT;
        ));
 
        $a = get_app();
-       $return_code = trim($a->get_curl_code());
+       $return_code = $a->get_curl_code();
 
        // check for success, e.g. 2xx
 
-       if(substr($return_code,0,1) !== '2') {
+       if($return_code > 299) {
+
+               logger('slapper: 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
-               // the data, without the precomputed blob 
+               // the data, without stripping '=' chars
 
                $salmon = replace_macros($salmon_tpl,array(
                        '$data'      => $data,
@@ -201,10 +157,39 @@ EOT;
                        'Content-type: application/magic-envelope+xml',
                        'Content-length: ' . strlen($salmon)
                ));
-               $return_code = trim($a->get_curl_code());
+               $return_code = $a->get_curl_code();
+
 
+               if($return_code > 299) {
+
+                       logger('slapper: 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 
+
+                       $salmon = replace_macros($salmon_tpl,array(
+                               '$data'      => $data,
+                               '$encoding'  => $encoding,
+                               '$algorithm' => $algorithm,
+                               '$keyhash'   => $keyhash,
+                               '$signature' => $signature3
+                       ));
+
+                       // slap them 
+                       post_url($url,$salmon, array(
+                               'Content-type: application/magic-envelope+xml',
+                               'Content-length: ' . strlen($salmon)
+                       ));
+                       $return_code = $a->get_curl_code();
+               }
        }
        logger('slapper returned ' . $return_code); 
-       return;
+       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);
 }