OStatus: Fixed communication issues with deleted contacts

diff --git a/include/items.php b/include/items.php
index 31c8aaa799394dacdfaec90795523c63b325e989..83aa82c940cc8d2c988b4f2009b924f397b044ed 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -290,7 +290,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
                return;
        }
 
-       $push_url = Config::get('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
+       $push_url = System::baseUrl() . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
 
        // Use a single verify token, even if multiple hubs
        $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string());

diff --git a/index.php b/index.php
index ef84400990198b36bfe6c43ce0c530fdeaa22219..ca7b4217a7fec420e92e56b030257ba2bac55845 100644 (file)
--- a/index.php
+++ b/index.php
@@ -72,7 +72,7 @@ if (!$install) {
        if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http")
                && (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL)
                && (substr(System::baseUrl(), 0, 8) == "https://")
-       ) {
+               && ($_SERVER['REQUEST_METHOD'] == 'GET')) {
                header("HTTP/1.1 302 Moved Temporarily");
                header("Location: " . System::baseUrl() . "/" . $a->query_string);
                exit();

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 1cee91f4db1ef927fe7c9bea04ffaa2175cd539b..028b2ba95e6021aa443f6f85fb4fc6fbcaad9d42 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -2,15 +2,15 @@
 
 use Friendica\App;
 use Friendica\Database\DBM;
+use Friendica\Protocol\OStatus;
 
 function hub_return($valid,$body) {
 
-       if($valid) {
+       if ($valid) {
                header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
                echo $body;
                killme();
-       }
-       else {
+       } else {
                header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . 'Not Found');
                killme();
        }
@@ -34,15 +34,14 @@ function pubsub_init(App $a) {
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
-       if($_SERVER['REQUEST_METHOD'] === 'GET') {
-
+       if ($_SERVER['REQUEST_METHOD'] === 'GET') {
                $hub_mode      = ((x($_GET,'hub_mode'))          ? notags(trim($_GET['hub_mode']))          : '');
                $hub_topic     = ((x($_GET,'hub_topic'))         ? notags(trim($_GET['hub_topic']))         : '');
                $hub_challenge = ((x($_GET,'hub_challenge'))     ? notags(trim($_GET['hub_challenge']))     : '');
                $hub_lease     = ((x($_GET,'hub_lease_seconds')) ? notags(trim($_GET['hub_lease_seconds'])) : '');
                $hub_verify    = ((x($_GET,'hub_verify_token'))  ? notags(trim($_GET['hub_verify_token']))  : '');
 
-               logger('pubsub: Subscription from ' . $_SERVER['REMOTE_ADDR']);
+               logger('pubsub: Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
                logger('pubsub: data: ' . print_r($_GET,true), LOGGER_DATA);
 
                $subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
@@ -50,7 +49,7 @@ function pubsub_init(App $a) {
                $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)) {
+               if (!DBM::is_result($r)) {
                        logger('pubsub: local account not found: ' . $nick);
                        hub_return(false, '');
                }
@@ -65,36 +64,34 @@ function pubsub_init(App $a) {
                        intval($contact_id),
                        intval($owner['uid'])
                );
-               if (! DBM::is_result($r)) {
+               if (!DBM::is_result($r)) {
                        logger('pubsub: contact '.$contact_id.' not found.');
                        hub_return(false, '');
                }
 
-               if ($hub_topic)
-                       if(! link_compare($hub_topic,$r[0]['poll'])) {
+               if ($hub_topic) {
+                       if (!link_compare($hub_topic,$r[0]['poll'])) {
                                logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']);
                                // should abort but let's humour them.
                        }
+               }
 
                $contact = $r[0];
 
                // We must initiate an unsubscribe request with a verify_token.
                // Don't allow outsiders to unsubscribe us.
 
-               if($hub_mode === 'unsubscribe') {
-                       if(! strlen($hub_verify)) {
+               if ($hub_mode === 'unsubscribe') {
+                       if (!strlen($hub_verify)) {
                                logger('pubsub: bogus unsubscribe');
                                hub_return(false, '');
                        }
                        logger('pubsub: unsubscribe success');
                }
 
-               if ($hub_mode)
-                       $r = q("UPDATE `contact` SET `subhub` = %d WHERE `id` = %d",
-                               intval($subscribe),
-                               intval($contact['id'])
-                       );
-
+               if ($hub_mode) {
+                       dba::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
+               }
                hub_return(true, $hub_challenge);
        }
 }
@@ -109,18 +106,13 @@ function pubsub_post(App $a) {
        logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] );
        logger('pubsub: data: ' . $xml, LOGGER_DATA);
 
-//     if(! stristr($xml,'<?xml')) {
-//             logger('pubsub_post: bad xml');
-//             hub_post_return();
-//     }
-
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
        $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)) {
+       if (!DBM::is_result($r)) {
                hub_post_return();
        }
 
@@ -135,19 +127,26 @@ function pubsub_post(App $a) {
                dbesc(NETWORK_FEED)
        );
 
-       if (! DBM::is_result($r)) {
-               logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
-               hub_post_return();
+       if (!DBM::is_result($r)) {
+               $author = OStatus::salmonAuthor($xml, $importer);
+               if (!empty($author['contact-id'])) {
+                       $contact = dba::selectFirst('contact', [], ['id' => $author['contact-id']]);
+                       if (!in_array($contact['rel'], [CONTACT_IS_SHARING, CONTACT_IS_FRIEND]) && ($contact['network'] != NETWORK_FEED)) {
+                               logger('Contact ' . $author['contact-id'] . ' is not expected to share with us - ignored.');
+                               hub_post_return();
+                       }
+                       logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - using '.$author['contact-id'].' instead.');
+               }
+       } else {
+               $contact = $r[0];
        }
 
-       $contact = $r[0];
-
        // we have no way to match Diaspora guid's with atom post id's and could get duplicates.
        // we'll assume that direct delivery is robust (and this is a bad assumption, but the duplicates are messy).
 
-       if($r[0]['network'] === NETWORK_DIASPORA)
+       if ($r[0]['network'] === NETWORK_DIASPORA) {
                hub_post_return();
-
+       }
        $feedhub = '';
 
        require_once('include/items.php');

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index fed5cca98dd0d3a132ba8840d81ec03b31f06532..aad97c80ff57ed687c5ca929c7fdbaba48513f2a 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -246,13 +246,12 @@ class OStatus
                $xpath->registerNamespace('ostatus', NAMESPACE_OSTATUS);
                $xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
 
-               $entries = $xpath->query('/atom:entry');
+               $contact = ["id" => 0];
 
-               foreach ($entries as $entry) {
-                       // fetch the author
-                       $author = self::fetchAuthor($xpath, $entry, $importer, $contact, true);
-                       return $author;
-               }
+               // Fetch the first author
+               $authordata = $xpath->query('//author')->item(0);
+               $author = self::fetchAuthor($xpath, $authordata, $importer, $contact, true);
+               return $author;
        }
 
        /**