X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=9c22e42d110b3368a7bf6a950761cec238789530;hb=4798675e6e303f55b1f66eb36908dbb311e248d6;hp=6172d17a1ddda0e7c0816fc2cdfbf945f9becbb4;hpb=355c42cb309eb1313097411067ca999b699aa620;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index 6172d17a1d..9c22e42d11 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,12 +1,10 @@
 <?php
 
-
-// There is a lot of debug stuff in here because this is quite a
-// complicated process to try and sort out. 
-
 require_once('include/salmon.php');
+require_once('include/ostatus.php');
 require_once('include/crypto.php');
-require_once('library/simplepie/simplepie.inc');
+require_once('include/items.php');
+require_once('include/follow.php');
 
 function salmon_return($val) {
 
@@ -15,7 +13,7 @@ function salmon_return($val) {
 	if($val >= 200 && $val < 300)
 		$err = 'OK';
 
-	logger('mod-salmon returns ' . $val);	
+	logger('mod-salmon returns ' . $val);
 	header($_SERVER["SERVER_PROTOCOL"] . ' ' . $val . ' ' . $err);
 	killme();
 
@@ -30,7 +28,7 @@ function salmon_post(&$a) {
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
 	$mentions   = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
 
-	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
+	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
 	if(! count($r))
@@ -50,7 +48,7 @@ function salmon_post(&$a) {
 		$base = $dom->env;
 	elseif($dom->data)
 		$base = $dom;
-	
+
 	if(! $base) {
 		logger('mod-salmon: unable to locate salmon data in xml ');
 		http_status_exit(400);
@@ -86,35 +84,8 @@ function salmon_post(&$a) {
 	// decode the data
 	$data = base64url_decode($data);
 
-	// Remove the xml declaration
-	$data = preg_replace('/\<\?xml[^\?].*\?\>/','',$data);
-
-	// Create a fake feed wrapper so simplepie doesn't choke
-
-	$tpl = get_markup_template('fake_feed.tpl');
-	
-	$base = substr($data,strpos($data,'<entry'));
-
-	$feedxml = $tpl . $base . '</feed>';
-
-	logger('mod-salmon: Processed feed: ' . $feedxml);
-
-	// Now parse it like a normal atom feed to scrape out the author URI
-	
-    $feed = new SimplePie();
-    $feed->set_raw_data($feedxml);
-    $feed->enable_order_by_date(false);
-    $feed->init();
-
-	logger('mod-salmon: Feed parsed.');
-
-	if($feed->get_item_quantity()) {
-		foreach($feed->get_items() as $item) {
-			$author = $item->get_author();
-			$author_link = unxmlify($author->get_link());
-			break;
-		}
-	}
+	$author = ostatus_salmon_author($data,$importer);
+	$author_link = $author["author-link"];
 
 	if(! $author_link) {
 		logger('mod-salmon: Could not retrieve author URI.');
@@ -123,8 +94,7 @@ function salmon_post(&$a) {
 
 	// Once we have the author URI, go to the web and try to find their public key
 
-	logger('mod-salmon: Fetching key for ' . $author_link );
-
+	logger('mod-salmon: Fetching key for ' . $author_link);
 
 	$key = get_salmon_key($author_link,$keyhash);
 
@@ -144,17 +114,17 @@ function salmon_post(&$a) {
 
 	// We should have everything we need now. Let's see if it verifies.
 
-    $verify = rsa_verify($compliant_format,$signature,$pubkey);
+	$verify = rsa_verify($compliant_format,$signature,$pubkey);
 
 	if(! $verify) {
 		logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
 	    $verify = rsa_verify($signed_data,$signature,$pubkey);
-    }
+	}
 
 	if(! $verify) {
 		logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.');
 	    $verify = rsa_verify($stnet_signed_data,$signature,$pubkey);
-    }
+	}
 
 	if(! $verify) {
 		logger('mod-salmon: Message did not verify. Discarding.');
@@ -170,46 +140,48 @@ function salmon_post(&$a) {
 	*
 	*/
 
-	$r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `alias` = '%s') 
-		AND `uid` = %d LIMIT 1",
-		dbesc($author_link),
+	$r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
+						AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
+						AND `uid` = %d LIMIT 1",
+		dbesc(NETWORK_OSTATUS),
+		dbesc(NETWORK_DFRN),
+		dbesc(normalise_link($author_link)),
 		dbesc($author_link),
+		dbesc(normalise_link($author_link)),
 		intval($importer['uid'])
 	);
 	if(! count($r)) {
 		logger('mod-salmon: Author unknown to us.');
-	}	
+		if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
+			$result = new_contact($importer['uid'],$author_link);
+			if($result['success']) {
+				$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') 
+					AND `uid` = %d LIMIT 1",
+					dbesc(NETWORK_OSTATUS),
+					dbesc($author_link),
+					dbesc($author_link),
+					intval($importer['uid'])
+				);
+			}
+		}
+	}
 
-	// is this a follower? Or have we ignored the person?
+	// Have we ignored the person?
 	// If so we can not accept this post.
 
-	if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+	//if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+	if(count($r) && $r[0]['blocked']) {
 		logger('mod-salmon: Ignoring this author.');
 		http_status_exit(202);
 		// NOTREACHED
 	}
 
-	require_once('include/items.php');
-
-	// Placeholder for hub discovery. We shouldn't find any hubs
-	// since we supplied the fake feed header - and it doesn't have any.
-
+	// Placeholder for hub discovery.
 	$hub = '';
 
-	/**
-	 *
-	 * anti-spam measure: consume_feed will accept a follow activity from 
-	 * this person (and nothing else) if there is no existing contact record.
-	 *
-	 */
-
 	$contact_rec = ((count($r)) ? $r[0] : null);
 
-	consume_feed($feedxml,$importer,$contact_rec,$hub);
+	ostatus_import($data,$importer,$contact_rec, $hub);
 
 	http_status_exit(200);
 }
-
-
-
-