X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsubhubbub.php;h=5dda9ee0af966fc9a97da01049317d8d594fb889;hb=3444c29b0bf56b84d58516991f65cebb03fb627e;hp=11fbf2cf5f3af52f7bc4919fbbb68e7776bc6178;hpb=458981f75cff2427976c9abc787eadf8e9e6267f;p=friendica.git diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php index 11fbf2cf5f..5dda9ee0af 100644 --- a/mod/pubsubhubbub.php +++ b/mod/pubsubhubbub.php @@ -1,23 +1,37 @@ . + * + */ use Friendica\App; -use Friendica\Core\Config; 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. - if (Config::get('system', 'block_public')) { - System::httpExit(403); + if (DI::config()->get('system', 'block_public')) { + throw new \Friendica\Network\HTTPException\ForbiddenException(); } // Subscription request from subscriber @@ -30,13 +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 = post_var('hub_verify'); - $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') { @@ -44,15 +57,15 @@ function pubsubhubbub_init(App $a) { } elseif ($hub_mode === 'unsubscribe') { $subscribe = 0; } else { - Logger::log("Invalid hub_mode=$hub_mode, ignoring."); - System::httpExit(404); + 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; @@ -61,22 +74,16 @@ function pubsubhubbub_init(App $a) { $nick = basename($nick, '.atom'); if (!$nick) { - Logger::log('Bad hub_topic=$hub_topic, ignoring.'); - System::httpExit(404); + 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); - System::httpExit(404); - } - - // abort if user's wall is supposed to be private - if ($owner['hidewall']) { - Logger::log('Local user ' . $nick . 'has chosen to hide wall, ignoring.'); - System::httpExit(403); + Logger::notice('Local account not found: ' . $nick . ' - topic: ' . $hub_topic . ' - callback: ' . $hub_callback); + throw new \Friendica\Network\HTTPException\NotFoundException(); } // get corresponding row from contact table @@ -84,17 +91,17 @@ 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.'); - System::httpExit(404); + Logger::notice('Self contact for user ' . $owner['uid'] . ' not found.'); + throw new \Friendica\Network\HTTPException\NotFoundException(); } // sanity check that topic URLs are the same $hub_topic2 = str_replace('/feed/', '/dfrn_poll/', $hub_topic); - $self = System::baseUrl() . '/api/statuses/user_timeline/' . $owner['nickname'] . '.atom'; + $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']); - System::httpExit(404); + Logger::notice('Hub topic ' . $hub_topic . ' != ' . $contact['poll']); + throw new \Friendica\Network\HTTPException\NotFoundException(); } // do subscriber verification according to the PuSH protocol @@ -115,26 +122,26 @@ 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."); - System::httpExit(404); + 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)."\""); - System::httpExit(404); + Logger::notice("Subscriber did not echo back hub.challenge, ignoring."); + Logger::notice("\"$hub_challenge\" != \"".trim($body)."\""); + throw new \Friendica\Network\HTTPException\NotFoundException(); } PushSubscriber::renew($owner['uid'], $nick, $subscribe, $hub_callback, $hub_topic, $hub_secret); - System::httpExit(202); + throw new \Friendica\Network\HTTPException\AcceptedException(); } - killme(); + System::exit(); }