Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
index de0ea3802dcabfe8b15835fdf2e27df72ddc2db8..d7060b0f7a583cb48296c1c2d123f9fd105f0be2 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -18,20 +18,41 @@ function salmon_key($pubkey) {
 }
 
 
-function base64url_encode($s) {
-       return strtr(base64_encode($s),'+/','-_');
+function base64url_encode($s, $strip_padding = false) {
+
+       $s = strtr(base64_encode($s),'+/','-_');
+
+       if($strip_padding)
+               $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();
 
-       $debugging = get_config('system','debugging');
-       if($debugging)          
-               file_put_contents('salmon.out', "\n" . 'Fetch key' . "\n", FILE_APPEND);
+       logger('Fetching salmon key');
 
        $arr = lrdd($uri);
 
@@ -62,8 +83,8 @@ function get_salmon_key($uri,$keyhash) {
                }
        }
 
-       if($debugging)
-               file_put_contents('salmon.out', "\n" . 'Key located: ' . print_r($ret,true) . "\n", FILE_APPEND);
+
+       logger('Key located: ' . print_r($ret,true));
 
        if(count($ret) == 1) {
 
@@ -88,12 +109,13 @@ function get_salmon_key($uri,$keyhash) {
 
        
                
-function slapper($owner,$contact,$slap) {
+function slapper($owner,$url,$slap) {
 
+       logger('slapper called. Data: ' . $slap);
 
        // does contact have a salmon endpoint? 
 
-       if(! strlen($contact['notify']))
+       if(! strlen($url))
                return;
 
        // add all namespaces to item
@@ -106,7 +128,8 @@ $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" >
 EOT;
 
        $slap = str_replace('<entry>',$namespaces,$slap);
@@ -136,9 +159,9 @@ EOT;
 
        $signature  = base64url_encode($rsa->sign($data . $precomputed));
 
-       $signature2 = base64url_encode($rsa->sign($data));
+       $signature2  = base64url_encode($rsa->sign($data));
 
-       $salmon_tpl = load_view_file('view/magicsig.tpl');
+       $salmon_tpl = get_markup_template('magicsig.tpl');
        $salmon = replace_macros($salmon_tpl,array(
                '$data'      => $data,
                '$encoding'  => $encoding,
@@ -148,17 +171,19 @@ EOT;
        ));
 
        // slap them 
-       post_url($contact['notify'],$salmon, array(
+       post_url($url,$salmon, array(
                'Content-type: application/magic-envelope+xml',
                'Content-length: ' . strlen($salmon)
        ));
 
        $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 hack');
 
                // Entirely likely that their salmon implementation is
                // non-compliant. Let's try once more, this time only signing
@@ -173,13 +198,16 @@ EOT;
                ));
 
                // slap them 
-               post_url($contact['notify'],$salmon, array(
+               post_url($url,$salmon, array(
                        'Content-type: application/magic-envelope+xml',
                        'Content-length: ' . strlen($salmon)
                ));
-               $return_code = trim($a->get_curl_code);
+               $return_code = $a->get_curl_code();
+
        }
- 
-       return;
+       logger('slapper returned ' . $return_code); 
+       if(! $return_code)
+               return(-1);
+       return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
 }