X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsalmon.php;h=8ebd9016f1dbbfcedd628622c6ae7a37dd663cd2;hb=82b423c5ac3269d39e6384fa3c43d1d9e5285ad4;hp=3d525f51ad36d0a2d55349937c140e404f8b56ea;hpb=cb05801a9031254f5882038de07a3ee4d5f89dd0;p=friendica.git

diff --git a/include/salmon.php b/include/salmon.php
index 3d525f51ad..8ebd9016f1 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -1,132 +1,117 @@
 <?php
 
-require_once('include/crypto.php');
+require_once 'include/crypto.php';
+require_once('include/Probe.php');
 
-
-
-function get_salmon_key($uri,$keyhash) {
+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) {
-			if($a['@attributes']['rel'] === 'magic-public-key') {
+	if (is_array($arr)) {
+		foreach ($arr as $a) {
+			if ($a['@attributes']['rel'] === 'magic-public-key') {
 				$ret[] = $a['@attributes']['href'];
 			}
 		}
-	}
-	else {
+	} else {
 		return '';
 	}
 
 	// 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],','))
-					$ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1);
-				else
-					$ret[$x] = substr($ret[$x],5);
-			}
-			else
+	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 {
+					$ret[$x] = substr($ret[$x], 5);
+				}
+			} elseif (normalise_link($ret[$x]) == 'http://') {
 				$ret[$x] = fetch_url($ret[$x]);
+			}
 		}
 	}
 
 
-	logger('Key located: ' . print_r($ret,true));
+	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) {
-			$hash = base64url_encode(hash('sha256',$a));
-			if($hash == $keyhash)
+	} else {
+		foreach ($ret as $a) {
+			$hash = base64url_encode(hash('sha256', $a));
+			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) {
 
-	if(! strlen($url))
-		return;
+	// 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.",
-		$owner['username'],$owner['uid']));
+	if (! $owner['sprvkey']) {
+		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);
 	$data_type = 'application/atom+xml';
 	$encoding  = 'base64url';
 	$algorithm = 'RSA-SHA256';
-	$keyhash   = base64url_encode(hash('sha256',salmon_key($owner['spubkey'])),true);
+	$keyhash   = base64url_encode(hash('sha256', salmon_key($owner['spubkey'])), true);
 
-	// precomputed base64url encoding of data_type, encoding, algorithm concatenated with periods
+	$precomputed = '.' . base64url_encode($data_type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($algorithm);
 
-	$precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
+	// GNU Social format
+	$signature   = base64url_encode(rsa_sign($data . $precomputed, $owner['sprvkey']));
 
-	$signature   = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey']));
+	// Compliant format
+	$signature2  = base64url_encode(rsa_sign(str_replace('=', '', $data . $precomputed), $owner['sprvkey']));
 
-	$signature2  = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey']));
+	// Old Status.net format
+	$signature3  = base64url_encode(rsa_sign($data, $owner['sprvkey']));
 
-	$signature3  = base64url_encode(rsa_sign($data,$owner['sprvkey']));
+	// At first try the non compliant method that works for GNU Social
+	$xmldata = array("me:env" => array("me:data" => $data,
+			"@attributes" => array("type" => $data_type),
+			"me:encoding" => $encoding,
+			"me:alg" => $algorithm,
+			"me:sig" => $signature,
+			"@attributes2" => array("key_id" => $keyhash)));
 
-	$salmon_tpl = get_markup_template('magicsig.tpl');
+	$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
 
-	$salmon = replace_macros($salmon_tpl,array(
-		'$data'      => $data,
-		'$encoding'  => $encoding,
-		'$algorithm' => $algorithm,
-		'$keyhash'   => $keyhash,
-		'$signature' => $signature
-	));
+	$salmon = xml::from_array($xmldata, $xml, false, $namespaces);
 
-	// slap them 
-	post_url($url,$salmon, array(
+	// slap them
+	post_url($url, $salmon, array(
 		'Content-type: application/magic-envelope+xml',
 		'Content-length: ' . strlen($salmon)
 	));
@@ -136,60 +121,59 @@ EOT;
 
 	// check for success, e.g. 2xx
 
-	if($return_code > 299) {
+	if ($return_code > 299) {
 
-		logger('slapper: compliant salmon failed. Falling back to status.net hack2');
+		logger('GNU Social salmon failed. Falling back to compliant mode');
 
-		// Entirely likely that their salmon implementation is
-		// non-compliant. Let's try once more, this time only signing
-		// the data, without stripping '=' chars
+		// Now try the compliant mode that normally isn't used for GNU Social
+		$xmldata = array("me:env" => array("me:data" => $data,
+				"@attributes" => array("type" => $data_type),
+				"me:encoding" => $encoding,
+				"me:alg" => $algorithm,
+				"me:sig" => $signature2,
+				"@attributes2" => array("key_id" => $keyhash)));
 
-		$salmon = replace_macros($salmon_tpl,array(
-			'$data'      => $data,
-			'$encoding'  => $encoding,
-			'$algorithm' => $algorithm,
-			'$keyhash'   => $keyhash,
-			'$signature' => $signature2
-		));
+		$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
 
-		// slap them 
-		post_url($url,$salmon, array(
+		$salmon = xml::from_array($xmldata, $xml, false, $namespaces);
+
+		// slap them
+		post_url($url, $salmon, array(
 			'Content-type: application/magic-envelope+xml',
 			'Content-length: ' . strlen($salmon)
 		));
 		$return_code = $a->get_curl_code();
+	}
 
+	if ($return_code > 299) {
+		logger('compliant salmon failed. Falling back to old status.net');
 
-		if($return_code > 299) {
-
-			logger('slapper: compliant salmon failed. Falling back to status.net hack3');
+		// Last try. This will most likely fail as well.
+		$xmldata = array("me:env" => array("me:data" => $data,
+				"@attributes" => array("type" => $data_type),
+				"me:encoding" => $encoding,
+				"me:alg" => $algorithm,
+				"me:sig" => $signature3,
+				"@attributes2" => array("key_id" => $keyhash)));
 
-			// Entirely likely that their salmon implementation is
-			// non-compliant. Let's try once more, this time only signing
-			// the data, without the precomputed blob 
+		$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
 
-			$salmon = replace_macros($salmon_tpl,array(
-				'$data'      => $data,
-				'$encoding'  => $encoding,
-				'$algorithm' => $algorithm,
-				'$keyhash'   => $keyhash,
-				'$signature' => $signature3
-			));
+		$salmon = xml::from_array($xmldata, $xml, false, $namespaces);
 
-			// slap them 
-			post_url($url,$salmon, array(
-				'Content-type: application/magic-envelope+xml',
-				'Content-length: ' . strlen($salmon)
-			));
-			$return_code = $a->get_curl_code();
-		}
+		// 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)
+
+	logger('slapper for '.$url.' returned ' . $return_code);
+	if (! $return_code) {
 		return(-1);
-	if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))
+	}
+	if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
 		return(-1);
-
+	}
 	return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
 }
-