Ops, one more left ...

[friendica.git] / mod / pubsubhubbub.php

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index ffab754dee91bbdf228907ee921f9ac9d807b912..8f9478d8aa51d0a322e6299156cca5968b9751b3 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -3,9 +3,9 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\PushSubscriber;
 use Friendica\Util\Network;
-use Friendica\Util\Temporal;
 
 function post_var($name) {
        return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
@@ -42,12 +42,11 @@ function pubsubhubbub_init(App $a) {
                } elseif ($hub_mode === 'unsubscribe') {
                        $subscribe = 0;
                } else {
-                       logger("pubsubhubbub: invalid hub_mode=$hub_mode, ignoring.");
+                       logger("Invalid hub_mode=$hub_mode, ignoring.");
                        System::httpExit(404);
                }
 
-               logger("pubsubhubbub: $hub_mode request from " .
-                          $_SERVER['REMOTE_ADDR']);
+               logger("$hub_mode request from " . $_SERVER['REMOTE_ADDR']);
 
                // get the nick name from the topic, a bit hacky but needed as a fallback
                $nick = substr(strrchr($hub_topic, "/"), 1);
@@ -58,44 +57,37 @@ function pubsubhubbub_init(App $a) {
                }
 
                if (!$nick) {
-                       logger('pubsubhubbub: bad hub_topic=$hub_topic, ignoring.');
+                       logger('Bad hub_topic=$hub_topic, ignoring.');
                        System::httpExit(404);
                }
 
                // fetch user from database given the nickname
-               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s'" .
-                          " AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
-                          dbesc($nick));
-
-               if (!DBM::is_result($r)) {
-                       logger('pubsubhubbub: local account not found: ' . $nick);
+               $condition = ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false];
+               $owner = DBA::selectFirst('user', ['uid', 'hidewall'], $condition);
+               if (!DBA::isResult($owner)) {
+                       logger('Local account not found: ' . $nick . ' - topic: ' . $hub_topic . ' - callback: ' . $hub_callback);
                        System::httpExit(404);
                }
 
-               $owner = $r[0];
-
                // abort if user's wall is supposed to be private
-               if ($r[0]['hidewall']) {
-                       logger('pubsubhubbub: local user ' . $nick .
-                                  'has chosen to hide wall, ignoring.');
+               if ($owner['hidewall']) {
+                       logger('Local user ' . $nick . 'has chosen to hide wall, ignoring.');
                        System::httpExit(403);
                }
 
                // get corresponding row from contact table
-               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked`".
-                          " AND NOT `pending` AND `self` LIMIT 1",
-                          intval($owner['uid']));
-               if (!DBM::is_result($r)) {
-                       logger('pubsubhubbub: contact not found.');
+               $condition = ['uid' => $owner['uid'], 'blocked' => false,
+                       'pending' => false, 'self' => true];
+               $contact = DBA::selectFirst('contact', ['poll'], $condition);
+               if (!DBA::isResult($contact)) {
+                       logger('Self contact for user ' . $owner['uid'] . ' not found.');
                        System::httpExit(404);
                }
 
-               $contact = $r[0];
-
                // sanity check that topic URLs are the same
-               if (!link_compare($hub_topic, $contact['poll'])) {
-                       logger('pubsubhubbub: hub topic ' . $hub_topic . ' != ' .
-                                  $contact['poll']);
+               $hub_topic2 = str_replace('/feed/', '/dfrn_poll/', $hub_topic);
+               if (!link_compare($hub_topic, $contact['poll']) && !link_compare($hub_topic2, $contact['poll'])) {
+                       logger('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
                        System::httpExit(404);
                }
 
@@ -117,56 +109,20 @@ function pubsubhubbub_init(App $a) {
 
                // give up if the HTTP return code wasn't a success (2xx)
                if ($ret < 200 || $ret > 299) {
-                       logger("pubsubhubbub: subscriber verification at $hub_callback ".
-                                  "returned $ret, ignoring.");
+                       logger("Subscriber verification for $hub_topic at $hub_callback returned $ret, ignoring.");
                        System::httpExit(404);
                }
 
                // check that the correct hub_challenge code was echoed back
                if (trim($body) !== $hub_challenge) {
-                       logger("pubsubhubbub: subscriber did not echo back ".
-                                  "hub.challenge, ignoring.");
+                       logger("Subscriber did not echo back hub.challenge, ignoring.");
                        logger("\"$hub_challenge\" != \"".trim($body)."\"");
                        System::httpExit(404);
                }
 
-               // fetch the old subscription if it exists
-               $r = q("SELECT * FROM `push_subscriber` WHERE `callback_url` = '%s'",
-                 dbesc($hub_callback));
-
-               // delete old subscription if it exists
-               q("DELETE FROM `push_subscriber` WHERE `callback_url` = '%s'",
-                 dbesc($hub_callback));
-
-               if ($subscribe) {
-                       $last_update = Temporal::convert();
-                       $push_flag = 0;
-
-                       // if we are just updating an old subscription, keep the
-                       // old values for push and last_update
-                       if (DBM::is_result($r)) {
-                               $last_update = $r[0]['last_update'];
-                               $push_flag = $r[0]['push'];
-                       }
-
-                       // subscribe means adding the row to the table
-                       q("INSERT INTO `push_subscriber` (`uid`, `callback_url`, " .
-                         "`topic`, `nickname`, `push`, `last_update`, `secret`) values " .
-                         "(%d, '%s', '%s', '%s', %d, '%s', '%s')",
-                         intval($owner['uid']),
-                         dbesc($hub_callback),
-                         dbesc($hub_topic),
-                         dbesc($nick),
-                         intval($push_flag),
-                         dbesc($last_update),
-                         dbesc($hub_secret));
-                       logger("pubsubhubbub: successfully subscribed [$hub_callback].");
-               } else {
-                       logger("pubsubhubbub: successfully unsubscribed [$hub_callback].");
-                       // we do nothing here, since the row was already deleted
-               }
+               PushSubscriber::renew($owner['uid'], $nick, $subscribe, $hub_callback, $hub_topic, $hub_secret);
+
                System::httpExit(202);
        }
-
        killme();
 }