X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsalmon.php;h=4d8b130f94cca342700f343a58299b8a7b8651b8;hb=008c97c570ea62749a3f486b42c424365863d627;hp=11e42d94364a36cc4eb6f155d4ccd49815e6dc87;hpb=62998bf8b5f0f9ea5180800e4cb69514723890de;p=friendica.git

diff --git a/mod/salmon.php b/mod/salmon.php
index 11e42d9436..4d8b130f94 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -1,12 +1,16 @@
 <?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/crypto.php');
-require_once('library/simplepie/simplepie.inc');
+/**
+ * @file mod/salmon.php
+ */
+use Friendica\App;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+use Friendica\Protocol\OStatus;
+use Friendica\Protocol\Salmon;
+
+require_once 'include/crypto.php';
+require_once 'include/items.php';
+require_once 'include/follow.php';
 
 function salmon_return($val) {
 
@@ -21,7 +25,7 @@ function salmon_return($val) {
 
 }
 
-function salmon_post(&$a) {
+function salmon_post(App $a) {
 
 	$xml = file_get_contents('php://input');
 
@@ -33,8 +37,9 @@ function salmon_post(&$a) {
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
-	if(! count($r))
+	if (! DBM::is_result($r)) {
 		http_status_exit(500);
+	}
 
 	$importer = $r[0];
 
@@ -80,41 +85,14 @@ function salmon_post(&$a) {
 
 	$signed_data = $data  . '.' . base64url_encode($type) . '.' . base64url_encode($encoding) . '.' . base64url_encode($alg);
 
-	$compliant_format = str_replace('=','',$signed_data);
+	$compliant_format = str_replace('=', '', $signed_data);
 
 
 	// 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::salmonAuthor($data, $importer);
+	$author_link = $author["author-link"];
 
 	if(! $author_link) {
 		logger('mod-salmon: Could not retrieve author URI.');
@@ -123,10 +101,9 @@ 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);
+	$key = Salmon::getKey($author_link, $keyhash);
 
 	if(! $key) {
 		logger('mod-salmon: Could not retrieve author key.');
@@ -144,24 +121,28 @@ function salmon_post(&$a) {
 
 	// We should have everything we need now. Let's see if it verifies.
 
-    $verify = rsa_verify($compliant_format,$signature,$pubkey);
+	// Try GNU Social format
+	$verify = rsa_verify($signed_data, $signature, $pubkey);
+	$mode = 1;
 
-	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 protocol. Trying compliant format.');
+		$verify = rsa_verify($compliant_format, $signature, $pubkey);
+		$mode = 2;
+	}
 
-	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 using padding. Trying old statusnet format.');
+		$verify = rsa_verify($stnet_signed_data, $signature, $pubkey);
+		$mode = 3;
+	}
 
-	if(! $verify) {
+	if (! $verify) {
 		logger('mod-salmon: Message did not verify. Discarding.');
 		http_status_exit(400);
 	}
 
-	logger('mod-salmon: Message verified.');
+	logger('mod-salmon: Message verified with mode '.$mode);
 
 
 	/*
@@ -170,20 +151,22 @@ function salmon_post(&$a) {
 	*
 	*/
 
-	$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s' ) 
-		AND `uid` = %d LIMIT 1",
+	$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($author_link),
+		dbesc(normalise_link($author_link)),
 		intval($importer['uid'])
 	);
-	if(! count($r)) {
+	if (! DBM::is_result($r)) {
 		logger('mod-salmon: Author unknown to us.');
-		if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
-			require_once('include/follow.php');
+		if(PConfig::get($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' ) 
+				$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),
@@ -194,32 +177,22 @@ function salmon_post(&$a) {
 		}
 	}
 
-	// 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((DBM::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+	if (DBM::is_result($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);
+	$contact_rec = ((DBM::is_result($r)) ? $r[0] : null);
 
-	consume_feed($feedxml,$importer,$contact_rec,$hub);
+	OStatus::import($data, $importer, $contact_rec, $hub);
 
 	http_status_exit(200);
 }