X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsubhubbub.php;h=361cb0a597e1cda7bbfbe8a0bab0f06ab0a53bbe;hb=60af1314a0ce1e5a9cfa0ad933de6dcee212ddf5;hp=bc90c76d66533ca5ec1df66557637c2bf7b6e583;hpb=7fb9e1c7c8f5f4887e44aadf6115b68c6cc66d03;p=friendica.git

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index bc90c76d66..361cb0a597 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,10 +26,6 @@ use Friendica\DI;
 use Friendica\Model\PushSubscriber;
 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.
@@ -47,12 +43,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') {
@@ -60,11 +56,11 @@ 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 (DI::args()->getArgc() > 1) {
 			// Normally the url should now contain the nick name as last part of the url
@@ -77,7 +73,7 @@ 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();
 		}
 
@@ -85,7 +81,7 @@ function pubsubhubbub_init(App $a) {
 		$condition = ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false];
 		$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();
 		}
 
@@ -94,7 +90,7 @@ function pubsubhubbub_init(App $a) {
 			'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();
 		}
 
@@ -103,7 +99,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();
 		}
 
@@ -131,14 +127,14 @@ function pubsubhubbub_init(App $a) {
 
 		// 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();
 		}