X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsubhubbub.php;h=5dda9ee0af966fc9a97da01049317d8d594fb889;hb=3444c29b0bf56b84d58516991f65cebb03fb627e;hp=3d6b48fd4bcc7a037d3610dec10c07435a6dc711;hpb=13a10b8f20ac7c5927c39d9e80e1a7d515385736;p=friendica.git

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 3d6b48fd4b..5dda9ee0af 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.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
  *
@@ -21,16 +21,12 @@
 
 use Friendica\App;
 use Friendica\Core\Logger;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\PushSubscriber;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
-function post_var($name) {
-	return !empty($_POST[$name]) ? Strings::escapeTags(trim($_POST[$name])) : '';
-}
-
 function pubsubhubbub_init(App $a) {
 	// PuSH subscription must be considered "public" so just block it
 	// if public access isn't enabled.
@@ -48,12 +44,12 @@ function pubsubhubbub_init(App $a) {
 	// [hub_secret] => af11...
 	// [hub_topic] => http://friendica.local/dfrn_poll/sazius
 
-	if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-		$hub_mode = post_var('hub_mode');
-		$hub_callback = post_var('hub_callback');
-		$hub_verify_token = post_var('hub_verify_token');
-		$hub_secret = post_var('hub_secret');
-		$hub_topic = post_var('hub_topic');
+	if (DI::args()->getMethod() === App\Router::POST) {
+		$hub_mode         = $_POST['hub_mode']         ?? '';
+		$hub_callback     = $_POST['hub_callback']     ?? '';
+		$hub_verify_token = $_POST['hub_verify_token'] ?? '';
+		$hub_secret       = $_POST['hub_secret']       ?? '';
+		$hub_topic        = $_POST['hub_topic']        ?? '';
 
 		// check for valid hub_mode
 		if ($hub_mode === 'subscribe') {
@@ -61,15 +57,15 @@ function pubsubhubbub_init(App $a) {
 		} elseif ($hub_mode === 'unsubscribe') {
 			$subscribe = 0;
 		} else {
-			Logger::log("Invalid hub_mode=$hub_mode, ignoring.");
+			Logger::notice("Invalid hub_mode=$hub_mode, ignoring.");
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
-		Logger::log("$hub_mode request from " . $_SERVER['REMOTE_ADDR']);
+		Logger::info("$hub_mode request from " . $_SERVER['REMOTE_ADDR']);
 
-		if ($a->argc > 1) {
+		if (DI::args()->getArgc() > 1) {
 			// Normally the url should now contain the nick name as last part of the url
-			$nick = $a->argv[1];
+			$nick = DI::args()->getArgv()[1];
 		} else {
 			// Get the nick name from the topic as a fallback
 			$nick = $hub_topic;
@@ -78,30 +74,24 @@ function pubsubhubbub_init(App $a) {
 		$nick = basename($nick, '.atom');
 
 		if (!$nick) {
-			Logger::log('Bad hub_topic=$hub_topic, ignoring.');
+			Logger::notice('Bad hub_topic=$hub_topic, ignoring.');
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
 		// fetch user from database given the nickname
 		$condition = ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false];
-		$owner = DBA::selectFirst('user', ['uid', 'hidewall', 'nickname'], $condition);
+		$owner = DBA::selectFirst('user', ['uid', 'nickname'], $condition);
 		if (!DBA::isResult($owner)) {
-			Logger::log('Local account not found: ' . $nick . ' - topic: ' . $hub_topic . ' - callback: ' . $hub_callback);
+			Logger::notice('Local account not found: ' . $nick . ' - topic: ' . $hub_topic . ' - callback: ' . $hub_callback);
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
-		// abort if user's wall is supposed to be private
-		if ($owner['hidewall']) {
-			Logger::log('Local user ' . $nick . 'has chosen to hide wall, ignoring.');
-			throw new \Friendica\Network\HTTPException\ForbiddenException();
-		}
-
 		// get corresponding row from contact table
 		$condition = ['uid' => $owner['uid'], 'blocked' => false,
 			'pending' => false, 'self' => true];
 		$contact = DBA::selectFirst('contact', ['poll'], $condition);
 		if (!DBA::isResult($contact)) {
-			Logger::log('Self contact for user ' . $owner['uid'] . ' not found.');
+			Logger::notice('Self contact for user ' . $owner['uid'] . ' not found.');
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
@@ -110,7 +100,7 @@ function pubsubhubbub_init(App $a) {
 		$self = DI::baseUrl() . '/api/statuses/user_timeline/' . $owner['nickname'] . '.atom';
 
 		if (!Strings::compareLink($hub_topic, $contact['poll']) && !Strings::compareLink($hub_topic2, $contact['poll']) && !Strings::compareLink($hub_topic, $self)) {
-			Logger::log('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
+			Logger::notice('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
@@ -132,20 +122,20 @@ function pubsubhubbub_init(App $a) {
 		$hub_callback = rtrim($hub_callback, ' ?&#');
 		$separator = parse_url($hub_callback, PHP_URL_QUERY) === null ? '?' : '&';
 
-		$fetchResult = Network::fetchUrlFull($hub_callback . $separator . $params);
+		$fetchResult = DI::httpClient()->fetchFull($hub_callback . $separator . $params);
 		$body = $fetchResult->getBody();
 		$ret = $fetchResult->getReturnCode();
 
 		// give up if the HTTP return code wasn't a success (2xx)
 		if ($ret < 200 || $ret > 299) {
-			Logger::log("Subscriber verification for $hub_topic at $hub_callback returned $ret, ignoring.");
+			Logger::notice("Subscriber verification for $hub_topic at $hub_callback returned $ret, ignoring.");
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
 		// check that the correct hub_challenge code was echoed back
 		if (trim($body) !== $hub_challenge) {
-			Logger::log("Subscriber did not echo back hub.challenge, ignoring.");
-			Logger::log("\"$hub_challenge\" != \"".trim($body)."\"");
+			Logger::notice("Subscriber did not echo back hub.challenge, ignoring.");
+			Logger::notice("\"$hub_challenge\" != \"".trim($body)."\"");
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
@@ -153,5 +143,5 @@ function pubsubhubbub_init(App $a) {
 
 		throw new \Friendica\Network\HTTPException\AcceptedException();
 	}
-	exit();
+	System::exit();
 }