X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsalmon.php;h=988c542e2d4136558503ab6ff0165c2324607100;hb=05a13a99b2c89db5d01e205301888a8a5c90108a;hp=4043b4f1d93f0c1f243b564e86b9cc1f0453c5c8;hpb=afb04142ce0ec4f291ed22be6e9f7781a7714628;p=friendica.git

diff --git a/include/salmon.php b/include/salmon.php
index 4043b4f1d9..988c542e2d 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -7,7 +7,7 @@ require_once('include/crypto.php');
 function get_salmon_key($uri,$keyhash) {
 	$ret = array();
 
-	logger('Fetching salmon key');
+	logger('Fetching salmon key for '.$uri);
 
 	$arr = lrdd($uri);
 
@@ -44,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];
 	}
@@ -62,34 +62,24 @@ 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;
 
-	// add all namespaces to item
-
-$namespaces = <<< EOT
-<entry xmlns="http://www.w3.org/2005/Atom"
-      xmlns:thr="http://purl.org/syndication/thread/1.0"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      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: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);
-	
+
+	if(! $owner['sprvkey']) {
+		logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
+		$owner['username'],$owner['uid']));
+		return;
+	}
+
+	logger('slapper called for '.$url.'. Data: ' . $slap);
+
 	// create a magic envelope
 
 	$data      = base64url_encode($slap);
@@ -102,11 +92,11 @@ EOT;
 
 	$precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
 
-	$signature   = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),true),$owner['sprvkey']);
+	$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 . $precomputed,$owner['sprvkey']));
 
-	$signature3  = base64url_encode(rsa_sign($data),$owner['sprvkey']);
+	$signature3  = base64url_encode(rsa_sign($data,$owner['sprvkey']));
 
 	$salmon_tpl = get_markup_template('magicsig.tpl');
 
@@ -118,7 +108,7 @@ EOT;
 		'$signature' => $signature
 	));
 
-	// slap them 
+	// slap them
 	post_url($url,$salmon, array(
 		'Content-type: application/magic-envelope+xml',
 		'Content-length: ' . strlen($salmon)
@@ -131,7 +121,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
@@ -145,7 +135,7 @@ EOT;
 			'$signature' => $signature2
 		));
 
-		// slap them 
+		// slap them
 		post_url($url,$salmon, array(
 			'Content-type: application/magic-envelope+xml',
 			'Content-length: ' . strlen($salmon)
@@ -155,11 +145,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,
@@ -169,7 +159,7 @@ EOT;
 				'$signature' => $signature3
 			));
 
-			// slap them 
+			// slap them
 			post_url($url,$salmon, array(
 				'Content-type: application/magic-envelope+xml',
 				'Content-length: ' . strlen($salmon)
@@ -177,9 +167,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);
 }