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

diff --git a/include/salmon.php b/include/salmon.php
index e93ec23d76..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
@@ -148,17 +172,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,14 +199,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);
 }