From 857469d16ab5f244cdacc3dee2da029b55e27c9b Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 23 Jun 2019 09:27:40 +0000 Subject: [PATCH 01/12] Constantly updating public contacts --- src/Model/Contact.php | 13 +++++++++---- src/Worker/Cron.php | 23 +++++++++++++++++++++++ src/Worker/UpdateContact.php | 26 ++++++++++++++++++-------- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index a6026d6440..7a3731e537 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1328,7 +1328,7 @@ class Contact extends BaseObject // Update the contact in the background if needed but it is called by the frontend if ($update_contact && $no_update && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { - Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id); + Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : '')); } if (!$update_contact || $no_update) { @@ -1425,7 +1425,7 @@ class Contact extends BaseObject // Update in the background when we fetched the data solely from the database if ($background_update) { - Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id); + Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : '')); } // Update the newly created contact from data in the gcontact table @@ -1807,6 +1807,8 @@ class Contact extends BaseObject } } + self::updateAvatar($ret['photo'], $uid, $id, $update || $force); + if (!$update) { return true; } @@ -1814,11 +1816,14 @@ class Contact extends BaseObject $ret['nurl'] = Strings::normaliseLink($ret['url']); $ret['updated'] = DateTimeFormat::utcNow(); - self::updateAvatar($ret['photo'], $uid, $id, true); - unset($ret['photo']); DBA::update('contact', $ret, ['id' => $id]); + // Updating all similar contacts when we are updating the public contact + if (($uid == 0) && in_array($ret['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) { + DBA::update('contact', $ret, ['self' => false, 'nurl' => $ret['nurl']]); + } + // Update the corresponding gcontact entry PortableContact::lastUpdated($ret["url"]); diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index f7377a6e71..8d290698d6 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -117,6 +117,9 @@ class Cron // Poll contacts self::pollContacts($parameter, $generation); + // Update contact information + self::updatePublicContacts(); + Logger::log('cron: end'); Config::set('system', 'last_cron', time()); @@ -124,6 +127,26 @@ class Cron return; } + /** + * @brief Update public contacts + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + private static function updatePublicContacts() { + $count = 0; + $last_updated = DateTimeFormat::utc('now - 1 months'); + $condition = ["`network` IN (?, ?, ?, ?) AND `uid` = ? AND NOT `self` AND `last-update` < ?", + Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, 0, $last_updated]; + + $total = DBA::count('contact', $condition); + $contacts = DBA::select('contact', ['id'], $condition, ['limit' => 1000]); + while ($contact = DBA::fetch($contacts)) { + Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id'], 'force'); + ++$count; + } + Logger::info('Initiated update for public contacts', ['interval' => $count, 'total' => $total]); + DBA::close($contacts); + } + /** * @brief Poll contacts for unreceived messages * diff --git a/src/Worker/UpdateContact.php b/src/Worker/UpdateContact.php index ae3b06b506..7679431fd9 100644 --- a/src/Worker/UpdateContact.php +++ b/src/Worker/UpdateContact.php @@ -13,16 +13,26 @@ use Friendica\Database\DBA; class UpdateContact { - public static function execute($contact_id) + public static function execute($contact_id, $command = '') { - $success = Contact::updateFromProbe($contact_id); - // Update the "updated" field if the contact could be probed. - // We don't do this in the function above, since we don't want to - // update the contact whenever that function is called from anywhere. - if ($success) { - DBA::update('contact', ['updated' => DateTimeFormat::utcNow()], ['id' => $contact_id]); + $force = ($command == "force"); + + $success = Contact::updateFromProbe($contact_id, '', $force); + + Logger::info('Updated from probe', ['id' => $contact_id, 'force' => $force, 'success' => $success]); + + // Update the update date fields only when we are forcing the update + if (!$force) { + return; } - Logger::info('Updated from probe', ['id' => $contact_id, 'success' => $success]); + // Update the "last-update", "success_update" and "failure_update" field only when it is a public contact. + // These fields are set in OnePoll for all non public contacts. + $updated = DateTimeFormat::utcNow(); + if ($success) { + DBA::update('contact', ['last-update' => $updated, 'success_update' => $updated], ['id' => $contact_id, 'uid' => 0]); + } else { + DBA::update('contact', ['last-update' => $updated, 'failure_update' => $updated], ['id' => $contact_id, 'uid' => 0]); + } } } From bca1dc1ca45375eb68e9d276a398d595eca5e68f Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 24 Jun 2019 03:25:01 +0000 Subject: [PATCH 02/12] Moving functionality to the contact model --- src/Model/Contact.php | 66 +++++++++++++++++++++++++++++------- src/Worker/Cron.php | 2 +- src/Worker/OnePoll.php | 2 +- src/Worker/UpdateContact.php | 14 -------- 4 files changed, 56 insertions(+), 28 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 7a3731e537..70a152d431 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1755,6 +1755,42 @@ class Contact extends BaseObject return $data; } + /** + * @brief Helper function for "updateFromProbe". Updates personal and public contact + * + * @param array $contact The personal contact entry + * @param array $fields The fields that are updated + * @throws \Exception + */ + private static function updateContact($id, $uid, $url, array $fields) + { + DBA::update('contact', $fields, ['id' => $id]); + + if ($uid != 0) { + return; + } + + $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url), + 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]]; + + // These contacts are sharing with us, we don't poll them. + // This means that we don't set the update fields in "OnePoll.php". + $condition['rel'] = self::SHARING; + DBA::update('contact', $fields, $condition); + + unset($fields['last-update']); + unset($fields['success_update']); + unset($fields['failure_update']); + + if (empty($fields)) { + return; + } + + // We are polling these contacts, so we mustn't set the update fields here. + $condition['rel'] = [self::FOLLOWER, self::FRIEND]; + DBA::update('contact', $fields, $condition); + } + /** * @param integer $id contact id * @param string $network Optional network we are probing for @@ -1767,7 +1803,7 @@ class Contact extends BaseObject { /* Warning: Never ever fetch the public key via Probe::uri and write it into the contacts. - This will reliably kill your communication with Friendica contacts. + This will reliably kill your communication with old Friendica contacts. */ $fields = ['avatar', 'uid', 'name', 'nick', 'url', 'addr', 'batch', 'notify', @@ -1785,12 +1821,14 @@ class Contact extends BaseObject $ret = Probe::uri($contact['url'], $network, $uid, !$force); - // If Probe::uri fails the network code will be different (mostly "feed" or "unkn") - if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) { - return false; - } + $updated = DateTimeFormat::utcNow(); - if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT)) { + // If Probe::uri fails the network code will be different (mostly "feed" or "unkn") + if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT) || + (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network']))) { + if ($force && ($uid == 0)) { + self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'failure_update' => $updated]); + } return false; } @@ -1810,19 +1848,23 @@ class Contact extends BaseObject self::updateAvatar($ret['photo'], $uid, $id, $update || $force); if (!$update) { + if ($force && ($uid == 0)) { + self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]); + } return true; } $ret['nurl'] = Strings::normaliseLink($ret['url']); - $ret['updated'] = DateTimeFormat::utcNow(); + $ret['updated'] = $updated; + + if ($force && ($uid == 0)) { + $ret['last-update'] = $updated; + $ret['success_update'] = $updated; + } unset($ret['photo']); - DBA::update('contact', $ret, ['id' => $id]); - // Updating all similar contacts when we are updating the public contact - if (($uid == 0) && in_array($ret['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) { - DBA::update('contact', $ret, ['self' => false, 'nurl' => $ret['nurl']]); - } + self::updateContact($id, $uid, $ret['url'], $ret); // Update the corresponding gcontact entry PortableContact::lastUpdated($ret["url"]); diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index 8d290698d6..d20bfd133e 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -133,7 +133,7 @@ class Cron */ private static function updatePublicContacts() { $count = 0; - $last_updated = DateTimeFormat::utc('now - 1 months'); + $last_updated = DateTimeFormat::utc('now - 1 week'); $condition = ["`network` IN (?, ?, ?, ?) AND `uid` = ? AND NOT `self` AND `last-update` < ?", Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, 0, $last_updated]; diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index a605ee92ed..f5da683b13 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -709,6 +709,6 @@ class OnePoll private static function updateContact(array $contact, array $fields) { DBA::update('contact', $fields, ['id' => $contact['id']]); - DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]); +// DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]); } } diff --git a/src/Worker/UpdateContact.php b/src/Worker/UpdateContact.php index 7679431fd9..f23c5c0a07 100644 --- a/src/Worker/UpdateContact.php +++ b/src/Worker/UpdateContact.php @@ -20,19 +20,5 @@ class UpdateContact $success = Contact::updateFromProbe($contact_id, '', $force); Logger::info('Updated from probe', ['id' => $contact_id, 'force' => $force, 'success' => $success]); - - // Update the update date fields only when we are forcing the update - if (!$force) { - return; - } - - // Update the "last-update", "success_update" and "failure_update" field only when it is a public contact. - // These fields are set in OnePoll for all non public contacts. - $updated = DateTimeFormat::utcNow(); - if ($success) { - DBA::update('contact', ['last-update' => $updated, 'success_update' => $updated], ['id' => $contact_id, 'uid' => 0]); - } else { - DBA::update('contact', ['last-update' => $updated, 'failure_update' => $updated], ['id' => $contact_id, 'uid' => 0]); - } } } From 9b49fd7f3ff92b5d6efa68913bf445ffcdb0eb99 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 25 Jun 2019 17:36:24 +0000 Subject: [PATCH 03/12] Changed logging --- src/Worker/Cron.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index d20bfd133e..d7ce1b9b48 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -138,12 +138,18 @@ class Cron Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, 0, $last_updated]; $total = DBA::count('contact', $condition); - $contacts = DBA::select('contact', ['id'], $condition, ['limit' => 1000]); + $oldest_date = ''; + $oldest_id = ''; + $contacts = DBA::select('contact', ['id', 'last-update'], $condition, ['limit' => 100, 'order' => ['last-update']]); while ($contact = DBA::fetch($contacts)) { + if (empty($oldest_id)) { + $oldest_id = $contact['id']; + $oldest_date = $contact['last-update']; + } Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id'], 'force'); ++$count; } - Logger::info('Initiated update for public contacts', ['interval' => $count, 'total' => $total]); + Logger::info('Initiated update for public contacts', ['interval' => $count, 'total' => $total, 'id' => $oldest_id, 'oldest' => $oldest_date]); DBA::close($contacts); } From 9caa8bae35ec2586eac8cb6165948d397eeec9cd Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 26 Jun 2019 05:18:11 +0000 Subject: [PATCH 04/12] Unused parts removed, query refurbished --- src/Worker/Cron.php | 111 ++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 82 deletions(-) diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php index d7ce1b9b48..0db70f5a8d 100644 --- a/src/Worker/Cron.php +++ b/src/Worker/Cron.php @@ -17,16 +17,10 @@ use Friendica\Util\DateTimeFormat; class Cron { - public static function execute($parameter = '', $generation = 0) + public static function execute() { $a = BaseObject::getApp(); - // Poll contacts with specific parameters - if (!empty($parameter)) { - self::pollContacts($parameter, $generation); - return; - } - $last = Config::get('system', 'last_cron'); $poll_interval = intval(Config::get('system', 'cron_interval')); @@ -115,7 +109,7 @@ class Cron } // Poll contacts - self::pollContacts($parameter, $generation); + self::pollContacts(); // Update contact information self::updatePublicContacts(); @@ -156,96 +150,48 @@ class Cron /** * @brief Poll contacts for unreceived messages * - * @todo Currently it seems as if the following parameter aren't used at all ... - * - * @param string $parameter Parameter (force, restart, ...) for the contact polling - * @param integer $generation * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function pollContacts($parameter, $generation) { - $manual_id = 0; - $generation = 0; - $force = false; - - if ($parameter == 'force') { - $force = true; - } - if ($parameter == 'restart') { - $generation = intval($generation); - if (!$generation) { - exit(); - } - } - - if (intval($parameter)) { - $manual_id = intval($parameter); - $force = true; - } - + private static function pollContacts() { $min_poll_interval = Config::get('system', 'min_poll_interval', 1); - $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); - Addon::reload(); - // Only poll from those with suitable relationships, - // and which have a polling address and ignore Diaspora since - // we are unable to match those posts with a Diaspora GUID and prevent duplicates. - - $abandon_days = intval(Config::get('system', 'account_abandon_days')); - if ($abandon_days < 1) { - $abandon_days = 0; - } - $abandon_sql = (($abandon_days) - ? sprintf(" AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL %d DAY ", intval($abandon_days)) - : '' - ); - - $contacts = q("SELECT `contact`.`id`, `contact`.`nick`, `contact`.`name`, `contact`.`network`, `contact`.`archive`, + $sql = "SELECT `contact`.`id`, `contact`.`nick`, `contact`.`name`, `contact`.`network`, `contact`.`archive`, `contact`.`last-update`, `contact`.`priority`, `contact`.`rel`, `contact`.`subhub` FROM `user` STRAIGHT_JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`poll` != '' - AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s', '%s') $sql_extra + AND `contact`.`network` IN (?, ?, ?, ?) AND NOT `contact`.`self` AND NOT `contact`.`blocked` - WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql", - DBA::escape(Protocol::ACTIVITYPUB), - DBA::escape(Protocol::DFRN), - DBA::escape(Protocol::OSTATUS), - DBA::escape(Protocol::DIASPORA), - DBA::escape(Protocol::FEED), - DBA::escape(Protocol::MAIL) - ); + AND `contact`.`rel` != ? + WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed`"; + + $parameters = [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL, Contact::FOLLOWER]; + + // Only poll from those with suitable relationships, + // and which have a polling address and ignore Diaspora since + // we are unable to match those posts with a Diaspora GUID and prevent duplicates. + $abandon_days = intval(Config::get('system', 'account_abandon_days')); + if ($abandon_days < 1) { + $abandon_days = 0; + } + + if (!empty($abandon_days)) { + $sql .= " AND `user`.`login_date` > UTC_TIMESTAMP() - INTERVAL ? DAY"; + $parameters[] = $abandon_days; + } + + $contacts = DBA::p($sql, $parameters); if (!DBA::isResult($contacts)) { return; } - foreach ($contacts as $contact) { - - if ($manual_id) { - $contact['last-update'] = DBA::NULL_DATETIME; - } - + while ($contact = DBA::fetch($contacts)) { // Friendica and OStatus are checked once a day if (in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) { - $contact['priority'] = 2; - } - - if ($contact['subhub'] && in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) { - /* - * We should be getting everything via a hub. But just to be sure, let's check once a day. - * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) - * This also lets us update our subscription to the hub, and add or replace hubs in case it - * changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'. - */ - $poll_interval = Config::get('system', 'pushpoll_frequency'); - $contact['priority'] = (!is_null($poll_interval) ? intval($poll_interval) : 3); - } - - // Check ActivityPub and Diaspora contacts or followers once a week - if (in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::DIASPORA]) || ($contact["rel"] == Contact::FOLLOWER)) { - $contact['priority'] = 4; + $contact['priority'] = 3; } // Check archived contacts once a month @@ -253,7 +199,7 @@ class Cron $contact['priority'] = 5; } - if (($contact['priority'] >= 0) && !$force) { + if ($contact['priority'] >= 0) { $update = false; $t = $contact['last-update']; @@ -289,7 +235,7 @@ class Cron break; case 0: default: - if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + ".$min_poll_interval." minute")) { + if (DateTimeFormat::utcNow() > DateTimeFormat::utc($t . " + " . $min_poll_interval . " minute")) { $update = true; } break; @@ -311,5 +257,6 @@ class Cron Worker::add(['priority' => $priority, 'dont_fork' => true, 'force_priority' => true], 'OnePoll', (int)$contact['id']); } + DBA::close($contacts); } } From 4db3c79d04e3b26639834c206e54c23e2da03905 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 27 Jun 2019 05:03:58 +0000 Subject: [PATCH 05/12] Archive/unarchive the contacts --- src/Model/Contact.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 70a152d431..fea0119787 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1770,6 +1770,15 @@ class Contact extends BaseObject return; } + // Archive or unarchive the contact. We only need to do this for the public contact. + // The archive/unarchive function will update the personal contacts by themselves. + $contact = DBA::selectFirst('contact', [], ['id' => $id]); + if (!empty($fields['success_update'])) { + self::unmarkForArchival($contact); + } elseif (!empty($fields['failure_update'])) { + self::markForArchival($contact); + } + $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url), 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]]; From 59b1a1acedcf0abeeccc5c8f6a9e78c1aa333b7e Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 27 Jun 2019 05:38:16 +0000 Subject: [PATCH 06/12] Removing many now unused or duplicated tasks from OnePoll --- src/Worker/OnePoll.php | 97 ++++++------------------------------------ 1 file changed, 14 insertions(+), 83 deletions(-) diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index f5da683b13..5e2dbb8fa2 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -30,7 +30,7 @@ class OnePoll Logger::log('Start for contact ' . $contact_id); - $force = false; + $force = false; if ($command == "force") { $force = true; @@ -41,6 +41,9 @@ class OnePoll return; } + if ($force) { + Contact::updateFromProbe($contact_id, true); + } $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]); if (!DBA::isResult($contact)) { @@ -56,77 +59,22 @@ class OnePoll $importer_uid = $contact['uid']; + $updated = DateTimeFormat::utcNow(); + + if ($importer_uid == 0) { + Logger::log('Ignore public contacts'); + + // set the last-update so we don't keep polling + DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); + return; + } + // Possibly switch the remote contact to AP if ($protocol === Protocol::OSTATUS) { ActivityPub\Receiver::switchContact($contact['id'], $importer_uid, $contact['url']); $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]); } - $updated = DateTimeFormat::utcNow(); - - // These three networks can be able to speak AP, so we are trying to fetch AP profile data here - if (in_array($protocol, [Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::DFRN])) { - $apcontact = APContact::getByURL($contact['url'], true); - - if (($protocol === Protocol::ACTIVITYPUB) && empty($apcontact)) { - self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]); - Contact::markForArchival($contact); - Logger::log('Contact archived'); - return; - } elseif (!empty($apcontact)) { - $fields = ['last-update' => $updated, 'success_update' => $updated]; - self::updateContact($contact, $fields); - Contact::unmarkForArchival($contact); - } - } - - // Diaspora users, archived users and followers are only checked if they still exist. - if (($protocol != Protocol::ACTIVITYPUB) && ($contact['archive'] || ($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER))) { - $last_updated = PortableContact::lastUpdated($contact["url"], true); - - if ($last_updated) { - Logger::log('Contact '.$contact['id'].' had last update on '.$last_updated, Logger::DEBUG); - - // The last public item can be older than the last item we got - if ($last_updated < $contact['last-item']) { - $last_updated = $contact['last-item']; - } - - $fields = ['last-item' => DateTimeFormat::utc($last_updated), 'last-update' => $updated, 'success_update' => $updated]; - self::updateContact($contact, $fields); - Contact::unmarkForArchival($contact); - } else { - self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]); - Contact::markForArchival($contact); - Logger::log('Contact archived'); - return; - } - } - - // Update the contact entry - if (in_array($protocol, [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN])) { - // Currently we can't check every AP implementation, so we don't do it at all - if (($protocol != Protocol::ACTIVITYPUB) && !PortableContact::reachable($contact['url'])) { - Logger::log("Skipping probably dead contact ".$contact['url']); - - // set the last-update so we don't keep polling - self::updateContact($contact, ['last-update' => $updated]); - return; - } - - if (!Contact::updateFromProbe($contact["id"])) { - // set the last-update so we don't keep polling - self::updateContact($contact, ['last-update' => $updated]); - Contact::markForArchival($contact); - Logger::log('Contact archived'); - return; - } else { - $fields = ['last-update' => $updated, 'success_update' => $updated]; - self::updateContact($contact, $fields); - Contact::unmarkForArchival($contact); - } - } - // load current friends if possible. if (!empty($contact['poco']) && ($contact['success_update'] > $contact['failure_update'])) { $r = q("SELECT count(*) AS total FROM glink @@ -140,15 +88,6 @@ class OnePoll } } - // We don't poll our followers - if ($contact["rel"] == Contact::FOLLOWER) { - Logger::log("Don't poll follower"); - - // set the last-update so we don't keep polling - DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); - return; - } - // Don't poll if polling is deactivated (But we poll feeds and mails anyway) if (!in_array($protocol, [Protocol::FEED, Protocol::MAIL]) && Config::get('system', 'disable_polling')) { Logger::log('Polling is disabled'); @@ -167,14 +106,6 @@ class OnePoll return; } - if ($importer_uid == 0) { - Logger::log('Ignore public contacts'); - - // set the last-update so we don't keep polling - DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); - return; - } - $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($importer_uid) ); From d4dc2a129ef952b654621bdc25f1f7c9fd27d7b7 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 27 Jun 2019 13:30:26 +0000 Subject: [PATCH 07/12] Replace old database queries --- src/Worker/OnePoll.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index 5e2dbb8fa2..3dfeacf9d9 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -14,6 +14,7 @@ use Friendica\Database\DBA; use Friendica\Model\APContact; use Friendica\Model\Contact; use Friendica\Model\Item; +use Friendica\Model\User; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\Email; use Friendica\Protocol\PortableContact; @@ -106,11 +107,9 @@ class OnePoll return; } - $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", - intval($importer_uid) - ); + $importer = User::getOwnerDataById($importer_uid); - if (!DBA::isResult($r)) { + if (empty($importer)) { Logger::log('No self contact for user '.$importer_uid); // set the last-update so we don't keep polling @@ -118,7 +117,6 @@ class OnePoll return; } - $importer = $r[0]; $url = ''; $xml = false; From 7e7acf576354a18fbc1ef566a19e8160c2640be9 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 27 Jun 2019 16:21:23 +0000 Subject: [PATCH 08/12] Last old query replaced in OnePoll.php --- src/Worker/OnePoll.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index 3dfeacf9d9..13fafe2310 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -78,14 +78,8 @@ class OnePoll // load current friends if possible. if (!empty($contact['poco']) && ($contact['success_update'] > $contact['failure_update'])) { - $r = q("SELECT count(*) AS total FROM glink - WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", - intval($contact['id']) - ); - if (DBA::isResult($r)) { - if (!$r[0]['total']) { - PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']); - } + if (!DBA::exists('glink', ["`cid` = ? AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", $contact['id']])) { + PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']); } } From d552db5c55daadf71359f123d6900659e0864a43 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 27 Jun 2019 20:38:09 +0000 Subject: [PATCH 09/12] Polling functions are split into several functions --- src/Worker/OnePoll.php | 852 +++++++++++++++++++++-------------------- 1 file changed, 444 insertions(+), 408 deletions(-) diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index 13fafe2310..eb00447d39 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -11,7 +11,6 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; -use Friendica\Model\APContact; use Friendica\Model\Contact; use Friendica\Model\Item; use Friendica\Model\User; @@ -133,419 +132,19 @@ class OnePoll Logger::log("poll: ({$protocol}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}"); + $xml = ''; + if ($protocol === Protocol::DFRN) { - $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); - if (intval($contact['duplex']) && $contact['dfrn-id']) { - $idtosend = '0:' . $orig_id; - } - if (intval($contact['duplex']) && $contact['issued-id']) { - $idtosend = '1:' . $orig_id; - } - - // they have permission to write to us. We already filtered this in the contact query. - $perm = 'rw'; - - // But this may be our first communication, so set the writable flag if it isn't set already. - - if (!intval($contact['writable'])) { - $fields = ['writable' => true]; - DBA::update('contact', $fields, ['id' => $contact['id']]); - } - - $url = $contact['poll'] . '?dfrn_id=' . $idtosend - . '&dfrn_version=' . DFRN_PROTOCOL_VERSION - . '&type=data&last_update=' . $last_update - . '&perm=' . $perm; - - $curlResult = Network::curl($url); - - if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) { - // set the last-update so we don't keep polling - self::updateContact($contact, ['last-update' => $updated]); - Contact::markForArchival($contact); - Logger::log('Contact archived'); - return; - } - - $handshake_xml = $curlResult->getBody(); - $html_code = $curlResult->getReturnCode(); - - Logger::log('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, Logger::DATA); - - if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) { - // dead connection - might be a transient event, or this might - // mean the software was uninstalled or the domain expired. - // Will keep trying for one month. - Logger::log("$url appears to be dead - marking for death "); - - // set the last-update so we don't keep polling - $fields = ['last-update' => $updated, 'failure_update' => $updated]; - self::updateContact($contact, $fields); - Contact::markForArchival($contact); - return; - } - - if (!strstr($handshake_xml, '<')) { - Logger::log('response from ' . $url . ' did not contain XML.'); - - $fields = ['last-update' => $updated, 'failure_update' => $updated]; - self::updateContact($contact, $fields); - Contact::markForArchival($contact); - return; - } - - - $res = XML::parseString($handshake_xml); - - if (intval($res->status) == 1) { - // we may not be friends anymore. Will keep trying for one month. - Logger::log("$url replied status 1 - marking for death "); - - // set the last-update so we don't keep polling - $fields = ['last-update' => $updated, 'failure_update' => $updated]; - self::updateContact($contact, $fields); - Contact::markForArchival($contact); - } elseif ($contact['term-date'] > DBA::NULL_DATETIME) { - Contact::unmarkForArchival($contact); - } - - if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) { - // set the last-update so we don't keep polling - DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); - Logger::log('Contact status is ' . $res->status); - return; - } - - if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) { - $fields = ['poco' => str_replace('/profile/', '/poco/', $contact['url'])]; - DBA::update('contact', $fields, ['id' => $contact['id']]); - } - - $postvars = []; - - $sent_dfrn_id = hex2bin((string) $res->dfrn_id); - $challenge = hex2bin((string) $res->challenge); - - $final_dfrn_id = ''; - - if ($contact['duplex'] && strlen($contact['prvkey'])) { - openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']); - openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']); - } else { - openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']); - openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']); - } - - $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); - - if (strpos($final_dfrn_id, ':') == 1) { - $final_dfrn_id = substr($final_dfrn_id, 2); - } - - // There are issues with the legacy DFRN transport layer. - // Since we mostly don't use it anyway, we won't dig into it deeper, but simply ignore it. - if (empty($final_dfrn_id) || empty($orig_id)) { - Logger::log('Contact has got no ID - quitting'); - return; - } - - if ($final_dfrn_id != $orig_id) { - // did not decode properly - cannot trust this site - Logger::log('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id); - - // set the last-update so we don't keep polling - DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); - Contact::markForArchival($contact); - return; - } - - $postvars['dfrn_id'] = $idtosend; - $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION; - $postvars['perm'] = 'rw'; - - $xml = Network::post($contact['poll'], $postvars)->getBody(); - + $xml = self::pollDFRN($contact, $updated); } elseif (($protocol === Protocol::OSTATUS) || ($protocol === Protocol::DIASPORA) || ($protocol === Protocol::FEED)) { - - // Upgrading DB fields from an older Friendica version - // Will only do this once per notify-enabled OStatus contact - // or if relationship changes - - $stat_writeable = ((($contact['notify']) && ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND)) ? 1 : 0); - - // Contacts from OStatus are always writable - if ($protocol === Protocol::OSTATUS) { - $stat_writeable = 1; - } - - if ($stat_writeable != $contact['writable']) { - $fields = ['writable' => $stat_writeable]; - DBA::update('contact', $fields, ['id' => $contact['id']]); - } - - // Are we allowed to import from this person? - if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) { - // set the last-update so we don't keep polling - DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); - Logger::log('Contact is blocked or only a follower'); - return; - } - - $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-'); - $curlResult = Network::curl($contact['poll'], false, ['cookiejar' => $cookiejar]); - unlink($cookiejar); - - if ($curlResult->isTimeout()) { - // set the last-update so we don't keep polling - self::updateContact($contact, ['last-update' => $updated]); - Contact::markForArchival($contact); - Logger::log('Contact archived'); - return; - } - - $xml = $curlResult->getBody(); - + $xml = self::pollFeed($contact, $protocol, $updated); } elseif ($protocol === Protocol::MAIL) { - Logger::log("Mail: Fetching for ".$contact['addr'], Logger::DEBUG); - - $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1); - if ($mail_disabled) { - // set the last-update so we don't keep polling - self::updateContact($contact, ['last-update' => $updated]); - Contact::markForArchival($contact); - Logger::log('Contact archived'); - return; - } - - Logger::log("Mail: Enabled", Logger::DEBUG); - - $mbox = null; - $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]); - - $condition = ["`server` != '' AND `uid` = ?", $importer_uid]; - $mailconf = DBA::selectFirst('mailacct', [], $condition); - if (DBA::isResult($user) && DBA::isResult($mailconf)) { - $mailbox = Email::constructMailboxName($mailconf); - $password = ''; - openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']); - $mbox = Email::connect($mailbox, $mailconf['user'], $password); - unset($password); - Logger::log("Mail: Connect to " . $mailconf['user']); - if ($mbox) { - $fields = ['last_check' => $updated]; - DBA::update('mailacct', $fields, ['id' => $mailconf['id']]); - Logger::log("Mail: Connected to " . $mailconf['user']); - } else { - Logger::log("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true)); - } - } - - if ($mbox) { - $msgs = Email::poll($mbox, $contact['addr']); - - if (count($msgs)) { - Logger::log("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], Logger::DEBUG); - - $metas = Email::messageMeta($mbox, implode(',', $msgs)); - - if (count($metas) != count($msgs)) { - Logger::log("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", Logger::DEBUG); - } else { - $msgs = array_combine($msgs, $metas); - - foreach ($msgs as $msg_uid => $meta) { - Logger::log("Mail: Parsing mail ".$msg_uid, Logger::DATA); - - $datarray = []; - $datarray['verb'] = ACTIVITY_POST; - $datarray['object-type'] = ACTIVITY_OBJ_NOTE; - $datarray['network'] = Protocol::MAIL; - // $meta = Email::messageMeta($mbox, $msg_uid); - - $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>')); - - // Have we seen it before? - $fields = ['deleted', 'id']; - $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']]; - $item = Item::selectFirst($fields, $condition); - if (DBA::isResult($item)) { - Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],Logger::DEBUG); - - // Only delete when mails aren't automatically moved or deleted - if (($mailconf['action'] != 1) && ($mailconf['action'] != 3)) - if ($meta->deleted && ! $item['deleted']) { - $fields = ['deleted' => true, 'changed' => $updated]; - Item::update($fields, ['id' => $item['id']]); - } - - switch ($mailconf['action']) { - case 0: - Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG); - break; - case 1: - Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']); - imap_delete($mbox, $msg_uid, FT_UID); - break; - case 2: - Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - break; - case 3: - Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - if ($mailconf['movetofolder'] != "") { - imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID); - } - break; - } - continue; - } - - - // look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally. - $raw_refs = ((property_exists($meta, 'references')) ? str_replace("\t", '', $meta->references) : ''); - if (!trim($raw_refs)) { - $raw_refs = ((property_exists($meta, 'in_reply_to')) ? str_replace("\t", '', $meta->in_reply_to) : ''); - } - $raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr - - if ($raw_refs) { - $refs_arr = explode(' ', $raw_refs); - if (count($refs_arr)) { - for ($x = 0; $x < count($refs_arr); $x ++) { - $refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x])); - } - } - $condition = ['uri' => $refs_arr, 'uid' => $importer_uid]; - $parent = Item::selectFirst(['parent-uri'], $condition); - if (DBA::isResult($parent)) { - $datarray['parent-uri'] = $parent['parent-uri']; // Set the parent as the top-level item - } - } - - // Decoding the header - $subject = imap_mime_header_decode($meta->subject); - $datarray['title'] = ""; - foreach ($subject as $subpart) { - if ($subpart->charset != "default") { - $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text); - } else { - $datarray['title'] .= $subpart->text; - } - } - $datarray['title'] = Strings::escapeTags(trim($datarray['title'])); - - //$datarray['title'] = Strings::escapeTags(trim($meta->subject)); - $datarray['created'] = DateTimeFormat::utc($meta->date); - - // Is it a reply? - $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") || - (substr(strtolower($datarray['title']), 0, 3) == "re-") || - ($raw_refs != "")); - - // Remove Reply-signs in the subject - $datarray['title'] = self::RemoveReply($datarray['title']); - - // If it seems to be a reply but a header couldn't be found take the last message with matching subject - if (empty($datarray['parent-uri']) && $reply) { - $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL]; - $params = ['order' => ['created' => true]]; - $parent = Item::selectFirst(['parent-uri'], $condition, $params); - if (DBA::isResult($parent)) { - $datarray['parent-uri'] = $parent['parent-uri']; - } - } - - if (empty($datarray['parent-uri'])) { - $datarray['parent-uri'] = $datarray['uri']; - } - - $r = Email::getMessage($mbox, $msg_uid, $reply); - if (!$r) { - Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']); - continue; - } - $datarray['body'] = Strings::escapeHtml($r['body']); - $datarray['body'] = BBCode::limitBodySize($datarray['body']); - - Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']); - - /// @TODO Adding a gravatar for the original author would be cool - - $from = imap_mime_header_decode($meta->from); - $fromdecoded = ""; - foreach ($from as $frompart) { - if ($frompart->charset != "default") { - $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text); - } else { - $fromdecoded .= $frompart->text; - } - } - - $fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->getHostName()); - - $frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host; - - if (isset($fromarr[0]->personal)) { - $fromname = $fromarr[0]->personal; - } else { - $fromname = $frommail; - } - - $datarray['author-name'] = $fromname; - $datarray['author-link'] = "mailto:".$frommail; - $datarray['author-avatar'] = $contact['photo']; - - $datarray['owner-name'] = $contact['name']; - $datarray['owner-link'] = "mailto:".$contact['addr']; - $datarray['owner-avatar'] = $contact['photo']; - - $datarray['uid'] = $importer_uid; - $datarray['contact-id'] = $contact['id']; - if ($datarray['parent-uri'] === $datarray['uri']) { - $datarray['private'] = 1; - } - if (($protocol === Protocol::MAIL) && !PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) { - $datarray['private'] = 1; - $datarray['allow_cid'] = '<' . $contact['id'] . '>'; - } - - Item::insert($datarray); - - switch ($mailconf['action']) { - case 0: - Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG); - break; - case 1: - Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']); - imap_delete($mbox, $msg_uid, FT_UID); - break; - case 2: - Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - break; - case 3: - Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - if ($mailconf['movetofolder'] != "") { - imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID); - } - break; - } - } - } - } else { - Logger::log("Mail: no mails for ".$mailconf['user']); - } - - Logger::log("Mail: closing connection for ".$mailconf['user']); - imap_close($mbox); - } + self::pollMail($contact, $importer_uid, $updated); } - if ($xml) { + if (!empty($xml)) { Logger::log('received xml : ' . $xml, Logger::DATA); if (!strstr($xml, '<')) { Logger::log('post_handshake: response from ' . $url . ' did not contain XML.'); @@ -632,6 +231,443 @@ class OnePoll private static function updateContact(array $contact, array $fields) { DBA::update('contact', $fields, ['id' => $contact['id']]); -// DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]); + } + + /** + * @brief Poll DFRN contacts + * + * @param array $contact The personal contact entry + * @param string $updated The updated date + * @return string polled XML + * @throws \Exception + */ + private static function pollDFRN(array $contact, $updated) + { + $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']); + if (intval($contact['duplex']) && $contact['dfrn-id']) { + $idtosend = '0:' . $orig_id; + } + if (intval($contact['duplex']) && $contact['issued-id']) { + $idtosend = '1:' . $orig_id; + } + + // they have permission to write to us. We already filtered this in the contact query. + $perm = 'rw'; + + // But this may be our first communication, so set the writable flag if it isn't set already. + if (!intval($contact['writable'])) { + $fields = ['writable' => true]; + DBA::update('contact', $fields, ['id' => $contact['id']]); + } + + $url = $contact['poll'] . '?dfrn_id=' . $idtosend + . '&dfrn_version=' . DFRN_PROTOCOL_VERSION + . '&type=data&last_update=' . $last_update + . '&perm=' . $perm; + + $curlResult = Network::curl($url); + + if (!$curlResult->isSuccess() && ($curlResult->getErrorNumber() == CURLE_OPERATION_TIMEDOUT)) { + // set the last-update so we don't keep polling + self::updateContact($contact, ['last-update' => $updated]); + Contact::markForArchival($contact); + Logger::log('Contact archived'); + return false; + } + + $handshake_xml = $curlResult->getBody(); + $html_code = $curlResult->getReturnCode(); + + Logger::log('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, Logger::DATA); + + if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) { + // dead connection - might be a transient event, or this might + // mean the software was uninstalled or the domain expired. + // Will keep trying for one month. + Logger::log("$url appears to be dead - marking for death "); + + // set the last-update so we don't keep polling + $fields = ['last-update' => $updated, 'failure_update' => $updated]; + self::updateContact($contact, $fields); + Contact::markForArchival($contact); + return false; + } + + if (!strstr($handshake_xml, '<')) { + Logger::log('response from ' . $url . ' did not contain XML.'); + + $fields = ['last-update' => $updated, 'failure_update' => $updated]; + self::updateContact($contact, $fields); + Contact::markForArchival($contact); + return false; + } + + $res = XML::parseString($handshake_xml); + + if (intval($res->status) == 1) { + // we may not be friends anymore. Will keep trying for one month. + Logger::log("$url replied status 1 - marking for death "); + + // set the last-update so we don't keep polling + $fields = ['last-update' => $updated, 'failure_update' => $updated]; + self::updateContact($contact, $fields); + Contact::markForArchival($contact); + } elseif ($contact['term-date'] > DBA::NULL_DATETIME) { + Contact::unmarkForArchival($contact); + } + + if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) { + // set the last-update so we don't keep polling + DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); + Logger::log('Contact status is ' . $res->status); + return false; + } + + if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) { + $fields = ['poco' => str_replace('/profile/', '/poco/', $contact['url'])]; + DBA::update('contact', $fields, ['id' => $contact['id']]); + } + + $postvars = []; + + $sent_dfrn_id = hex2bin((string) $res->dfrn_id); + $challenge = hex2bin((string) $res->challenge); + + $final_dfrn_id = ''; + + if ($contact['duplex'] && strlen($contact['prvkey'])) { + openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']); + openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']); + } else { + openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']); + openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']); + } + + $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.')); + + if (strpos($final_dfrn_id, ':') == 1) { + $final_dfrn_id = substr($final_dfrn_id, 2); + } + + // There are issues with the legacy DFRN transport layer. + // Since we mostly don't use it anyway, we won't dig into it deeper, but simply ignore it. + if (empty($final_dfrn_id) || empty($orig_id)) { + Logger::log('Contact has got no ID - quitting'); + return false; + } + + if ($final_dfrn_id != $orig_id) { + // did not decode properly - cannot trust this site + Logger::log('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id); + + // set the last-update so we don't keep polling + DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); + Contact::markForArchival($contact); + return false; + } + + $postvars['dfrn_id'] = $idtosend; + $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION; + $postvars['perm'] = 'rw'; + + return Network::post($contact['poll'], $postvars)->getBody(); + } + + /** + * @brief Poll Feed/OStatus contacts + * + * @param array $contact The personal contact entry + * @param string $protocol The used protocol of the contact + * @param string $updated The updated date + * @return string polled XML + * @throws \Exception + */ + private static function pollFeed(array $contact, $protocol, $updated) + { + // Upgrading DB fields from an older Friendica version + // Will only do this once per notify-enabled OStatus contact + // or if relationship changes + + $stat_writeable = ((($contact['notify']) && ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND)) ? 1 : 0); + + // Contacts from OStatus are always writable + if ($protocol === Protocol::OSTATUS) { + $stat_writeable = 1; + } + + if ($stat_writeable != $contact['writable']) { + $fields = ['writable' => $stat_writeable]; + DBA::update('contact', $fields, ['id' => $contact['id']]); + } + + // Are we allowed to import from this person? + if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) { + // set the last-update so we don't keep polling + DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]); + Logger::log('Contact is blocked or only a follower'); + return false; + } + + $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-'); + $curlResult = Network::curl($contact['poll'], false, ['cookiejar' => $cookiejar]); + unlink($cookiejar); + + if ($curlResult->isTimeout()) { + // set the last-update so we don't keep polling + self::updateContact($contact, ['last-update' => $updated]); + Contact::markForArchival($contact); + Logger::log('Contact archived'); + return false; + } + + return $curlResult->getBody(); + } + + /** + * @brief Poll Mail contacts + * + * @param array $contact The personal contact entry + * @param integer $importer_uid The UID of the importer + * @param string $updated The updated date + * @throws \Exception + */ + private static function pollMail(array $contact, $importer_uid, $updated) + { + Logger::log("Mail: Fetching for ".$contact['addr'], Logger::DEBUG); + + $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1); + if ($mail_disabled) { + // set the last-update so we don't keep polling + self::updateContact($contact, ['last-update' => $updated]); + Contact::markForArchival($contact); + Logger::log('Contact archived'); + return; + } + + Logger::log("Mail: Enabled", Logger::DEBUG); + + $mbox = null; + $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]); + + $condition = ["`server` != '' AND `uid` = ?", $importer_uid]; + $mailconf = DBA::selectFirst('mailacct', [], $condition); + if (DBA::isResult($user) && DBA::isResult($mailconf)) { + $mailbox = Email::constructMailboxName($mailconf); + $password = ''; + openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']); + $mbox = Email::connect($mailbox, $mailconf['user'], $password); + unset($password); + Logger::log("Mail: Connect to " . $mailconf['user']); + if ($mbox) { + $fields = ['last_check' => $updated]; + DBA::update('mailacct', $fields, ['id' => $mailconf['id']]); + Logger::log("Mail: Connected to " . $mailconf['user']); + } else { + Logger::log("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true)); + } + } + + if (!$mbox) { + return; + } + + $msgs = Email::poll($mbox, $contact['addr']); + + if (count($msgs)) { + Logger::log("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], Logger::DEBUG); + + $metas = Email::messageMeta($mbox, implode(',', $msgs)); + + if (count($metas) != count($msgs)) { + Logger::log("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", Logger::DEBUG); + } else { + $msgs = array_combine($msgs, $metas); + + foreach ($msgs as $msg_uid => $meta) { + Logger::log("Mail: Parsing mail ".$msg_uid, Logger::DATA); + + $datarray = []; + $datarray['verb'] = ACTIVITY_POST; + $datarray['object-type'] = ACTIVITY_OBJ_NOTE; + $datarray['network'] = Protocol::MAIL; + // $meta = Email::messageMeta($mbox, $msg_uid); + + $datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>')); + + // Have we seen it before? + $fields = ['deleted', 'id']; + $condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']]; + $item = Item::selectFirst($fields, $condition); + if (DBA::isResult($item)) { + Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],Logger::DEBUG); + + // Only delete when mails aren't automatically moved or deleted + if (($mailconf['action'] != 1) && ($mailconf['action'] != 3)) + if ($meta->deleted && ! $item['deleted']) { + $fields = ['deleted' => true, 'changed' => $updated]; + Item::update($fields, ['id' => $item['id']]); + } + + switch ($mailconf['action']) { + case 0: + Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG); + break; + case 1: + Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']); + imap_delete($mbox, $msg_uid, FT_UID); + break; + case 2: + Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + break; + case 3: + Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + if ($mailconf['movetofolder'] != "") { + imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID); + } + break; + } + continue; + } + + // look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally. + $raw_refs = ((property_exists($meta, 'references')) ? str_replace("\t", '', $meta->references) : ''); + if (!trim($raw_refs)) { + $raw_refs = ((property_exists($meta, 'in_reply_to')) ? str_replace("\t", '', $meta->in_reply_to) : ''); + } + $raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr + + if ($raw_refs) { + $refs_arr = explode(' ', $raw_refs); + if (count($refs_arr)) { + for ($x = 0; $x < count($refs_arr); $x ++) { + $refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x])); + } + } + $condition = ['uri' => $refs_arr, 'uid' => $importer_uid]; + $parent = Item::selectFirst(['parent-uri'], $condition); + if (DBA::isResult($parent)) { + $datarray['parent-uri'] = $parent['parent-uri']; // Set the parent as the top-level item + } + } + + // Decoding the header + $subject = imap_mime_header_decode($meta->subject); + $datarray['title'] = ""; + foreach ($subject as $subpart) { + if ($subpart->charset != "default") { + $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text); + } else { + $datarray['title'] .= $subpart->text; + } + } + $datarray['title'] = Strings::escapeTags(trim($datarray['title'])); + + //$datarray['title'] = Strings::escapeTags(trim($meta->subject)); + $datarray['created'] = DateTimeFormat::utc($meta->date); + + // Is it a reply? + $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") || + (substr(strtolower($datarray['title']), 0, 3) == "re-") || + ($raw_refs != "")); + + // Remove Reply-signs in the subject + $datarray['title'] = self::RemoveReply($datarray['title']); + + // If it seems to be a reply but a header couldn't be found take the last message with matching subject + if (empty($datarray['parent-uri']) && $reply) { + $condition = ['title' => $datarray['title'], 'uid' => $importer_uid, 'network' => Protocol::MAIL]; + $params = ['order' => ['created' => true]]; + $parent = Item::selectFirst(['parent-uri'], $condition, $params); + if (DBA::isResult($parent)) { + $datarray['parent-uri'] = $parent['parent-uri']; + } + } + + if (empty($datarray['parent-uri'])) { + $datarray['parent-uri'] = $datarray['uri']; + } + + $r = Email::getMessage($mbox, $msg_uid, $reply); + if (!$r) { + Logger::log("Mail: can't fetch msg ".$msg_uid." for ".$mailconf['user']); + continue; + } + $datarray['body'] = Strings::escapeHtml($r['body']); + $datarray['body'] = BBCode::limitBodySize($datarray['body']); + + Logger::log("Mail: Importing ".$msg_uid." for ".$mailconf['user']); + + /// @TODO Adding a gravatar for the original author would be cool + + $from = imap_mime_header_decode($meta->from); + $fromdecoded = ""; + foreach ($from as $frompart) { + if ($frompart->charset != "default") { + $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text); + } else { + $fromdecoded .= $frompart->text; + } + } + + $fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->getHostName()); + + $frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host; + + if (isset($fromarr[0]->personal)) { + $fromname = $fromarr[0]->personal; + } else { + $fromname = $frommail; + } + + $datarray['author-name'] = $fromname; + $datarray['author-link'] = "mailto:".$frommail; + $datarray['author-avatar'] = $contact['photo']; + + $datarray['owner-name'] = $contact['name']; + $datarray['owner-link'] = "mailto:".$contact['addr']; + $datarray['owner-avatar'] = $contact['photo']; + + $datarray['uid'] = $importer_uid; + $datarray['contact-id'] = $contact['id']; + if ($datarray['parent-uri'] === $datarray['uri']) { + $datarray['private'] = 1; + } + if (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies')) { + $datarray['private'] = 1; + $datarray['allow_cid'] = '<' . $contact['id'] . '>'; + } + + Item::insert($datarray); + + switch ($mailconf['action']) { + case 0: + Logger::log("Mail: Seen before ".$msg_uid." for ".$mailconf['user'].". Doing nothing.", Logger::DEBUG); + break; + case 1: + Logger::log("Mail: Deleting ".$msg_uid." for ".$mailconf['user']); + imap_delete($mbox, $msg_uid, FT_UID); + break; + case 2: + Logger::log("Mail: Mark as seen ".$msg_uid." for ".$mailconf['user']); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + break; + case 3: + Logger::log("Mail: Moving ".$msg_uid." to ".$mailconf['movetofolder']." for ".$mailconf['user']); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + if ($mailconf['movetofolder'] != "") { + imap_mail_move($mbox, $msg_uid, $mailconf['movetofolder'], FT_UID); + } + break; + } + } + } + } else { + Logger::log("Mail: no mails for ".$mailconf['user']); + } + + Logger::log("Mail: closing connection for ".$mailconf['user']); + imap_close($mbox); } } From 96651ae76d4bc53b5acc0e6d4be03e3e9519e394 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 28 Jun 2019 02:46:56 +0000 Subject: [PATCH 10/12] Fix a missing variable --- src/Worker/OnePoll.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index eb00447d39..dccf248c6b 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -125,11 +125,6 @@ class OnePoll $hub_update = false; } - $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) - ? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM) - : DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM) - ); - Logger::log("poll: ({$protocol}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}"); $xml = ''; @@ -260,6 +255,11 @@ class OnePoll DBA::update('contact', $fields, ['id' => $contact['id']]); } + $last_update = (($contact['last-update'] <= DBA::NULL_DATETIME) + ? DateTimeFormat::utc('now - 7 days', DateTimeFormat::ATOM) + : DateTimeFormat::utc($contact['last-update'], DateTimeFormat::ATOM) + ); + $url = $contact['poll'] . '?dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=data&last_update=' . $last_update From 8838a1f2d16fb30869962207c8b729a481621ce4 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 28 Jun 2019 04:26:49 +0000 Subject: [PATCH 11/12] Avoid overwriting of avatars for feeds --- src/Model/Contact.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index fea0119787..f38c69ed05 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1452,7 +1452,7 @@ class Contact extends BaseObject } } - if (!empty($data['photo'])) { + if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) { self::updateAvatar($data['photo'], $uid, $contact_id); } @@ -1854,7 +1854,9 @@ class Contact extends BaseObject } } - self::updateAvatar($ret['photo'], $uid, $id, $update || $force); + if ($ret['network'] != Protocol::FEED) { + self::updateAvatar($ret['photo'], $uid, $id, $update || $force); + } if (!$update) { if ($force && ($uid == 0)) { From e48fbeda0ab6435fa1d7edc97add3f083c6b2eca Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 28 Jun 2019 04:34:01 +0000 Subject: [PATCH 12/12] restore updating of the public contact --- src/Worker/OnePoll.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php index dccf248c6b..3c14100ab2 100644 --- a/src/Worker/OnePoll.php +++ b/src/Worker/OnePoll.php @@ -226,6 +226,7 @@ class OnePoll private static function updateContact(array $contact, array $fields) { DBA::update('contact', $fields, ['id' => $contact['id']]); + DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]); } /**