From 5da3e17a126cca7cb7b8488194532ffbb857ca7d Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 6 May 2019 05:46:13 +0000 Subject: [PATCH 1/2] The follow confirmation process is now separated between DFRN and the rest --- mod/dfrn_confirm.php | 381 +++++++++++---------------- mod/notifications.php | 9 + src/App/Router.php | 1 + src/Module/FollowConfirm.php | 93 +++++++ view/templates/intros.tpl | 2 +- view/theme/frio/templates/intros.tpl | 2 +- 6 files changed, 259 insertions(+), 229 deletions(-) create mode 100644 src/Module/FollowConfirm.php diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index fe7323a33a..7b1171ba41 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -28,8 +28,6 @@ use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\User; use Friendica\Network\Probe; -use Friendica\Protocol\Diaspora; -use Friendica\Protocol\ActivityPub; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; @@ -136,165 +134,153 @@ function dfrn_confirm_post(App $a, $handsfree = null) $site_pubkey = $contact['site-pubkey']; $dfrn_confirm = $contact['confirm']; $aes_allow = $contact['aes_allow']; + $protocol = $contact['network']; - // an empty DFRN-ID tells us that it had been a request via AP from a Friendica contact - if (!empty($contact['protocol'])) { - $protocol = $contact['protocol']; - } elseif (($contact['network'] === Protocol::DFRN) && empty($dfrn_id)) { - $protocol = Contact::getProtocol($contact['url'], $contact['network']); - } else { - $protocol = $contact['network']; + /* + * Generate a key pair for all further communications with this person. + * We have a keypair for every contact, and a site key for unknown people. + * This provides a means to carry on relationships with other people if + * any single key is compromised. It is a robust key. We're much more + * worried about key leakage than anybody cracking it. + */ + $res = Crypto::newKeypair(4096); + + $private_key = $res['prvkey']; + $public_key = $res['pubkey']; + + // Save the private key. Send them the public key. + $fields = ['prvkey' => $private_key, 'protocol' => Protocol::DFRN]; + DBA::update('contact', $fields, ['id' => $contact_id]); + + $params = []; + + /* + * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our + * site private key (person on the other end can decrypt it with our site public key). + * Then encrypt our profile URL with the other person's site public key. They can decrypt + * it with their site private key. If the decryption on the other end fails for either + * item, it indicates tampering or key failure on at least one site and we will not be + * able to provide a secure communication pathway. + * + * If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 + * or later) then we encrypt the personal public key we send them using AES-256-CBC and a + * random key which is encrypted with their site public key. + */ + + $src_aes_key = openssl_random_pseudo_bytes(64); + + $result = ''; + openssl_private_encrypt($dfrn_id, $result, $user['prvkey']); + + $params['dfrn_id'] = bin2hex($result); + $params['public_key'] = $public_key; + + $my_url = System::baseUrl() . '/profile/' . $user['nickname']; + + openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey); + $params['source_url'] = bin2hex($params['source_url']); + + if ($aes_allow && function_exists('openssl_encrypt')) { + openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey); + $params['aes_key'] = bin2hex($params['aes_key']); + $params['public_key'] = bin2hex(openssl_encrypt($public_key, 'AES-256-CBC', $src_aes_key)); } - if ($protocol === Protocol::DFRN) { - /* - * Generate a key pair for all further communications with this person. - * We have a keypair for every contact, and a site key for unknown people. - * This provides a means to carry on relationships with other people if - * any single key is compromised. It is a robust key. We're much more - * worried about key leakage than anybody cracking it. - */ - $res = Crypto::newKeypair(4096); + $params['dfrn_version'] = DFRN_PROTOCOL_VERSION; + if ($duplex == 1) { + $params['duplex'] = 1; + } - $private_key = $res['prvkey']; - $public_key = $res['pubkey']; + if ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) { + $params['page'] = 1; + } - // Save the private key. Send them the public key. - $fields = ['prvkey' => $private_key, 'protocol' => Protocol::DFRN]; - DBA::update('contact', $fields, ['id' => $contact_id]); + if ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP) { + $params['page'] = 2; + } - $params = []; + Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), Logger::DATA); - /* - * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our - * site private key (person on the other end can decrypt it with our site public key). - * Then encrypt our profile URL with the other person's site public key. They can decrypt - * it with their site private key. If the decryption on the other end fails for either - * item, it indicates tampering or key failure on at least one site and we will not be - * able to provide a secure communication pathway. - * - * If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 - * or later) then we encrypt the personal public key we send them using AES-256-CBC and a - * random key which is encrypted with their site public key. - */ + /* + * + * POST all this stuff to the other site. + * Temporarily raise the network timeout to 120 seconds because the default 60 + * doesn't always give the other side quite enough time to decrypt everything. + * + */ - $src_aes_key = openssl_random_pseudo_bytes(64); + $res = Network::post($dfrn_confirm, $params, null, $redirects, 120)->getBody(); - $result = ''; - openssl_private_encrypt($dfrn_id, $result, $user['prvkey']); + Logger::log(' Confirm: received data: ' . $res, Logger::DATA); - $params['dfrn_id'] = bin2hex($result); - $params['public_key'] = $public_key; + // Now figure out what they responded. Try to be robust if the remote site is + // having difficulty and throwing up errors of some kind. - $my_url = System::baseUrl() . '/profile/' . $user['nickname']; + $leading_junk = substr($res, 0, strpos($res, 'status; + $message = XML::unescape($xml->message); // human readable text of what may have gone wrong. + switch ($status) { + case 0: + info(L10n::t("Confirmation completed successfully.") . EOL); + break; + case 1: + // birthday paradox - generate new dfrn-id and fall through. + $new_dfrn_id = Strings::getRandomHex(); + q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d", + DBA::escape($new_dfrn_id), + intval($contact_id), + intval($uid) + ); + + case 2: + notice(L10n::t("Temporary failure. Please wait and try again.") . EOL); + break; + case 3: + notice(L10n::t("Introduction failed or was revoked.") . EOL); + break; + } + + if (strlen($message)) { + notice(L10n::t('Remote site reported: ') . $message . EOL); + } + + if (($status == 0) && $intro_id) { + $intro = DBA::selectFirst('intro', ['note'], ['id' => $intro_id]); + if (DBA::isResult($intro)) { + DBA::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]); } - $params['dfrn_version'] = DFRN_PROTOCOL_VERSION; - if ($duplex == 1) { - $params['duplex'] = 1; - } + // Success. Delete the notification. + DBA::delete('intro', ['id' => $intro_id]); + } - if ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) { - $params['page'] = 1; - } - - if ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP) { - $params['page'] = 2; - } - - Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), Logger::DATA); - - /* - * - * POST all this stuff to the other site. - * Temporarily raise the network timeout to 120 seconds because the default 60 - * doesn't always give the other side quite enough time to decrypt everything. - * - */ - - $res = Network::post($dfrn_confirm, $params, null, $redirects, 120)->getBody(); - - Logger::log(' Confirm: received data: ' . $res, Logger::DATA); - - // Now figure out what they responded. Try to be robust if the remote site is - // having difficulty and throwing up errors of some kind. - - $leading_junk = substr($res, 0, strpos($res, 'status; - $message = XML::unescape($xml->message); // human readable text of what may have gone wrong. - switch ($status) { - case 0: - info(L10n::t("Confirmation completed successfully.") . EOL); - break; - case 1: - // birthday paradox - generate new dfrn-id and fall through. - $new_dfrn_id = Strings::getRandomHex(); - q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d", - DBA::escape($new_dfrn_id), - intval($contact_id), - intval($uid) - ); - - case 2: - notice(L10n::t("Temporary failure. Please wait and try again.") . EOL); - break; - case 3: - notice(L10n::t("Introduction failed or was revoked.") . EOL); - break; - } - - if (strlen($message)) { - notice(L10n::t('Remote site reported: ') . $message . EOL); - } - - if (($status == 0) && $intro_id) { - $intro = DBA::selectFirst('intro', ['note'], ['id' => $intro_id]); - if (DBA::isResult($intro)) { - DBA::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]); - } - - // Success. Delete the notification. - DBA::delete('intro', ['id' => $intro_id]); - } - - if ($status != 0) { - return; - } - } else { - DBA::update('contact', ['protocol' => $protocol], ['id' => $contact_id]); + if ($status != 0) { + return; } /* @@ -308,98 +294,39 @@ function dfrn_confirm_post(App $a, $handsfree = null) Logger::log('dfrn_confirm: confirm - imported photos'); - if ($protocol === Protocol::DFRN) { - $new_relation = Contact::FOLLOWER; + $new_relation = Contact::FOLLOWER; - if (($relation == Contact::SHARING) || ($duplex)) { - $new_relation = Contact::FRIEND; - } - - if (($relation == Contact::SHARING) && ($duplex)) { - $duplex = 0; - } - - $r = q("UPDATE `contact` SET `rel` = %d, - `name-date` = '%s', - `uri-date` = '%s', - `blocked` = 0, - `pending` = 0, - `duplex` = %d, - `hidden` = %d, - `network` = '%s' WHERE `id` = %d - ", - intval($new_relation), - DBA::escape(DateTimeFormat::utcNow()), - DBA::escape(DateTimeFormat::utcNow()), - intval($duplex), - intval($hidden), - DBA::escape(Protocol::DFRN), - intval($contact_id) - ); - } else { - if ($protocol == Protocol::ACTIVITYPUB) { - ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid); - // Setting "pending" to true on a bidirectional contact request could create a problem when it isn't accepted on the other side - // Then we have got a situation where - although one direction is accepted - the contact still appears as pending. - // Possibly we need two different "pending" fields, one for incoming, one for outgoing? - // This has to be thought over, but for now this here is a better solution. - // $pending = $duplex; - $pending = false; - } else { - $pending = false; - } - - $arr = Probe::uri($contact['url'], $protocol); - - $notify = defaults($contact, 'notify' , $arr['notify']); - $poll = defaults($contact, 'poll' , $arr['poll']); - - $addr = $arr['addr']; - - $new_relation = $contact['rel']; - $writable = $contact['writable']; - - if (in_array($protocol, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { - if ($duplex) { - $new_relation = Contact::FRIEND; - } else { - $new_relation = Contact::FOLLOWER; - } - - if ($new_relation != Contact::FOLLOWER) { - $writable = 1; - } - } - - DBA::delete('intro', ['id' => $intro_id]); - - $fields = ['name-date' => DateTimeFormat::utcNow(), - 'uri-date' => DateTimeFormat::utcNow(), 'addr' => $addr, - 'notify' => $notify, 'poll' => $poll, 'blocked' => false, - 'pending' => $pending, 'protocol' => $protocol, - 'writable' => $writable, 'hidden' => $hidden, 'rel' => $new_relation]; - DBA::update('contact', $fields, ['id' => $contact_id]); + if (($relation == Contact::SHARING) || ($duplex)) { + $new_relation = Contact::FRIEND; } - if (!DBA::isResult($r)) { - notice(L10n::t('Unable to set contact photo.') . EOL); + if (($relation == Contact::SHARING) && ($duplex)) { + $duplex = 0; } + $r = q("UPDATE `contact` SET `rel` = %d, + `name-date` = '%s', + `uri-date` = '%s', + `blocked` = 0, + `pending` = 0, + `duplex` = %d, + `hidden` = %d, + `network` = '%s' WHERE `id` = %d + ", + intval($new_relation), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), + intval($duplex), + intval($hidden), + DBA::escape(Protocol::DFRN), + intval($contact_id) + ); + // reload contact info $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]); - if (isset($new_relation) && ($new_relation == Contact::FRIEND)) { - if (DBA::isResult($contact) && ($contact['network'] === Protocol::DIASPORA)) { - $ret = Diaspora::sendShare($user, $contact); - Logger::log('share returns: ' . $ret); - } - } Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']); - if (($protocol == Protocol::ACTIVITYPUB) && $duplex) { - ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid); - } - // Let's send our user to the contact editor in case they want to // do anything special with this new friend. if ($handsfree === null) { diff --git a/mod/notifications.php b/mod/notifications.php index 909b297ebf..ff954d4189 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -223,6 +223,14 @@ function notifications_content(App $a) '$as_fan' => (($notif['network'] == Protocol::DIASPORA) ? L10n::t('Sharer') : L10n::t('Subscriber')) ]); + $contact = DBA::selectFirst('contact', ['network', 'protocol'], ['id' => $notif['contact_id']]); + + if (($contact['network'] != Protocol::DFRN) || ($contact['protocol'] == Protocol::ACTIVITYPUB)) { + $action = 'follow_confirm'; + } else { + $action = 'dfrn_confirm'; + } + $header = $notif['name']; if ($notif['addr'] != '') { @@ -270,6 +278,7 @@ function notifications_content(App $a) '$note' => $notif['note'], '$ignore' => L10n::t('Ignore'), '$discard' => $discard, + '$action' => $action, ]); break; } diff --git a/src/App/Router.php b/src/App/Router.php index 1dffb6b406..3f576d7c53 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -110,6 +110,7 @@ class Router $collector->addRoute(['GET'], '/{guid}/reshare', Module\Diaspora\Fetch::class); }); $this->routeCollector->addRoute(['GET'], '/filer[/{id:\d+}]', Module\Filer::class); + $this->routeCollector->addRoute(['GET', 'POST'], '/follow_confirm', Module\FollowConfirm::class); $this->routeCollector->addRoute(['GET'], '/followers/{owner}', Module\Followers::class); $this->routeCollector->addRoute(['GET'], '/following/{owner}', Module\Following::class); $this->routeCollector->addGroup('/group', function (RouteCollector $collector) { diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php new file mode 100644 index 0000000000..1e632d92a9 --- /dev/null +++ b/src/Module/FollowConfirm.php @@ -0,0 +1,93 @@ + $cid, 'uid' => $uid]); + if (!DBA::isResult($contact)) { + Logger::log('Contact not found in DB.'); + notice(L10n::t('Contact not found.') . EOL); + return; + } + + $relation = $contact['rel']; + $new_relation = $contact['rel']; + $writable = $contact['writable']; + + if (!empty($contact['protocol'])) { + $protocol = $contact['protocol']; + } else { + $protocol = $contact['network']; + } + + if ($protocol == Protocol::ACTIVITYPUB) { + ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid); + } + + if (in_array($protocol, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { + if ($duplex) { + $new_relation = Contact::FRIEND; + } else { + $new_relation = Contact::FOLLOWER; + } + + if ($new_relation != Contact::FOLLOWER) { + $writable = 1; + } + } + + $fields = ['name-date' => DateTimeFormat::utcNow(), + 'uri-date' => DateTimeFormat::utcNow(), + 'blocked' => false, 'pending' => false, 'protocol' => $protocol, + 'writable' => $writable, 'hidden' => $hidden, 'rel' => $new_relation]; + DBA::update('contact', $fields, ['id' => $cid]); + + if ($new_relation == Contact::FRIEND) { + if ($protocol == Protocol::DIASPORA) { + $user = DBA::selectFirst('user', [], ['uid' => $uid]); + $contact = DBA::select('contact', [], ['id' => $cid]); + $ret = Diaspora::sendShare($user, $contact); + Logger::log('share returns: ' . $ret); + } elseif ($protocol == Protocol::ACTIVITYPUB) { + ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid); + } + } + + DBA::delete('intro', ['id' => $intro_id]); + + $a->internalRedirect('contact/' . intval($cid)); + } +} diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl index 049e482f23..1f7f838bcf 100644 --- a/view/templates/intros.tpl +++ b/view/templates/intros.tpl @@ -18,7 +18,7 @@
-
+ {{include file="field_checkbox.tpl" field=$hidden}} diff --git a/view/theme/frio/templates/intros.tpl b/view/theme/frio/templates/intros.tpl index cea74d2fae..a8a033c9b5 100644 --- a/view/theme/frio/templates/intros.tpl +++ b/view/theme/frio/templates/intros.tpl @@ -52,7 +52,7 @@