X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsalmon.php;h=2b583347042e24cc8d26dca3868eb8f7ac2054f5;hb=8939a2550273d16005e757e0dde134bd9538dc7b;hp=ba61fffccaaa3f372abeb4b1a69864dd1f980bd2;hpb=8f6ae2b66044a36996ac92a8db1a540db9c71fe3;p=friendica.git

diff --git a/include/salmon.php b/include/salmon.php
index ba61fffcca..2b58334704 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -1,15 +1,14 @@
 <?php
 
 require_once('include/crypto.php');
-
-
+require_once('include/Probe.php');
 
 function get_salmon_key($uri,$keyhash) {
 	$ret = array();
 
-	logger('Fetching salmon key');
+	logger('Fetching salmon key for '.$uri);
 
-	$arr = lrdd($uri);
+	$arr = Probe::lrdd($uri);
 
 	if(is_array($arr)) {
 		foreach($arr as $a) {
@@ -25,78 +24,63 @@ function get_salmon_key($uri,$keyhash) {
 	// We have found at least one key URL
 	// If it's inline, parse it - otherwise get the key
 
-	if(count($ret)) {
-		for($x = 0; $x < count($ret); $x ++) {
-			if(substr($ret[$x],0,5) === 'data:') {
-				if(strstr($ret[$x],','))
+	if (count($ret) > 0) {
+		for ($x = 0; $x < count($ret); $x ++) {
+			if (substr($ret[$x],0,5) === 'data:') {
+				if (strstr($ret[$x],',')) {
 					$ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1);
-				else
+				} else {
 					$ret[$x] = substr($ret[$x],5);
-			}
-			else
+				}
+			} elseif (normalise_link($ret[$x]) == 'http://') {
 				$ret[$x] = fetch_url($ret[$x]);
+			}
 		}
 	}
 
 
 	logger('Key located: ' . print_r($ret,true));
 
-	if(count($ret) == 1) {
+	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];
 	}
 	else {
-		foreach($ret as $a) {
+		foreach ($ret as $a) {
 			$hash = base64url_encode(hash('sha256',$a));
-			if($hash == $keyhash)
+			if ($hash == $keyhash) {
 				return $a;
+			}
 		}
 	}
 
 	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("slapper: user '%s' (%d) does not have a salmon private key. Send failed.",
+		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
-<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);
-	
+	logger('slapper called for '.$url.'. Data: ' . $slap);
+
 	// create a magic envelope
 
 	$data      = base64url_encode($slap);
@@ -109,11 +93,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');
 
@@ -125,7 +109,7 @@ EOT;
 		'$signature' => $signature
 	));
 
-	// slap them 
+	// slap them
 	post_url($url,$salmon, array(
 		'Content-type: application/magic-envelope+xml',
 		'Content-length: ' . strlen($salmon)
@@ -138,7 +122,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
@@ -152,7 +136,7 @@ EOT;
 			'$signature' => $signature2
 		));
 
-		// slap them 
+		// slap them
 		post_url($url,$salmon, array(
 			'Content-type: application/magic-envelope+xml',
 			'Content-length: ' . strlen($salmon)
@@ -162,11 +146,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,
@@ -176,7 +160,7 @@ EOT;
 				'$signature' => $signature3
 			));
 
-			// slap them 
+			// slap them
 			post_url($url,$salmon, array(
 				'Content-type: application/magic-envelope+xml',
 				'Content-length: ' . strlen($salmon)
@@ -184,9 +168,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);
 }