X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=918c55ee14cb817f192232c675ff112ea79792c9;hb=697b8a6cb84d042f0f34ec71a6f3e8739a52860c;hp=cae346493f4be64db27dd089ff1b5ac2103b3ce5;hpb=097620b62799c96d610d73410ec07a6b8cdf82f0;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index cae346493f..918c55ee14 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,13 +22,15 @@
 use Friendica\App;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
 use Friendica\Util\Network;
-use Friendica\Core\System;
+use Friendica\Model\GServer;
+use Friendica\Model\Post;
 
 function hub_return($valid, $body)
 {
@@ -37,7 +39,7 @@ function hub_return($valid, $body)
 	} else {
 		throw new \Friendica\Network\HTTPException\NotFoundException();
 	}
-	exit();
+	System::exit();
 }
 
 // when receiving an XML feed, always return OK
@@ -49,23 +51,23 @@ function hub_post_return()
 
 function pubsub_init(App $a)
 {
-	$nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
-	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
+	$nick       = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1])   : '');
+	$contact_id = ((DI::args()->getArgc() > 2) ? intval(DI::args()->getArgv()[2]) : 0 );
 
-	if ($_SERVER['REQUEST_METHOD'] === 'GET') {
-		$hub_mode      = Strings::escapeTags(trim($_GET['hub_mode'] ?? ''));
-		$hub_topic     = Strings::escapeTags(trim($_GET['hub_topic'] ?? ''));
-		$hub_challenge = Strings::escapeTags(trim($_GET['hub_challenge'] ?? ''));
-		$hub_verify    = Strings::escapeTags(trim($_GET['hub_verify_token'] ?? ''));
+	if (DI::args()->getMethod() === App\Router::GET) {
+		$hub_mode      = trim($_GET['hub_mode']         ?? '');
+		$hub_topic     = trim($_GET['hub_topic']        ?? '');
+		$hub_challenge = trim($_GET['hub_challenge']    ?? '');
+		$hub_verify    = trim($_GET['hub_verify_token'] ?? '');
 
-		Logger::log('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
-		Logger::log('Data: ' . print_r($_GET,true), Logger::DATA);
+		Logger::notice('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
+		Logger::debug('Data: ', ['get' => $_GET]);
 
 		$subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
 		$owner = DBA::selectFirst('user', ['uid'], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
 		if (!DBA::isResult($owner)) {
-			Logger::log('Local account not found: ' . $nick);
+			Logger::notice('Local account not found: ' . $nick);
 			hub_return(false, '');
 		}
 
@@ -77,12 +79,12 @@ function pubsub_init(App $a)
 
 		$contact = DBA::selectFirst('contact', ['id', 'poll'], $condition);
 		if (!DBA::isResult($contact)) {
-			Logger::log('Contact ' . $contact_id . ' not found.');
+			Logger::notice('Contact ' . $contact_id . ' not found.');
 			hub_return(false, '');
 		}
 
 		if (!empty($hub_topic) && !Strings::compareLink($hub_topic, $contact['poll'])) {
-			Logger::log('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
+			Logger::notice('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
 			hub_return(false, '');
 		}
 
@@ -90,13 +92,13 @@ function pubsub_init(App $a)
 		// Don't allow outsiders to unsubscribe us.
 
 		if (($hub_mode === 'unsubscribe') && empty($hub_verify)) {
-			Logger::log('Bogus unsubscribe');
+			Logger::notice('Bogus unsubscribe');
 			hub_return(false, '');
 		}
 
 		if (!empty($hub_mode)) {
-			DBA::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
-			Logger::log($hub_mode . ' success for contact ' . $contact_id . '.');
+			Contact::update(['subhub' => $subscribe], ['id' => $contact['id']]);
+			Logger::notice($hub_mode . ' success for contact ' . $contact_id . '.');
 		}
  		hub_return(true, $hub_challenge);
 	}
@@ -106,11 +108,11 @@ function pubsub_post(App $a)
 {
 	$xml = Network::postdata();
 
-	Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  DI::args()->getCommand() . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
-	Logger::log('Data: ' . $xml, Logger::DATA);
+	Logger::info('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  DI::args()->getCommand() . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
+	Logger::debug('Data: ' . $xml);
 
-	$nick       = (($a->argc > 1) ? Strings::escapeTags(trim($a->argv[1])) : '');
-	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
+	$nick       = ((DI::args()->getArgc() > 1) ? trim(DI::args()->getArgv()[1])   : '');
+	$contact_id = ((DI::args()->getArgc() > 2) ? intval(DI::args()->getArgv()[2]) : 0 );
 
 	$importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
 	if (!DBA::isResult($importer)) {
@@ -125,33 +127,32 @@ function pubsub_post(App $a)
 		if (!empty($author['contact-id'])) {
 			$condition = ['id' => $author['contact-id'], 'uid' => $importer['uid'], 'subhub' => true, 'blocked' => false];
 			$contact = DBA::selectFirst('contact', [], $condition);
-			Logger::log('No record for ' . $nick .' with contact id ' . $contact_id . ' - using '.$author['contact-id'].' instead.');
+			Logger::notice('No record for ' . $nick .' with contact id ' . $contact_id . ' - using '.$author['contact-id'].' instead.');
 		}
 		if (!DBA::isResult($contact)) {
-			Logger::log('Contact ' . $author["author-link"] . ' (' . $contact_id . ') for user ' . $nick . " wasn't found - ignored. XML: " . $xml);
+			Logger::notice('Contact ' . $author["author-link"] . ' (' . $contact_id . ') for user ' . $nick . " wasn't found - ignored. XML: " . $xml);
 			hub_post_return();
 		}
 	}
 
+	if (!empty($contact['gsid'])) {
+		GServer::setProtocol($contact['gsid'], Post\DeliveryData::OSTATUS);
+	}
+
 	if (!in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND]) && ($contact['network'] != Protocol::FEED)) {
-		Logger::log('Contact ' . $contact['id'] . ' is not expected to share with us - ignored.');
+		Logger::notice('Contact ' . $contact['id'] . ' is not expected to share with us - ignored.');
 		hub_post_return();
 	}
 
-	// We import feeds from OStatus, Friendica and ATOM/RSS.
-	/// @todo Check if Friendica posts really arrive here - otherwise we can discard some stuff
-	if (!in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN, Protocol::FEED])) {
+	// We only import feeds from OStatus here
+	if ($contact['network'] != Protocol::OSTATUS) {
+		Logger::warning('Unexpected network', ['contact' => $contact]);
 		hub_post_return();
 	}
 
-	Logger::log('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
+	Logger::info('Import item for ' . $nick . ' from ' . $contact['nick'] . ' (' . $contact['id'] . ')');
 	$feedhub = '';
-	consume_feed($xml, $importer, $contact, $feedhub);
-
-	// do it a second time for DFRN so that any children find their parents.
-	if ($contact['network'] === Protocol::DFRN) {
-		consume_feed($xml, $importer, $contact, $feedhub);
-	}
+	OStatus::import($xml, $importer, $contact, $feedhub);
 
 	hub_post_return();
 }