From 3abd0b54ccc2b59f29e7d724c05a5a2d70c3c4ab Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 25 Apr 2018 21:18:21 +0000 Subject: [PATCH 01/14] 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 1ca8b8d8d8..84bb9741e6 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 0a71e6ce29..e8c21fb38d 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)) { From c437dac3a0aee6c82835703779a5cd6eb5e3e65e Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 25 Apr 2018 21:55:24 +0000 Subject: [PATCH 02/14] Delivery to non followers --- src/Worker/Delivery.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index e8c21fb38d..efeabae584 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -168,11 +168,6 @@ class Delivery { $deliver_status = 0; - // Transmit via Diaspora if not possible via Friendica - if (($item['uid'] == 0) && ($contact['network'] == NETWORK_DFRN)) { - $contact['network'] = NETWORK_DIASPORA; - } - logger("Delivering " . $cmd . " followup=$followup - network ".$contact['network']); switch ($contact['network']) { @@ -301,10 +296,14 @@ class Delivery { return; } - if (!Queue::wasDelayed($contact['id'])) { + if ($items[0]['uid'] == 0) { + $deliver_status = DFRN::transmit($owner, $contact, $atom); + if ($deliver_status < 200) { + // Transmit via Diaspora if not possible via Friendica + self::deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, false); + return; + } $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); @@ -377,6 +376,8 @@ class Delivery { private static function deliverMail($cmd, $contact, $owner, $target_item) { + global $a; + if (Config::get('system','dfrn_only')) { return; } @@ -402,7 +403,7 @@ class Delivery { $reply_to = $mailacct['reply_to']; } - $subject = (($target_item['title']) ? Email::encodeHeader($target_item['title'], 'UTF-8') : L10n::t("\x28no subject\x29")); + $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 @@ -445,7 +446,7 @@ class Delivery { $subject = 'Re: ' . $subject; } } - Email::send($addr, $subject, $headers, $it); + Email::send($addr, $subject, $headers, $target_item); } private static function getItemContact($item, $contacts) From 71d4c6e4a0f7fa8dcc2b2d7badc3a31c595e0716 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 26 Apr 2018 05:45:05 +0000 Subject: [PATCH 03/14] Cleaned up --- src/Worker/Delivery.php | 131 +++++++++++++--------------------------- 1 file changed, 43 insertions(+), 88 deletions(-) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index efeabae584..b65eff731e 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -25,13 +25,11 @@ class Delivery { public static function execute($cmd, $item_id, $contact_id) { global $a; - logger('delivery: invoked: '.$cmd.': '.$item_id.' to '.$contact_id, LOGGER_DEBUG); + logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, LOGGER_DEBUG); $top_level = false; - $recipients = []; $followup = false; - - $recipients[] = $contact_id; + $public_message = false; if ($cmd == DELIVER_MAIL) { $target_item = dba::selectFirst('mail', [], ['id' => $item_id]); @@ -39,14 +37,12 @@ class Delivery { return; } $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 = $target_item['uid']; - $recipients[] = $target_item['contact-id']; } elseif ($cmd == DELIVER_RELOCATION) { $uid = $item_id; } else { @@ -64,7 +60,6 @@ class Delivery { $parent_id = intval($target_item['parent']); $uid = $target_item['cuid']; - $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` @@ -76,25 +71,7 @@ class Delivery { return; } - $icontacts = null; - $contacts_arr = []; - foreach ($items as $item) { - if (!in_array($item['contact-id'],$contacts_arr)) { - $contacts_arr[] = intval($item['contact-id']); - } - } - if (count($contacts_arr)) { - $str_contacts = implode(',',$contacts_arr); - $icontacts = q("SELECT * FROM `contact` - WHERE `id` IN ( $str_contacts ) " - ); - } - if (!DBM::is_result($icontacts)) { - return; - } - // avoid race condition with deleting entries - if ($items[0]['deleted']) { foreach ($items as $item) { $item['deleted'] = 1; @@ -105,22 +82,10 @@ class Delivery { // The count then showed more than one entry. The additional check should help. // The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it. if ((($items[0]['id'] == $item_id) || (count($items) == 1)) && ($items[0]['uri'] === $items[0]['parent-uri'])) { - logger('delivery: top level post'); + logger('Top level post'); $top_level = true; } - } - $owner = User::getOwnerDataById($uid); - if (!$owner) { - return; - } - - // We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora - $walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY); - - $public_message = true; - - if (!in_array($cmd, [DELIVER_MAIL, DELIVER_SUGGESTION, DELIVER_RELOCATION])) { $parent = $items[0]; // This is IMPORTANT!!!! @@ -132,8 +97,8 @@ class Delivery { // and we will relay the whole lot. $localhost = $a->get_hostname(); - if (strpos($localhost,':')) { - $localhost = substr($localhost,0,strpos($localhost,':')); + if (strpos($localhost, ':')) { + $localhost = substr($localhost, 0, strpos($localhost, ':')); } /** * @@ -144,20 +109,25 @@ class Delivery { */ if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) { - logger('followup '.$target_item["guid"], LOGGER_DEBUG); + logger('Followup ' . $target_item["guid"], LOGGER_DEBUG); // local followup to remote post $followup = true; } - if (strlen($parent['allow_cid']) - || strlen($parent['allow_gid']) - || strlen($parent['deny_cid']) - || strlen($parent['deny_gid']) - || $parent["private"]) { - $public_message = false; // private recipients, not public + if (empty($parent['allow_cid']) + && empty($parent['allow_gid']) + && empty($parent['deny_cid']) + && empty($parent['deny_gid']) + && !$parent["private"]) { + $public_message = true; } } + $owner = User::getOwnerDataById($uid); + if (!DBM::is_result($owner)) { + return; + } + // We don't deliver our items to blocked or pending contacts, and not to ourselves either $contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false] @@ -166,18 +136,22 @@ class Delivery { return; } - $deliver_status = 0; + // Transmit via Diaspora if the thread had started as Diaspora post + // This is done since the uri wouldn't match (Diaspora doesn't transmit it) + if (isset($parent) && ($parent['network'] == NETWORK_DIASPORA) && ($contact['network'] == NETWORK_DFRN)) { + $contact['network'] = NETWORK_DIASPORA; + } - logger("Delivering " . $cmd . " followup=$followup - network ".$contact['network']); + logger("Delivering " . $cmd . " followup=$followup - via network " . $contact['network']); switch ($contact['network']) { case NETWORK_DFRN: - self::deliverDFRN($cmd, $contact, $icontacts, $owner, $items, $target_item, $public_message, $top_level, $followup); + self::deliverDFRN($cmd, $contact, $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); + self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); break; case NETWORK_OSTATUS: @@ -204,9 +178,9 @@ class Delivery { return; } - private static function deliverDFRN($cmd, $contact, $icontacts, $owner, $items, $target_item, $public_message, $top_level, $followup) + private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) { - logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']); + logger('Deliver ' . $target_item["guid"] . ' via DFRN to ' . $contact['addr']); if ($cmd == DELIVER_MAIL) { $item = $target_item; @@ -234,29 +208,18 @@ class Delivery { 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 { + // 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; } } $atom = DFRN::entries($msgitems,$owner); } - logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG); + logger('Notifier entry: ' . $contact["url"] . ' ' . $target_item["guid"] . ' entry: ' . $atom, LOGGER_DATA); - logger('notifier: '.$atom, LOGGER_DATA); $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3)); // perform local delivery if we are on the same site @@ -300,16 +263,16 @@ class Delivery { $deliver_status = DFRN::transmit($owner, $contact, $atom); if ($deliver_status < 200) { // Transmit via Diaspora if not possible via Friendica - self::deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, false); + self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); return; } $deliver_status = DFRN::deliver($owner, $contact, $atom); } - logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status); + logger('Delivery to ' . $contact["url"] . ' with guid ' . $target_item["guid"] . ' returns ' . $deliver_status); if ($deliver_status < 0) { - logger('notifier: delivery failed: queuing message'); + logger('Delivery failed: queuing message ' . $target_item["guid"] ); Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']); } @@ -322,15 +285,18 @@ class Delivery { } } - private static function deliverDiaspora($cmd, $contact, $owner, $target_item, $public_message, $top_level, $followup, $walltowall) + private static function deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) { + // We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora + $walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY); + if ($public_message) { $loc = 'public batch ' . $contact['batch']; } else { - $loc = $contact['name']; + $loc = $contact['addr']; } - logger('delivery: diaspora batch deliver: ' . $loc); + logger('Deliver ' . $target_item["guid"] . ' via Diaspora to ' . $loc); if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) { return; @@ -371,7 +337,7 @@ class Delivery { return; } - logger('Unknown mode ' . $cmd . ' for '.$contact['name']); + logger('Unknown mode ' . $cmd . ' for ' . $loc); } private static function deliverMail($cmd, $contact, $owner, $target_item) @@ -397,6 +363,8 @@ class Delivery { return; } + logger('Deliver ' . $target_item["guid"] . ' via mail to ' . $contact['addr']); + $reply_to = ''; $mailacct = dba::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]); if (DBM::is_result($mailacct) && !empty($mailacct['reply_to'])) { @@ -448,17 +416,4 @@ class Delivery { } Email::send($addr, $subject, $headers, $target_item); } - - private static function getItemContact($item, $contacts) - { - if (!count($contacts) || !is_array($item)) { - return false; - } - foreach ($contacts as $contact) { - if ($contact['id'] == $item['contact-id']) { - return $contact; - } - } - return false; - } } From b70b0204908665e6efb44c778412dce1f208e238 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 26 Apr 2018 06:23:01 +0000 Subject: [PATCH 04/14] Unneeded stuff removed, only fetch needed records --- src/Worker/Delivery.php | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index b65eff731e..85de82099c 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -61,14 +61,18 @@ class Delivery { $parent_id = intval($target_item['parent']); $uid = $target_item['cuid']; - $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", - intval($parent_id) - ); - - if (!DBM::is_result($items)) { - return; + if ($parent_id != $item_id) { + $parent = dba::fetch_first("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` + FROM `item` + LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` + WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $parent_id); + if (!DBM::is_result($parent)) { + return; + } + $items = [$parent, $target_item]; + } else { + $parent = $target_item; + $items = [$target_item]; } // avoid race condition with deleting entries @@ -81,13 +85,11 @@ class Delivery { // When commenting too fast after delivery, a post wasn't recognized as top level post. // The count then showed more than one entry. The additional check should help. // The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it. - if ((($items[0]['id'] == $item_id) || (count($items) == 1)) && ($items[0]['uri'] === $items[0]['parent-uri'])) { + if ((($parent['id'] == $item_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) { logger('Top level post'); $top_level = true; } - $parent = $items[0]; - // This is IMPORTANT!!!! // We will only send a "notify owner to relay" or followup message if the referenced post @@ -193,23 +195,13 @@ class Delivery { } elseif ($cmd == DELIVER_RELOCATION) { $atom = DFRN::relocate($owner, $owner['uid']); } elseif ($followup) { - $msgitems = []; - $msgitems[] = $target_item; + $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; - } - // Only add the parent when we don't delete other items. - if ($target_item['id'] == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != DELIVER_DELETION))) { + if (($target_item['id'] == $item['id']) || ($cmd != DELIVER_DELETION)) { $item["entry:comment-allow"] = true; $item["entry:cid"] = ($top_level ? $contact['id'] : 0); $msgitems[] = $item; @@ -266,6 +258,7 @@ class Delivery { self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); return; } + } else { $deliver_status = DFRN::deliver($owner, $contact, $atom); } From a0c5a84ce8dcdab600b7f0231f21385a7fe0b15a Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 26 Apr 2018 07:11:18 +0000 Subject: [PATCH 05/14] Better way to fetch items --- src/Worker/Delivery.php | 47 +++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 85de82099c..4387f28b79 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -19,8 +19,6 @@ use dba; require_once 'include/items.php'; -/// @todo This is some ugly code that needs to be split into several methods - class Delivery { public static function execute($cmd, $item_id, $contact_id) { global $a; @@ -46,34 +44,33 @@ class Delivery { } elseif ($cmd == DELIVER_RELOCATION) { $uid = $item_id; } else { - // find ancestors - $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'])) { + $item = dba::selectFirst('item', ['parent'], ['id' => $item_id]); + if (!DBM::is_result($item) || empty($item['parent'])) { return; } + $parent_id = intval($item['parent']); - $parent_id = intval($target_item['parent']); - $uid = $target_item['cuid']; - - if ($parent_id != $item_id) { - $parent = dba::fetch_first("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` - FROM `item` - LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` - WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $parent_id); - if (!DBM::is_result($parent)) { - return; + $itemdata = dba::p("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` IN (?, ?) AND `visible` AND NOT `moderated` + ORDER BY `item`.`id`", + $item_id, $parent_id); + $items = []; + while ($item = dba::fetch($itemdata)) { + if ($item['id'] == $parent_id) { + $parent = $item; } - $items = [$parent, $target_item]; - } else { - $parent = $target_item; - $items = [$target_item]; + if ($item['id'] == $item_id) { + $target_item = $item; + } + $items[] = $item; } + dba::close($itemdata); + + $uid = $target_item['cuid']; // avoid race condition with deleting entries if ($items[0]['deleted']) { From 4957ab8fbb80ae5a0550c554de4c5dd61dd41d36 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 26 Apr 2018 20:41:06 +0000 Subject: [PATCH 06/14] Avoid PHP warning with a missing key --- src/Protocol/Diaspora.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 6f03c0df87..70728a71ba 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -832,6 +832,10 @@ class Diaspora if (isset($parent_author_signature)) { $key = self::key($msg["author"]); + if (empty($key)) { + logger("No key found for parent author ".$msg["author"], LOGGER_DEBUG); + return false; + } if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, "sha256")) { logger("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, LOGGER_DEBUG); @@ -840,6 +844,10 @@ class Diaspora } $key = self::key($fields->author); + if (empty($key)) { + logger("No key found for author ".$fields->author, LOGGER_DEBUG); + return false; + } if (!Crypto::rsaVerify($signed_data, $author_signature, $key, "sha256")) { logger("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG); From 8c23fea1df6cc429df640900ba82d003feac9227 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 26 Apr 2018 21:16:16 +0000 Subject: [PATCH 07/14] Added some explanation, beautified code --- src/Worker/Delivery.php | 8 +++++--- src/Worker/PubSubPublish.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 4387f28b79..1361857df7 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -204,12 +204,12 @@ class Delivery { $msgitems[] = $item; } } - $atom = DFRN::entries($msgitems,$owner); + $atom = DFRN::entries($msgitems, $owner); } logger('Notifier entry: ' . $contact["url"] . ' ' . $target_item["guid"] . ' entry: ' . $atom, LOGGER_DATA); - $basepath = implode('/', array_slice(explode('/',$contact['url']),0,3)); + $basepath = implode('/', array_slice(explode('/', $contact['url']), 0, 3)); // perform local delivery if we are on the same site @@ -248,6 +248,8 @@ class Delivery { return; } + // We don't have a relationship with contacts on a public post. + // Se we transmit with the new method and via Diaspora as a fallback if ($items[0]['uid'] == 0) { $deliver_status = DFRN::transmit($owner, $contact, $atom); if ($deliver_status < 200) { @@ -400,7 +402,7 @@ class Delivery { } } } - if (strncasecmp($subject, 'RE:', 3)) { + if (strncasecmp($subject, 'RE:', 3)) { $subject = 'Re: ' . $subject; } } diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php index de26eab9c1..bd4aa0390b 100644 --- a/src/Worker/PubSubPublish.php +++ b/src/Worker/PubSubPublish.php @@ -68,7 +68,7 @@ class PubSubPublish { $rr['topic']), "X-Hub-Signature: sha1=".$hmac_sig]; - logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DEBUG); + logger('POST '.print_r($headers, true)."\n".$params, LOGGER_DATA); Network::post($rr['callback_url'], $params, $headers); $ret = $a->get_curl_code(); From 66e34b9357ae6c7944836db609008b3315f9613d Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 26 Apr 2018 22:30:43 +0000 Subject: [PATCH 08/14] Improvements --- src/Worker/Delivery.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 1361857df7..9a134d0539 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -4,6 +4,7 @@ */ namespace Friendica\Worker; +use Friendica\BaseObject; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\System; @@ -19,10 +20,8 @@ use dba; require_once 'include/items.php'; -class Delivery { +class Delivery extends BaseObject { public static function execute($cmd, $item_id, $contact_id) { - global $a; - logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, LOGGER_DEBUG); $top_level = false; @@ -95,7 +94,7 @@ class Delivery { // if $parent['wall'] == 1 we will already have the parent message in our array // and we will relay the whole lot. - $localhost = $a->get_hostname(); + $localhost = self::getApp()->get_hostname(); if (strpos($localhost, ':')) { $localhost = substr($localhost, 0, strpos($localhost, ':')); } @@ -334,8 +333,6 @@ class Delivery { private static function deliverMail($cmd, $contact, $owner, $target_item) { - global $a; - if (Config::get('system','dfrn_only')) { return; } @@ -375,7 +372,7 @@ class Delivery { $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 = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' get_hostname() . '>' . "\n"; } $headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n"; From 488c6c9b68572e254123584426b2e30ae0f092b9 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 27 Apr 2018 02:52:12 +0000 Subject: [PATCH 09/14] Constants moved --- boot.php | 10 ---------- src/Worker/Delivery.php | 29 ++++++++++++++++++----------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/boot.php b/boot.php index 84bb9741e6..1ca8b8d8d8 100644 --- a/boot.php +++ b/boot.php @@ -486,16 +486,6 @@ 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 9a134d0539..78b3366988 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -21,6 +21,13 @@ use dba; require_once 'include/items.php'; class Delivery extends BaseObject { + const MAIL = 'mail'; + const SUGGESTION = 'suggest'; + const RELOCATION = 'relocate'; + const DELETION = 'drop'; + const POST = 'wall-new'; + const COMMENT = 'comment-new'; + public static function execute($cmd, $item_id, $contact_id) { logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, LOGGER_DEBUG); @@ -28,19 +35,19 @@ class Delivery extends BaseObject { $followup = false; $public_message = false; - if ($cmd == DELIVER_MAIL) { + if ($cmd == self::MAIL) { $target_item = dba::selectFirst('mail', [], ['id' => $item_id]); if (!DBM::is_result($message)) { return; } $uid = $target_item['uid']; - } elseif ($cmd == DELIVER_SUGGESTION) { + } elseif ($cmd == self::SUGGESTION) { $target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]); if (!DBM::is_result($message)) { return; } $uid = $target_item['uid']; - } elseif ($cmd == DELIVER_RELOCATION) { + } elseif ($cmd == self::RELOCATION) { $uid = $item_id; } else { $item = dba::selectFirst('item', ['parent'], ['id' => $item_id]); @@ -180,15 +187,15 @@ class Delivery extends BaseObject { { logger('Deliver ' . $target_item["guid"] . ' via DFRN to ' . $contact['addr']); - if ($cmd == DELIVER_MAIL) { + if ($cmd == self::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) { + } elseif ($cmd == self::SUGGESTION) { $item = $target_item; $atom = DFRN::fsuggest($item, $owner); dba::delete('fsuggest', ['id' => $item['id']]); - } elseif ($cmd == DELIVER_RELOCATION) { + } elseif ($cmd == self::RELOCATION) { $atom = DFRN::relocate($owner, $owner['uid']); } elseif ($followup) { $msgitems = [$target_item]; @@ -197,7 +204,7 @@ class Delivery extends BaseObject { $msgitems = []; foreach ($items as $item) { // Only add the parent when we don't delete other items. - if (($target_item['id'] == $item['id']) || ($cmd != DELIVER_DELETION)) { + if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) { $item["entry:comment-allow"] = true; $item["entry:cid"] = ($top_level ? $contact['id'] : 0); $msgitems[] = $item; @@ -292,12 +299,12 @@ class Delivery extends BaseObject { if (Config::get('system', 'dfrn_only') || !Config::get('system', 'diaspora_enabled')) { return; } - if ($cmd == DELIVER_MAIL) { + if ($cmd == self::MAIL) { Diaspora::sendMail($target_item, $owner, $contact); return; } - if ($cmd == DELIVER_SUGGESTION) { + if ($cmd == self::SUGGESTION) { return; } if (!$contact['pubkey'] && !$public_message) { @@ -308,7 +315,7 @@ class Delivery extends BaseObject { logger('diaspora retract: ' . $loc); Diaspora::sendRetraction($target_item, $owner, $contact, $public_message); return; - } elseif ($cmd == DELIVER_RELOCATION) { + } elseif ($cmd == self::RELOCATION) { Diaspora::sendAccountMigration($owner, $contact, $owner['uid']); return; } elseif ($followup) { @@ -343,7 +350,7 @@ class Delivery extends BaseObject { return; } - if (!in_array($cmd, [DELIVER_POST, DELIVER_COMMENT])) { + if (!in_array($cmd, [self::POST, self::COMMENT])) { return; } From e3c9d310882efa301434a199ae066ef9bd399ba9 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 27 Apr 2018 03:08:13 +0000 Subject: [PATCH 10/14] Added header --- src/Worker/Delivery.php | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 78b3366988..b62c598903 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -183,6 +183,18 @@ class Delivery extends BaseObject { return; } + /** + * @brief Deliver content via DFRN + * + * @param string $cmd Command + * @param array $contact Contact record of the receiver + * @param array $owner Owner record of the sender + * @param array $items Item record of the content and the parent + * @param array $target_item Item record of the content + * @param boolean $public_message Is the content public? + * @param boolean $top_level Is it a thread starter? + * @param boolean $followup Is it an answer to a remote post? + */ private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) { logger('Deliver ' . $target_item["guid"] . ' via DFRN to ' . $contact['addr']); @@ -283,6 +295,18 @@ class Delivery extends BaseObject { } } + /** + * @brief Deliver content via Diaspora + * + * @param string $cmd Command + * @param array $contact Contact record of the receiver + * @param array $owner Owner record of the sender + * @param array $items Item record of the content and the parent + * @param array $target_item Item record of the content + * @param boolean $public_message Is the content public? + * @param boolean $top_level Is it a thread starter? + * @param boolean $followup Is it an answer to a remote post? + */ private static function deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup) { // We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora @@ -338,6 +362,14 @@ class Delivery extends BaseObject { logger('Unknown mode ' . $cmd . ' for ' . $loc); } + /** + * @brief Deliver content via mail + * + * @param string $cmd Command + * @param array $contact Contact record of the receiver + * @param array $owner Owner record of the sender + * @param array $target_item Item record of the content + */ private static function deliverMail($cmd, $contact, $owner, $target_item) { if (Config::get('system','dfrn_only')) { From 1e2bc1e6cfc298ba71b80f7895c2c6da29871f93 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 27 Apr 2018 04:11:33 +0000 Subject: [PATCH 11/14] Ensure local delivery of Diaspora comments --- src/Model/Item.php | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index aa3800cbe1..e7fd115dd1 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -866,7 +866,6 @@ class Item extends BaseObject unset($item['mention']); unset($item['wall']); unset($item['origin']); - unset($item['global']); unset($item['starred']); unset($item['rendered-hash']); unset($item['rendered-html']); @@ -976,10 +975,15 @@ class Item extends BaseObject if (!dba::exists('item', ['uri' => $item['uri'], 'uid' => 0])) { // Preparing public shadow (removing user specific data) - unset($item['id']); $item['uid'] = 0; - $item['origin'] = 0; - $item['wall'] = 0; + unset($item['id']); + unset($item['parent']); + unset($item['wall']); + unset($item['mention']); + unset($item['origin']); + unset($item['starred']); + unset($item['rendered-hash']); + unset($item['rendered-html']); if ($item['uri'] == $item['parent-uri']) { $item['contact-id'] = Contact::getIdForURL($item['owner-link']); } else { @@ -1033,11 +1037,20 @@ class Item extends BaseObject return; } + // Save "origin" and "parent" state + $origin = $item['origin']; + $parent = $item['parent']; + // Preparing public shadow (removing user specific data) - unset($item['id']); $item['uid'] = 0; - $item['origin'] = 0; - $item['wall'] = 0; + unset($item['id']); + unset($item['parent']); + unset($item['wall']); + unset($item['mention']); + unset($item['origin']); + unset($item['starred']); + unset($item['rendered-hash']); + unset($item['rendered-html']); $item['contact-id'] = Contact::getIdForURL($item['author-link']); if (in_array($item['type'], ["net-comment", "wall-comment"])) { @@ -1049,6 +1062,14 @@ class Item extends BaseObject $public_shadow = self::insert($item, false, false, true); logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG); + + // If this was a comment to a Diaspora post we don't get our comment back. + // This means that we have to distribute the comment by ourselves. + if ($origin) { + if (dba::exists('item', ['id' => $parent, 'network' => NETWORK_DIASPORA])) { + self::distribute($public_shadow); + } + } } /** From 4904be0d6f6f693bd7c792e3e663f497f90b839a Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 27 Apr 2018 04:55:46 +0000 Subject: [PATCH 12/14] Better fallback on values > 299 as well --- src/Worker/Delivery.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index b62c598903..9dbe0eca0a 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -270,7 +270,7 @@ class Delivery extends BaseObject { // Se we transmit with the new method and via Diaspora as a fallback if ($items[0]['uid'] == 0) { $deliver_status = DFRN::transmit($owner, $contact, $atom); - if ($deliver_status < 200) { + if (($deliver_status < 200) || ($deliver_status > 299)) { // Transmit via Diaspora if not possible via Friendica self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); return; From 9f5a6c05fb09519174d5fc9cb87f382ca357797b Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 27 Apr 2018 05:11:52 +0000 Subject: [PATCH 13/14] Preparation for relay posts with DFRN --- src/Protocol/DFRN.php | 36 +++++++++++++++++++----------------- src/Worker/Delivery.php | 5 ++++- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index 74975159ea..f233f158a9 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -1405,25 +1405,27 @@ class DFRN { $a = get_app(); - if (empty($contact['addr'])) { - logger('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.'); - if (Contact::updateFromProbe($contact['id'])) { - $new_contact = dba::selectFirst('contact', ['addr'], ['id' => $contact['id']]); - $contact['addr'] = $new_contact['addr']; - } - + if (!$public_batch) { if (empty($contact['addr'])) { - logger('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']); - Contact::markForArchival($contact); - return -21; - } - } + logger('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.'); + if (Contact::updateFromProbe($contact['id'])) { + $new_contact = dba::selectFirst('contact', ['addr'], ['id' => $contact['id']]); + $contact['addr'] = $new_contact['addr']; + } - $fcontact = Diaspora::personByHandle($contact['addr']); - if (empty($fcontact)) { - logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']); - Contact::markForArchival($contact); - return -22; + if (empty($contact['addr'])) { + logger('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']); + Contact::markForArchival($contact); + return -21; + } + } + + $fcontact = Diaspora::personByHandle($contact['addr']); + if (empty($fcontact)) { + logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']); + Contact::markForArchival($contact); + return -22; + } } $envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch); diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index 9dbe0eca0a..d8ab882243 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -269,7 +269,10 @@ class Delivery extends BaseObject { // We don't have a relationship with contacts on a public post. // Se we transmit with the new method and via Diaspora as a fallback if ($items[0]['uid'] == 0) { - $deliver_status = DFRN::transmit($owner, $contact, $atom); + // Transmit in public if it's a relay post + $public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY); + + $deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn); if (($deliver_status < 200) || ($deliver_status > 299)) { // Transmit via Diaspora if not possible via Friendica self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup); From 84909d9711c3eb979c630a6c335fcebfccf3542b Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 27 Apr 2018 12:40:52 +0000 Subject: [PATCH 14/14] Standard stuff --- src/Worker/Delivery.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index d8ab882243..f874e5f230 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -20,7 +20,8 @@ use dba; require_once 'include/items.php'; -class Delivery extends BaseObject { +class Delivery extends BaseObject +{ const MAIL = 'mail'; const SUGGESTION = 'suggest'; const RELOCATION = 'relocate'; @@ -28,7 +29,8 @@ class Delivery extends BaseObject { const POST = 'wall-new'; const COMMENT = 'comment-new'; - public static function execute($cmd, $item_id, $contact_id) { + public static function execute($cmd, $item_id, $contact_id) + { logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $contact_id, LOGGER_DEBUG); $top_level = false;