X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsalmon.php;h=49384efea76d80009e6036a48669d625bc896ee6;hb=0b4a6f8eaca0d1396e7e944cd4735a573bd1d111;hp=c5ad3e82561c8a304cc6f71541d84bbdd14caab4;hpb=b41218ca303b9fd8258fd613915d3c4b9fd411c0;p=friendica.git

diff --git a/include/salmon.php b/include/salmon.php
index c5ad3e8256..49384efea7 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -19,19 +19,42 @@ function salmon_key($pubkey) {
 
 
 function base64url_encode($s) {
-	return strtr(base64_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();
 
-	$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 +85,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 +111,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
@@ -105,7 +129,8 @@ $namespaces = <<< EOT
       xmlns:media="http://purl.org/syndication/atommedia"
       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:georss="http://www.georss.org/georss" 
+      xmlns:poco="http://portablecontacts.net/spec/1.0" >
 EOT;
 
 	$slap = str_replace('<entry>',$namespaces,$slap);
@@ -129,7 +154,13 @@ EOT;
     $rsa->setHash('sha256');
 	$rsa->loadKey($owner['sprvkey']);
 
-    $signature = $rsa->sign($data);
+	// precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods
+
+	$precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
+
+	$signature  = base64url_encode($rsa->sign($data . $precomputed));
+
+	$signature2  = base64url_encode($rsa->sign($data));
 
 	$salmon_tpl = load_view_file('view/magicsig.tpl');
 	$salmon = replace_macros($salmon_tpl,array(
@@ -141,7 +172,43 @@ EOT;
 	));
 
 	// slap them 
-	post_url($contact['notify'],$salmon);
+	post_url($url,$salmon, array(
+		'Content-type: application/magic-envelope+xml',
+		'Content-length: ' . strlen($salmon)
+	));
+
+	$a = get_app();
+	$return_code = $a->get_curl_code();
+
+	// check for success, e.g. 2xx
+
+	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
+		// the data, without the precomputed blob 
+
+		$salmon = replace_macros($salmon_tpl,array(
+			'$data'      => $data,
+			'$encoding'  => $encoding,
+			'$algorithm' => $algorithm,
+			'$keyhash'   => $keyhash,
+			'$signature' => $signature2
+		));
+
+		// 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); 
+	if(! $return_code)
+		return(-1);
+	return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
+}
 
-	return;
-}
\ No newline at end of file