From 3abd0b54ccc2b59f29e7d724c05a5a2d70c3c4ab Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 25 Apr 2018 21:18:21 +0000 Subject: [PATCH] Reworked delivery --- boot.php | 10 + src/Worker/Delivery.php | 586 ++++++++++++++++++---------------------- 2 files changed, 275 insertions(+), 321 deletions(-) diff --git a/boot.php b/boot.php index 1ca8b8d8d..84bb9741e 100644 --- a/boot.php +++ b/boot.php @@ -486,6 +486,16 @@ define('SR_SCOPE_TAGS', 'tags'); */ define('NULL_DATE', '0001-01-01 00:00:00'); +/** + * Deliver commands + */ +define('DELIVER_MAIL', 'mail'); +define('DELIVER_SUGGESTION', 'suggest'); +define('DELIVER_RELOCATION', 'relocate'); +define('DELIVER_DELETION', 'drop'); +define('DELIVER_POST', 'wall-new'); +define('DELIVER_COMMENT', 'comment-new'); + // Normally this constant is defined - but not if "pcntl" isn't installed if (!defined("SIGTERM")) { define("SIGTERM", 15); diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 0a71e6ce2..e8c21fb38 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -27,52 +27,35 @@ class Delivery { logger('delivery: invoked: '.$cmd.': '.$item_id.' to '.$contact_id, LOGGER_DEBUG); - $mail = false; - $fsuggest = false; - $relocate = false; $top_level = false; $recipients = []; $followup = false; - $normal_mode = true; - - $item = null; - $recipients[] = $contact_id; - if ($cmd === 'mail') { - $normal_mode = false; - $mail = true; - $message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1", - intval($item_id) - ); - if (!count($message)) { + if ($cmd == DELIVER_MAIL) { + $target_item = dba::selectFirst('mail', [], ['id' => $item_id]); + if (!DBM::is_result($message)) { return; } - $uid = $message[0]['uid']; - $recipients[] = $message[0]['contact-id']; - $item = $message[0]; - } elseif ($cmd === 'suggest') { - $normal_mode = false; - $fsuggest = true; - - $suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1", - intval($item_id) - ); - if (!count($suggest)) { + $uid = $target_item['uid']; + $recipients[] = $target_item['contact-id']; + } elseif ($cmd == DELIVER_SUGGESTION) { + $target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]); + if (!DBM::is_result($message)) { return; } - $uid = $suggest[0]['uid']; - $recipients[] = $suggest[0]['cid']; - $item = $suggest[0]; - } elseif ($cmd === 'relocate') { - $normal_mode = false; - $relocate = true; + $uid = $target_item['uid']; + $recipients[] = $target_item['contact-id']; + } elseif ($cmd == DELIVER_RELOCATION) { $uid = $item_id; } else { // find ancestors - $target_item = dba::fetch_first("SELECT `item`.*, `contact`.`uid` AS `cuid` FROM `item` + $target_item = dba::fetch_first("SELECT `item`.*, `contact`.`uid` AS `cuid`, + `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` + FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $item_id); if (!DBM::is_result($target_item) || !intval($target_item['parent'])) { @@ -84,11 +67,12 @@ class Delivery { $updated = $target_item['edited']; $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` - FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC", + FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` + WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC", intval($parent_id) ); - if (!count($items)) { + if (!DBM::is_result($items)) { return; } @@ -105,7 +89,7 @@ class Delivery { WHERE `id` IN ( $str_contacts ) " ); } - if ( !($icontacts && count($icontacts))) { + if (!DBM::is_result($icontacts)) { return; } @@ -136,7 +120,7 @@ class Delivery { $public_message = true; - if (!$mail && !$fsuggest && !$relocate) { + if (!in_array($cmd, [DELIVER_MAIL, DELIVER_SUGGESTION, DELIVER_RELOCATION])) { $parent = $items[0]; // This is IMPORTANT!!!! @@ -159,13 +143,7 @@ class Delivery { * */ - $relay_to_owner = false; - if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) { - $relay_to_owner = true; - } - - if ($relay_to_owner) { logger('followup '.$target_item["guid"], LOGGER_DEBUG); // local followup to remote post $followup = true; @@ -178,7 +156,6 @@ class Delivery { || $parent["private"]) { $public_message = false; // private recipients, not public } - } // We don't deliver our items to blocked or pending contacts, and not to ourselves either @@ -196,139 +173,16 @@ class Delivery { $contact['network'] = NETWORK_DIASPORA; } - logger("main delivery by delivery: followup=$followup mail=$mail fsuggest=$fsuggest relocate=$relocate - network ".$contact['network']); + logger("Delivering " . $cmd . " followup=$followup - network ".$contact['network']); switch ($contact['network']) { case NETWORK_DFRN: - logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']); - - if ($mail) { - $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']); - $atom = DFRN::mail($item, $owner); - } elseif ($fsuggest) { - $atom = DFRN::fsuggest($item, $owner); - dba::delete('fsuggest', ['id' => $item['id']]); - } elseif ($relocate) { - $atom = DFRN::relocate($owner, $uid); - } elseif ($followup) { - $msgitems = []; - foreach ($items as $item) { // there is only one item - if (!$item['parent']) { - return; - } - if ($item['id'] == $item_id) { - logger('followup: item: '. print_r($item,true), LOGGER_DATA); - $msgitems[] = $item; - } - } - $atom = DFRN::entries($msgitems,$owner); - } else { - $msgitems = []; - foreach ($items as $item) { - if (!$item['parent']) { - return; - } - - // private emails may be in included in public conversations. Filter them. - if ($public_message && $item['private']) { - return; - } - - $item_contact = self::getItemContact($item,$icontacts); - if (!$item_contact) { - return; - } - - if ($normal_mode) { - // Only add the parent when we don't delete other items. - if ($item_id == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != 'drop'))) { - $item["entry:comment-allow"] = true; - $item["entry:cid"] = (($top_level) ? $contact['id'] : 0); - $msgitems[] = $item; - } - } else { - $item["entry:comment-allow"] = true; - $msgitems[] = $item; - } - } - $atom = DFRN::entries($msgitems,$owner); - } - - logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG); - - logger('notifier: '.$atom, LOGGER_DATA); - $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3)); - - // perform local delivery if we are on the same site - - if (link_compare($basepath,System::baseUrl())) { - $nickname = basename($contact['url']); - if ($contact['issued-id']) { - $sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id'])); - } else { - $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id'])); - } - - $x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, - `contact`.`pubkey` AS `cpubkey`, - `contact`.`prvkey` AS `cprvkey`, - `contact`.`thumb` AS `thumb`, - `contact`.`url` as `url`, - `contact`.`name` as `senderName`, - `user`.* - FROM `contact` - INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` - WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 - AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s' - $sql_extra - AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 LIMIT 1", - dbesc(NETWORK_DFRN), - dbesc($nickname) - ); - - if ($x && count($x)) { - $write_flag = ((($x[0]['rel']) && ($x[0]['rel'] != CONTACT_IS_SHARING)) ? true : false); - if ((($owner['page-flags'] == PAGE_COMMUNITY) || $write_flag) && !$x[0]['writable']) { - dba::update('contact', ['writable' => true], ['id' => $x[0]['id']]); - $x[0]['writable'] = 1; - } - - $ssl_policy = Config::get('system','ssl_policy'); - $x[0] = Contact::updateSslPolicy($x[0], $ssl_policy); - - // If we are setup as a soapbox we aren't accepting top level posts from this person - - if (($x[0]['page-flags'] == PAGE_SOAPBOX) && $top_level) { - break; - } - logger('mod-delivery: local delivery'); - DFRN::import($atom, $x[0]); - break; - } - } - - if (!Queue::wasDelayed($contact['id'])) { - $deliver_status = DFRN::deliver($owner, $contact, $atom); - } else { - $deliver_status = -1; - } - - logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status); - - if ($deliver_status < 0) { - logger('notifier: delivery failed: queuing message'); - Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']); - } - - if (($deliver_status >= 200) && ($deliver_status <= 299)) { - // We successfully delivered a message, the contact is alive - Contact::unmarkForArchival($contact); - } else { - // The message could not be delivered. We mark the contact as "dead" - Contact::markForArchival($contact); - } + self::deliverDFRN($cmd, $contact, $icontacts, $owner, $items, $target_item, $public_message, $top_level, $followup); + break; + case NETWORK_DIASPORA: + self::deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, $walltowall); break; case NETWORK_OSTATUS: @@ -345,156 +199,7 @@ class Delivery { break; case NETWORK_MAIL: - - if (Config::get('system','dfrn_only')) { - break; - } - // WARNING: does not currently convert to RFC2047 header encodings, etc. - - $addr = $contact['addr']; - if (!strlen($addr)) { - break; - } - - if ($cmd === 'wall-new' || $cmd === 'comment-new') { - $it = null; - if ($cmd === 'wall-new') { - $it = $items[0]; - } else { - $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", - intval($item_id) - ); - if (DBM::is_result($r)) { - $it = $r[0]; - } - } - if (!$it) { - break; - } - - $local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", - intval($uid) - ); - if (!count($local_user)) { - break; - } - - $reply_to = ''; - $r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1", - intval($uid) - ); - if ($r1 && $r1[0]['reply_to']) { - $reply_to = $r1[0]['reply_to']; - } - - $subject = (($it['title']) ? Email::encodeHeader($it['title'],'UTF-8') : L10n::t("\x28no subject\x29")) ; - - // only expose our real email address to true friends - - if (($contact['rel'] == CONTACT_IS_FRIEND) && !$contact['blocked']) { - if ($reply_to) { - $headers = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$reply_to.'>'."\n"; - $headers .= 'Sender: '.$local_user[0]['email']."\n"; - } else { - $headers = 'From: '.Email::encodeHeader($local_user[0]['username'],'UTF-8').' <'.$local_user[0]['email'].'>'."\n"; - } - } else { - $headers = 'From: '. Email::encodeHeader($local_user[0]['username'], 'UTF-8') . ' get_hostname() . '>' . "\n"; - } - - //if ($reply_to) - // $headers .= 'Reply-to: '.$reply_to . "\n"; - - $headers .= 'Message-Id: <'. Email::iri2msgid($it['uri']).'>'. "\n"; - - //logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG); - //logger("Mail: Data: ".print_r($it, true), LOGGER_DEBUG); - //logger("Mail: Data: ".print_r($it, true), LOGGER_DATA); - - if ($it['uri'] !== $it['parent-uri']) { - $headers .= "References: <".Email::iri2msgid($it["parent-uri"]).">"; - - // If Threading is enabled, write down the correct parent - if (($it["thr-parent"] != "") && ($it["thr-parent"] != $it["parent-uri"])) { - $headers .= " <".Email::iri2msgid($it["thr-parent"]).">"; - } - $headers .= "\n"; - - if (!$it['title']) { - $r = q("SELECT `title` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($it['parent-uri']), - intval($uid)); - - if (DBM::is_result($r) && ($r[0]['title'] != '')) { - $subject = $r[0]['title']; - } else { - $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($it['parent-uri']), - intval($uid)); - - if (DBM::is_result($r) && ($r[0]['title'] != '')) { - $subject = $r[0]['title']; - } - } - } - if (strncasecmp($subject,'RE:',3)) { - $subject = 'Re: '.$subject; - } - } - Email::send($addr, $subject, $headers, $it); - } - break; - - case NETWORK_DIASPORA: - if ($public_message) { - $loc = 'public batch '.$contact['batch']; - } else { - $loc = $contact['name']; - } - - logger('delivery: diaspora batch deliver: '.$loc); - - if (Config::get('system','dfrn_only') || !Config::get('system','diaspora_enabled')) { - break; - } - if ($mail) { - Diaspora::sendMail($item,$owner,$contact); - break; - } - - if (!$normal_mode) { - break; - } - if (!$contact['pubkey'] && !$public_message) { - break; - } - if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { - // top-level retraction - logger('diaspora retract: '.$loc); - Diaspora::sendRetraction($target_item,$owner,$contact,$public_message); - break; - } elseif ($relocate) { - Diaspora::sendAccountMigration($owner, $contact, $uid); - break; - } elseif ($followup) { - // send comments and likes to owner to relay - logger('diaspora followup: '.$loc); - Diaspora::sendFollowup($target_item,$owner,$contact,$public_message); - break; - } elseif ($target_item['uri'] !== $target_item['parent-uri']) { - // we are the relay - send comments, likes and relayable_retractions to our conversants - logger('diaspora relay: '.$loc); - Diaspora::sendRelay($target_item,$owner,$contact,$public_message); - break; - } elseif ($top_level && !$walltowall) { - // currently no workable solution for sending walltowall - logger('diaspora status: '.$loc); - Diaspora::sendStatus($target_item,$owner,$contact,$public_message); - break; - } - - logger('delivery: diaspora unknown mode: '.$contact['name']); - + self::deliverMail($cmd, $contact, $owner, $target_item); break; default: @@ -504,6 +209,245 @@ class Delivery { return; } + private static function deliverDFRN($cmd, $contact, $icontacts, $owner, $items, $target_item, $public_message, $top_level, $followup) + { + logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']); + + if ($cmd == DELIVER_MAIL) { + $item = $target_item; + $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']); + $atom = DFRN::mail($item, $owner); + } elseif ($cmd == DELIVER_SUGGESTION) { + $item = $target_item; + $atom = DFRN::fsuggest($item, $owner); + dba::delete('fsuggest', ['id' => $item['id']]); + } elseif ($cmd == DELIVER_RELOCATION) { + $atom = DFRN::relocate($owner, $owner['uid']); + } elseif ($followup) { + $msgitems = []; + $msgitems[] = $target_item; + $atom = DFRN::entries($msgitems, $owner); + } else { + $msgitems = []; + foreach ($items as $item) { + if (!$item['parent']) { + return; + } + + // private emails may be in included in public conversations. Filter them. + if ($public_message && $item['private']) { + return; + } + + $item_contact = self::getItemContact($item, $icontacts); + if (!$item_contact) { + return; + } + + if (!in_array($cmd, [DELIVER_MAIL, DELIVER_SUGGESTION, DELIVER_RELOCATION])) { + // Only add the parent when we don't delete other items. + if ($target_item['id'] == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != DELIVER_DELETION))) { + $item["entry:comment-allow"] = true; + $item["entry:cid"] = ($top_level ? $contact['id'] : 0); + $msgitems[] = $item; + } + } else { + $item["entry:comment-allow"] = true; + $msgitems[] = $item; + } + } + $atom = DFRN::entries($msgitems,$owner); + } + + logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG); + + logger('notifier: '.$atom, LOGGER_DATA); + $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3)); + + // perform local delivery if we are on the same site + + if (link_compare($basepath, System::baseUrl())) { + $condition = ['nurl' => normalise_link($contact['url']), 'self' => true]; + $target_self = dba::selectFirst('contact', ['uid'], $condition); + if (!DBM::is_result($target_self)) { + return; + } + $target_uid = $target_self['uid']; + + // Check if the user has got this contact + $cid = Contact::getIdForURL($owner['url'], $target_uid); + if (!$cid) { + // Otherwise there should be a public contact + $cid = Contact::getIdForURL($owner['url']); + if (!$cid) { + return; + } + } + + // We now have some contact, so we fetch it + $target_importer = dba::fetch_first("SELECT *, `name` as `senderName` + FROM `contact` + WHERE NOT `blocked` AND `id` = ? LIMIT 1", + $cid); + + // This should never fail + if (!DBM::is_result($target_importer)) { + return; + } + + // Set the user id. This is important if this is a public contact + $target_importer['importer_uid'] = $target_uid; + DFRN::import($atom, $target_importer); + return; + } + + if (!Queue::wasDelayed($contact['id'])) { + $deliver_status = DFRN::deliver($owner, $contact, $atom); + } else { + $deliver_status = -1; + } + + logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status); + + if ($deliver_status < 0) { + logger('notifier: delivery failed: queuing message'); + Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']); + } + + if (($deliver_status >= 200) && ($deliver_status <= 299)) { + // We successfully delivered a message, the contact is alive + Contact::unmarkForArchival($contact); + } else { + // The message could not be delivered. We mark the contact as "dead" + Contact::markForArchival($contact); + } + } + + private static function deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, $walltowall) + { + if ($public_message) { + $loc = 'public batch ' . $contact['batch']; + } else { + $loc = $contact['name']; + } + + logger('delivery: diaspora batch deliver: ' . $loc); + + if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) { + return; + } + if ($cmd == DELIVER_MAIL) { + Diaspora::sendMail($target_item, $owner, $contact); + return; + } + + if ($cmd == DELIVER_SUGGESTION) { + return; + } + if (!$contact['pubkey'] && !$public_message) { + return; + } + if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) { + // top-level retraction + logger('diaspora retract: ' . $loc); + Diaspora::sendRetraction($target_item, $owner, $contact, $public_message); + return; + } elseif ($cmd == DELIVER_RELOCATION) { + Diaspora::sendAccountMigration($owner, $contact, $owner['uid']); + return; + } elseif ($followup) { + // send comments and likes to owner to relay + logger('diaspora followup: ' . $loc); + Diaspora::sendFollowup($target_item, $owner, $contact, $public_message); + return; + } elseif ($target_item['uri'] !== $target_item['parent-uri']) { + // we are the relay - send comments, likes and relayable_retractions to our conversants + logger('diaspora relay: ' . $loc); + Diaspora::sendRelay($target_item, $owner, $contact, $public_message); + return; + } elseif ($top_level && !$walltowall) { + // currently no workable solution for sending walltowall + logger('diaspora status: ' . $loc); + Diaspora::sendStatus($target_item, $owner, $contact, $public_message); + return; + } + + logger('Unknown mode ' . $cmd . ' for '.$contact['name']); + } + + private static function deliverMail($cmd, $contact, $owner, $target_item) + { + if (Config::get('system','dfrn_only')) { + return; + } + // WARNING: does not currently convert to RFC2047 header encodings, etc. + + $addr = $contact['addr']; + if (!strlen($addr)) { + return; + } + + if (!in_array($cmd, [DELIVER_POST, DELIVER_COMMENT])) { + return; + } + + $local_user = dba::selectFirst('user', [], ['uid' => $owner['uid']]); + if (!DBM::is_result($local_user)) { + return; + } + + $reply_to = ''; + $mailacct = dba::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]); + if (DBM::is_result($mailacct) && !empty($mailacct['reply_to'])) { + $reply_to = $mailacct['reply_to']; + } + + $subject = (($target_item['title']) ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29")); + + // only expose our real email address to true friends + + if (($contact['rel'] == CONTACT_IS_FRIEND) && !$contact['blocked']) { + if ($reply_to) { + $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to.'>' . "\n"; + $headers .= 'Sender: ' . $local_user['email'] . "\n"; + } else { + $headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8').' <' . $local_user['email'] . '>' . "\n"; + } + } else { + $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' get_hostname() . '>' . "\n"; + } + + $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n"; + + if ($target_item['uri'] !== $target_item['parent-uri']) { + $headers .= "References: <" . Email::iri2msgid($target_item["parent-uri"]) . ">"; + + // If Threading is enabled, write down the correct parent + if (($target_item["thr-parent"] != "") && ($target_item["thr-parent"] != $target_item["parent-uri"])) { + $headers .= " <".Email::iri2msgid($target_item["thr-parent"]).">"; + } + $headers .= "\n"; + + if (empty($target_item['title'])) { + $condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; + $title = dba::selectFirst('item', ['title'], $condition); + if (DBM::is_result($title) && ($title['title'] != '')) { + $subject = $title['title']; + } else { + $condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']]; + $title = dba::selectFirst('item', ['title'], $condition); + if (DBM::is_result($title) && ($title['title'] != '')) { + $subject = $title['title']; + } + } + } + if (strncasecmp($subject, 'RE:', 3)) { + $subject = 'Re: ' . $subject; + } + } + Email::send($addr, $subject, $headers, $it); + } + private static function getItemContact($item, $contacts) { if (!count($contacts) || !is_array($item)) {