2010-07-01 19:48:07 -04:00
|
|
|
<?php
|
2016-11-28 10:23:47 -05:00
|
|
|
/**
|
|
|
|
* @file mod/dfrn_confirm.php
|
|
|
|
* @brief Module: dfrn_confirm
|
2010-12-08 18:30:26 -05:00
|
|
|
* Purpose: Friendship acceptance for DFRN contacts
|
2018-01-12 23:23:51 -05:00
|
|
|
*
|
2010-12-08 18:30:26 -05:00
|
|
|
* There are two possible entry points and three scenarios.
|
2018-01-12 23:23:51 -05:00
|
|
|
*
|
2010-12-08 18:30:26 -05:00
|
|
|
* 1. A form was submitted by our user approving a friendship that originated elsewhere.
|
|
|
|
* This may also be called from dfrn_request to automatically approve a friendship.
|
|
|
|
*
|
2014-09-06 11:28:46 -04:00
|
|
|
* 2. We may be the target or other side of the conversation to scenario 1, and will
|
2010-12-08 18:30:26 -05:00
|
|
|
* interact with that process on our own user's behalf.
|
2018-01-12 23:23:51 -05:00
|
|
|
*
|
2016-11-28 10:23:47 -05:00
|
|
|
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
|
|
|
|
* You also find a graphic which describes the confirmation process at
|
|
|
|
* https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_confirmation.png
|
2010-12-08 18:30:26 -05:00
|
|
|
*/
|
2010-11-18 23:58:46 -05:00
|
|
|
|
2017-04-30 00:07:00 -04:00
|
|
|
use Friendica\App;
|
2017-11-06 21:22:52 -05:00
|
|
|
use Friendica\Core\Config;
|
2018-01-21 13:33:59 -05:00
|
|
|
use Friendica\Core\L10n;
|
2018-10-29 17:20:46 -04:00
|
|
|
use Friendica\Core\Logger;
|
2018-08-11 16:40:44 -04:00
|
|
|
use Friendica\Core\Protocol;
|
2017-08-26 02:04:21 -04:00
|
|
|
use Friendica\Core\System;
|
2018-07-20 08:19:26 -04:00
|
|
|
use Friendica\Database\DBA;
|
2017-12-07 09:04:24 -05:00
|
|
|
use Friendica\Model\Contact;
|
2017-12-09 13:45:17 -05:00
|
|
|
use Friendica\Model\Group;
|
|
|
|
use Friendica\Model\User;
|
2017-05-07 14:44:30 -04:00
|
|
|
use Friendica\Network\Probe;
|
2017-11-07 19:37:53 -05:00
|
|
|
use Friendica\Protocol\Diaspora;
|
2018-09-15 14:54:45 -04:00
|
|
|
use Friendica\Protocol\ActivityPub;
|
2017-12-30 11:51:49 -05:00
|
|
|
use Friendica\Util\Crypto;
|
2018-01-26 21:38:34 -05:00
|
|
|
use Friendica\Util\DateTimeFormat;
|
2018-01-26 23:24:23 -05:00
|
|
|
use Friendica\Util\Network;
|
2018-11-08 08:45:46 -05:00
|
|
|
use Friendica\Util\Strings;
|
2018-01-27 11:13:41 -05:00
|
|
|
use Friendica\Util\XML;
|
2017-04-30 00:07:00 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
function dfrn_confirm_post(App $a, $handsfree = null)
|
|
|
|
{
|
|
|
|
$node = null;
|
|
|
|
if (is_array($handsfree)) {
|
2016-11-28 10:23:47 -05:00
|
|
|
/*
|
2010-12-08 18:30:26 -05:00
|
|
|
* We were called directly from dfrn_request due to automatic friend acceptance.
|
|
|
|
* Any $_POST parameters we may require are supplied in the $handsfree array.
|
|
|
|
*
|
|
|
|
*/
|
2010-10-17 23:04:17 -04:00
|
|
|
$node = $handsfree['node'];
|
|
|
|
$a->interactive = false; // notice() becomes a no-op since nobody is there to see it
|
2018-01-12 23:23:51 -05:00
|
|
|
} elseif ($a->argc > 1) {
|
|
|
|
$node = $a->argv[1];
|
2010-10-17 23:04:17 -04:00
|
|
|
}
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
/*
|
|
|
|
* Main entry point. Scenario 1. Our user received a friend request notification (perhaps
|
|
|
|
* from another site) and clicked 'Approve'.
|
|
|
|
* $POST['source_url'] is not set. If it is, it indicates Scenario 2.
|
|
|
|
*
|
|
|
|
* We may also have been called directly from dfrn_request ($handsfree != null) due to
|
|
|
|
* this being a page type which supports automatic friend acceptance. That is also Scenario 1
|
|
|
|
* since we are operating on behalf of our registered user to approve a friendship.
|
|
|
|
*/
|
2018-11-30 09:06:22 -05:00
|
|
|
if (empty($_POST['source_url'])) {
|
2018-01-12 23:23:51 -05:00
|
|
|
$uid = defaults($handsfree, 'uid', local_user());
|
|
|
|
if (!$uid) {
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t('Permission denied.') . EOL);
|
2010-07-01 19:48:07 -04:00
|
|
|
return;
|
2014-03-11 18:52:32 -04:00
|
|
|
}
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2018-07-20 08:19:26 -04:00
|
|
|
$user = DBA::selectFirst('user', [], ['uid' => $uid]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($user)) {
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t('Profile not found.') . EOL);
|
2010-10-17 23:04:17 -04:00
|
|
|
return;
|
2014-03-11 18:52:32 -04:00
|
|
|
}
|
2010-10-17 23:04:17 -04:00
|
|
|
|
2010-12-08 18:30:26 -05:00
|
|
|
// These data elements may come from either the friend request notification form or $handsfree array.
|
2018-01-12 23:23:51 -05:00
|
|
|
if (is_array($handsfree)) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Confirm in handsfree mode');
|
2018-01-12 23:23:51 -05:00
|
|
|
$dfrn_id = $handsfree['dfrn_id'];
|
|
|
|
$intro_id = $handsfree['intro_id'];
|
|
|
|
$duplex = $handsfree['duplex'];
|
|
|
|
$cid = 0;
|
|
|
|
$hidden = intval(defaults($handsfree, 'hidden' , 0));
|
|
|
|
} else {
|
2018-11-09 13:29:42 -05:00
|
|
|
$dfrn_id = Strings::escapeTags(trim(defaults($_POST, 'dfrn_id' , '')));
|
2018-01-12 23:23:51 -05:00
|
|
|
$intro_id = intval(defaults($_POST, 'intro_id' , 0));
|
|
|
|
$duplex = intval(defaults($_POST, 'duplex' , 0));
|
|
|
|
$cid = intval(defaults($_POST, 'contact_id', 0));
|
|
|
|
$hidden = intval(defaults($_POST, 'hidden' , 0));
|
2010-10-17 23:04:17 -04:00
|
|
|
}
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2016-11-28 10:23:47 -05:00
|
|
|
/*
|
2010-12-08 18:30:26 -05:00
|
|
|
* Ensure that dfrn_id has precedence when we go to find the contact record.
|
2014-09-06 11:28:46 -04:00
|
|
|
* We only want to search based on contact id if there is no dfrn_id,
|
2010-12-08 18:30:26 -05:00
|
|
|
* e.g. for OStatus network followers.
|
|
|
|
*/
|
2018-01-12 23:23:51 -05:00
|
|
|
if (strlen($dfrn_id)) {
|
2010-12-08 18:30:26 -05:00
|
|
|
$cid = 0;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2010-12-08 18:30:26 -05:00
|
|
|
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Confirming request for dfrn_id (issued) ' . $dfrn_id);
|
2018-01-12 23:23:51 -05:00
|
|
|
if ($cid) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Confirming follower with contact_id: ' . $cid);
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2010-11-18 23:58:46 -05:00
|
|
|
|
2016-11-28 10:23:47 -05:00
|
|
|
/*
|
2010-12-08 18:30:26 -05:00
|
|
|
* The other person will have been issued an ID when they first requested friendship.
|
2014-09-06 11:28:46 -04:00
|
|
|
* Locate their record. At this time, their record will have both pending and blocked set to 1.
|
2010-12-08 18:30:26 -05:00
|
|
|
* There won't be any dfrn_id if this is a network follower, so use the contact_id instead.
|
|
|
|
*/
|
2018-01-12 23:23:51 -05:00
|
|
|
$r = q("SELECT *
|
|
|
|
FROM `contact`
|
|
|
|
WHERE (
|
|
|
|
(`issued-id` != '' AND `issued-id` = '%s')
|
|
|
|
OR
|
|
|
|
(`id` = %d AND `id` != 0)
|
|
|
|
)
|
|
|
|
AND `uid` = %d
|
|
|
|
AND `duplex` = 0
|
|
|
|
LIMIT 1",
|
2018-07-21 09:10:13 -04:00
|
|
|
DBA::escape($dfrn_id),
|
2010-12-08 18:30:26 -05:00
|
|
|
intval($cid),
|
|
|
|
intval($uid)
|
2010-10-10 19:16:29 -04:00
|
|
|
);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($r)) {
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Contact not found in DB.');
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t('Contact not found.') . EOL);
|
|
|
|
notice(L10n::t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL);
|
2010-07-01 19:48:07 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-10-24 23:39:24 -04:00
|
|
|
$contact = $r[0];
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2010-10-24 23:39:24 -04:00
|
|
|
$contact_id = $contact['id'];
|
|
|
|
$relation = $contact['rel'];
|
|
|
|
$site_pubkey = $contact['site-pubkey'];
|
|
|
|
$dfrn_confirm = $contact['confirm'];
|
|
|
|
$aes_allow = $contact['aes_allow'];
|
2014-09-06 11:28:46 -04:00
|
|
|
|
2019-04-30 14:07:20 -04:00
|
|
|
// an empty DFRN-ID tells us that it had been a request via AP from a Friendica contact
|
2019-05-05 07:53:17 -04:00
|
|
|
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'];
|
2019-04-30 14:07:20 -04:00
|
|
|
}
|
|
|
|
|
2019-05-05 07:53:17 -04:00
|
|
|
if ($protocol === Protocol::DFRN) {
|
2016-11-28 10:23:47 -05:00
|
|
|
/*
|
2010-12-08 18:30:26 -05:00
|
|
|
* 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.
|
2014-09-06 11:28:46 -04:00
|
|
|
* 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.
|
2010-12-08 18:30:26 -05:00
|
|
|
*/
|
2017-12-30 11:51:49 -05:00
|
|
|
$res = Crypto::newKeypair(4096);
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2012-05-20 21:30:02 -04:00
|
|
|
$private_key = $res['prvkey'];
|
|
|
|
$public_key = $res['pubkey'];
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2010-10-24 23:39:24 -04:00
|
|
|
// Save the private key. Send them the public key.
|
2019-05-05 07:19:30 -04:00
|
|
|
$fields = ['prvkey' => $private_key, 'protocol' => Protocol::DFRN];
|
|
|
|
DBA::update('contact', $fields, ['id' => $contact_id]);
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
$params = [];
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2016-11-28 10:23:47 -05:00
|
|
|
/*
|
2014-09-06 11:28:46 -04:00
|
|
|
* Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our
|
2010-12-08 18:30:26 -05:00
|
|
|
* 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
|
2014-09-06 11:28:46 -04:00
|
|
|
* item, it indicates tampering or key failure on at least one site and we will not be
|
2010-12-08 18:30:26 -05:00
|
|
|
* able to provide a secure communication pathway.
|
|
|
|
*
|
2014-09-06 11:28:46 -04:00
|
|
|
* 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.
|
2010-12-08 18:30:26 -05:00
|
|
|
*/
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2017-04-01 04:28:42 -04:00
|
|
|
$src_aes_key = openssl_random_pseudo_bytes(64);
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2010-10-24 23:39:24 -04:00
|
|
|
$result = '';
|
2018-01-12 23:23:51 -05:00
|
|
|
openssl_private_encrypt($dfrn_id, $result, $user['prvkey']);
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2010-10-24 23:39:24 -04:00
|
|
|
$params['dfrn_id'] = bin2hex($result);
|
|
|
|
$params['public_key'] = $public_key;
|
2010-10-10 19:16:29 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
$my_url = System::baseUrl() . '/profile/' . $user['nickname'];
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2010-10-24 23:39:24 -04:00
|
|
|
openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey);
|
|
|
|
$params['source_url'] = bin2hex($params['source_url']);
|
2010-09-08 23:14:17 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if ($aes_allow && function_exists('openssl_encrypt')) {
|
2010-10-24 23:39:24 -04:00
|
|
|
openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey);
|
|
|
|
$params['aes_key'] = bin2hex($params['aes_key']);
|
2018-01-12 23:23:51 -05:00
|
|
|
$params['public_key'] = bin2hex(openssl_encrypt($public_key, 'AES-256-CBC', $src_aes_key));
|
2010-10-24 23:39:24 -04:00
|
|
|
}
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
$params['dfrn_version'] = DFRN_PROTOCOL_VERSION;
|
|
|
|
if ($duplex == 1) {
|
2010-10-24 23:39:24 -04:00
|
|
|
$params['duplex'] = 1;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2019-01-06 12:37:48 -05:00
|
|
|
if ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) {
|
2012-03-15 19:38:26 -04:00
|
|
|
$params['page'] = 1;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
|
|
|
|
2019-01-06 12:37:48 -05:00
|
|
|
if ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP) {
|
2012-05-30 01:57:15 -04:00
|
|
|
$params['page'] = 2;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2012-03-15 19:38:26 -04:00
|
|
|
|
2018-10-30 09:58:45 -04:00
|
|
|
Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), Logger::DATA);
|
2010-11-18 23:58:46 -05:00
|
|
|
|
2016-11-28 10:23:47 -05:00
|
|
|
/*
|
2010-12-09 17:29:38 -05:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2018-10-10 15:15:26 -04:00
|
|
|
$res = Network::post($dfrn_confirm, $params, null, $redirects, 120)->getBody();
|
2010-10-05 22:56:09 -04:00
|
|
|
|
2018-10-30 09:58:45 -04:00
|
|
|
Logger::log(' Confirm: received data: ' . $res, Logger::DATA);
|
2010-11-18 23:58:46 -05:00
|
|
|
|
2014-09-06 11:28:46 -04:00
|
|
|
// Now figure out what they responded. Try to be robust if the remote site is
|
|
|
|
// having difficulty and throwing up errors of some kind.
|
2010-10-05 22:56:09 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
$leading_junk = substr($res, 0, strpos($res, '<?xml'));
|
2010-10-05 22:56:09 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
$res = substr($res, strpos($res, '<?xml'));
|
|
|
|
if (!strlen($res)) {
|
|
|
|
// No XML at all, this exchange is messed up really bad.
|
|
|
|
// We shouldn't proceed, because the xml parser might choke,
|
|
|
|
// and $status is going to be zero, which indicates success.
|
|
|
|
// We can hardly call this a success.
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t('Response from remote site was not understood.') . EOL);
|
2010-10-24 23:39:24 -04:00
|
|
|
return;
|
|
|
|
}
|
2010-10-05 22:56:09 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if (strlen($leading_junk) && Config::get('system', 'debugging')) {
|
|
|
|
// This might be more common. Mixed error text and some XML.
|
|
|
|
// If we're configured for debugging, show the text. Proceed in either case.
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL);
|
2010-10-24 23:39:24 -04:00
|
|
|
}
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if (stristr($res, "<status") === false) {
|
2014-09-06 11:28:46 -04:00
|
|
|
// wrong xml! stop here!
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('Unexpected response posting to ' . $dfrn_confirm);
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
|
2014-09-06 11:28:46 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-01-27 11:13:41 -05:00
|
|
|
$xml = XML::parseString($res);
|
2010-10-24 23:39:24 -04:00
|
|
|
$status = (int) $xml->status;
|
2018-11-05 07:40:18 -05:00
|
|
|
$message = XML::unescape($xml->message); // human readable text of what may have gone wrong.
|
2018-01-12 23:23:51 -05:00
|
|
|
switch ($status) {
|
2010-10-24 23:39:24 -04:00
|
|
|
case 0:
|
2018-01-22 16:59:31 -05:00
|
|
|
info(L10n::t("Confirmation completed successfully.") . EOL);
|
2010-10-24 23:39:24 -04:00
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
// birthday paradox - generate new dfrn-id and fall through.
|
2018-11-08 08:45:46 -05:00
|
|
|
$new_dfrn_id = Strings::getRandomHex();
|
2018-01-12 23:23:51 -05:00
|
|
|
q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d",
|
2018-07-21 09:10:13 -04:00
|
|
|
DBA::escape($new_dfrn_id),
|
2010-10-24 23:39:24 -04:00
|
|
|
intval($contact_id),
|
2014-09-06 11:28:46 -04:00
|
|
|
intval($uid)
|
2010-10-24 23:39:24 -04:00
|
|
|
);
|
|
|
|
|
|
|
|
case 2:
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t("Temporary failure. Please wait and try again.") . EOL);
|
2010-10-24 23:39:24 -04:00
|
|
|
break;
|
|
|
|
case 3:
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t("Introduction failed or was revoked.") . EOL);
|
2010-10-24 23:39:24 -04:00
|
|
|
break;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2010-10-24 23:39:24 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if (strlen($message)) {
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t('Remote site reported: ') . $message . EOL);
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2014-03-11 18:52:32 -04:00
|
|
|
|
2018-05-02 15:26:15 -04:00
|
|
|
if (($status == 0) && $intro_id) {
|
2018-07-20 08:19:26 -04:00
|
|
|
$intro = DBA::selectFirst('intro', ['note'], ['id' => $intro_id]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($intro)) {
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]);
|
2018-05-19 11:29:34 -04:00
|
|
|
}
|
|
|
|
|
2010-10-24 23:39:24 -04:00
|
|
|
// Success. Delete the notification.
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::delete('intro', ['id' => $intro_id]);
|
2010-10-05 22:56:09 -04:00
|
|
|
}
|
2010-07-01 19:48:07 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if ($status != 0) {
|
2010-10-24 23:39:24 -04:00
|
|
|
return;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2019-05-05 07:19:30 -04:00
|
|
|
} else {
|
2019-05-05 07:53:17 -04:00
|
|
|
DBA::update('contact', ['protocol' => $protocol], ['id' => $contact_id]);
|
2010-07-01 19:48:07 -04:00
|
|
|
}
|
2010-10-05 22:56:09 -04:00
|
|
|
|
2010-12-08 18:30:26 -05:00
|
|
|
/*
|
|
|
|
* We have now established a relationship with the other site.
|
|
|
|
* Let's make our own personal copy of their profile photo so we don't have
|
|
|
|
* to always load it from their site.
|
|
|
|
*
|
|
|
|
* We will also update the contact record with the nature and scope of the relationship.
|
|
|
|
*/
|
2017-11-29 17:29:11 -05:00
|
|
|
Contact::updateAvatar($contact['photo'], $uid, $contact_id);
|
2014-09-06 11:28:46 -04:00
|
|
|
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('dfrn_confirm: confirm - imported photos');
|
2010-09-08 23:14:17 -04:00
|
|
|
|
2019-05-05 07:53:17 -04:00
|
|
|
if ($protocol === Protocol::DFRN) {
|
2018-07-24 22:53:46 -04:00
|
|
|
$new_relation = Contact::FOLLOWER;
|
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
|
|
|
|
2018-07-24 22:53:46 -04:00
|
|
|
if (($relation == Contact::SHARING) || ($duplex)) {
|
|
|
|
$new_relation = Contact::FRIEND;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2010-10-24 23:39:24 -04:00
|
|
|
|
2018-07-24 22:53:46 -04:00
|
|
|
if (($relation == Contact::SHARING) && ($duplex)) {
|
2010-11-09 20:53:20 -05:00
|
|
|
$duplex = 0;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2010-11-09 20:53:20 -05:00
|
|
|
|
2016-01-28 05:09:08 -05:00
|
|
|
$r = q("UPDATE `contact` SET `rel` = %d,
|
2014-03-11 18:52:32 -04:00
|
|
|
`name-date` = '%s',
|
|
|
|
`uri-date` = '%s',
|
|
|
|
`blocked` = 0,
|
2010-10-24 23:39:24 -04:00
|
|
|
`pending` = 0,
|
|
|
|
`duplex` = %d,
|
2011-12-29 03:23:05 -05:00
|
|
|
`hidden` = %d,
|
2015-04-11 16:14:56 -04:00
|
|
|
`network` = '%s' WHERE `id` = %d
|
2010-10-24 23:39:24 -04:00
|
|
|
",
|
|
|
|
intval($new_relation),
|
2018-07-21 09:10:13 -04:00
|
|
|
DBA::escape(DateTimeFormat::utcNow()),
|
|
|
|
DBA::escape(DateTimeFormat::utcNow()),
|
2010-10-24 23:39:24 -04:00
|
|
|
intval($duplex),
|
2011-12-29 03:23:05 -05:00
|
|
|
intval($hidden),
|
2018-08-11 16:40:44 -04:00
|
|
|
DBA::escape(Protocol::DFRN),
|
2010-10-24 23:39:24 -04:00
|
|
|
intval($contact_id)
|
|
|
|
);
|
2017-09-12 02:08:24 -04:00
|
|
|
} else {
|
2019-05-05 07:53:17 -04:00
|
|
|
if ($protocol == Protocol::ACTIVITYPUB) {
|
2018-10-03 11:41:51 -04:00
|
|
|
ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid);
|
2019-01-12 08:28:14 -05:00
|
|
|
// 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;
|
2018-09-15 14:54:45 -04:00
|
|
|
} else {
|
|
|
|
$pending = false;
|
|
|
|
}
|
|
|
|
|
2019-05-05 07:53:17 -04:00
|
|
|
$arr = Probe::uri($contact['url'], $protocol);
|
2018-01-12 23:23:51 -05:00
|
|
|
|
|
|
|
$notify = defaults($contact, 'notify' , $arr['notify']);
|
|
|
|
$poll = defaults($contact, 'poll' , $arr['poll']);
|
2010-10-24 23:39:24 -04:00
|
|
|
|
2017-09-12 02:08:24 -04:00
|
|
|
$addr = $arr['addr'];
|
|
|
|
|
2011-08-15 21:17:19 -04:00
|
|
|
$new_relation = $contact['rel'];
|
2011-08-19 00:31:34 -04:00
|
|
|
$writable = $contact['writable'];
|
|
|
|
|
2019-05-05 07:53:17 -04:00
|
|
|
if (in_array($protocol, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
|
2018-01-12 23:23:51 -05:00
|
|
|
if ($duplex) {
|
2018-07-24 22:53:46 -04:00
|
|
|
$new_relation = Contact::FRIEND;
|
2018-01-12 23:23:51 -05:00
|
|
|
} else {
|
2018-07-24 22:53:46 -04:00
|
|
|
$new_relation = Contact::FOLLOWER;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2012-01-30 23:49:54 -05:00
|
|
|
|
2018-07-24 22:53:46 -04:00
|
|
|
if ($new_relation != Contact::FOLLOWER) {
|
2011-08-19 00:31:34 -04:00
|
|
|
$writable = 1;
|
2018-01-12 23:23:51 -05:00
|
|
|
}
|
2011-08-19 00:31:34 -04:00
|
|
|
}
|
2011-08-15 21:17:19 -04:00
|
|
|
|
2018-07-20 08:19:26 -04:00
|
|
|
DBA::delete('intro', ['id' => $intro_id]);
|
2010-10-24 23:39:24 -04:00
|
|
|
|
2018-09-15 14:54:45 -04:00
|
|
|
$fields = ['name-date' => DateTimeFormat::utcNow(),
|
|
|
|
'uri-date' => DateTimeFormat::utcNow(), 'addr' => $addr,
|
|
|
|
'notify' => $notify, 'poll' => $poll, 'blocked' => false,
|
2019-05-05 07:53:17 -04:00
|
|
|
'pending' => $pending, 'protocol' => $protocol,
|
2018-09-15 14:54:45 -04:00
|
|
|
'writable' => $writable, 'hidden' => $hidden, 'rel' => $new_relation];
|
|
|
|
DBA::update('contact', $fields, ['id' => $contact_id]);
|
2010-10-24 23:39:24 -04:00
|
|
|
}
|
|
|
|
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($r)) {
|
2018-01-21 13:33:59 -05:00
|
|
|
notice(L10n::t('Unable to set contact photo.') . EOL);
|
2016-12-20 09:37:27 -05:00
|
|
|
}
|
2010-07-26 23:45:54 -04:00
|
|
|
|
2010-12-22 20:25:04 -05:00
|
|
|
// reload contact info
|
2018-07-20 08:19:26 -04:00
|
|
|
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
|
2019-05-05 07:53:17 -04:00
|
|
|
if (isset($new_relation) && ($new_relation == Contact::FRIEND)) {
|
2018-08-11 16:40:44 -04:00
|
|
|
if (DBA::isResult($contact) && ($contact['network'] === Protocol::DIASPORA)) {
|
2018-01-12 23:23:51 -05:00
|
|
|
$ret = Diaspora::sendShare($user, $contact);
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('share returns: ' . $ret);
|
2011-08-15 21:17:19 -04:00
|
|
|
}
|
2010-12-22 20:25:04 -05:00
|
|
|
}
|
2012-05-18 04:03:46 -04:00
|
|
|
|
2017-12-09 13:45:17 -05:00
|
|
|
Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']);
|
2012-05-18 04:03:46 -04:00
|
|
|
|
2019-05-05 07:53:17 -04:00
|
|
|
if (($protocol == Protocol::ACTIVITYPUB) && $duplex) {
|
2018-10-03 11:41:51 -04:00
|
|
|
ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
|
2018-09-15 18:25:58 -04:00
|
|
|
}
|
|
|
|
|
2010-10-10 21:25:34 -04:00
|
|
|
// Let's send our user to the contact editor in case they want to
|
|
|
|
// do anything special with this new friend.
|
2016-12-20 11:43:46 -05:00
|
|
|
if ($handsfree === null) {
|
2018-10-19 14:11:27 -04:00
|
|
|
$a->internalRedirect('contact/' . intval($contact_id));
|
2016-12-20 11:43:46 -05:00
|
|
|
} else {
|
2014-03-11 18:52:32 -04:00
|
|
|
return;
|
2016-12-20 11:43:46 -05:00
|
|
|
}
|
2010-12-08 18:30:26 -05:00
|
|
|
//NOTREACHED
|
2010-07-01 19:48:07 -04:00
|
|
|
}
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2016-11-28 10:23:47 -05:00
|
|
|
/*
|
2010-12-08 18:30:26 -05:00
|
|
|
* End of Scenario 1. [Local confirmation of remote friend request].
|
|
|
|
*
|
|
|
|
* Begin Scenario 2. This is the remote response to the above scenario.
|
|
|
|
* This will take place on the site that originally initiated the friend request.
|
2014-09-06 11:28:46 -04:00
|
|
|
* In the section above where the confirming party makes a POST and
|
2010-12-08 18:30:26 -05:00
|
|
|
* retrieves xml status information, they are communicating with the following code.
|
|
|
|
*/
|
2018-11-30 09:06:22 -05:00
|
|
|
if (!empty($_POST['source_url'])) {
|
2010-10-10 21:25:34 -04:00
|
|
|
// We are processing an external confirmation to an introduction created by our user.
|
2018-01-12 23:23:51 -05:00
|
|
|
$public_key = defaults($_POST, 'public_key', '');
|
|
|
|
$dfrn_id = hex2bin(defaults($_POST, 'dfrn_id' , ''));
|
|
|
|
$source_url = hex2bin(defaults($_POST, 'source_url', ''));
|
|
|
|
$aes_key = defaults($_POST, 'aes_key' , '');
|
|
|
|
$duplex = intval(defaults($_POST, 'duplex' , 0));
|
|
|
|
$page = intval(defaults($_POST, 'page' , 0));
|
2014-03-11 18:52:32 -04:00
|
|
|
|
2012-05-30 01:57:15 -04:00
|
|
|
$forum = (($page == 1) ? 1 : 0);
|
|
|
|
$prv = (($page == 2) ? 1 : 0);
|
|
|
|
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('dfrn_confirm: requestee contacted: ' . $node);
|
2010-10-11 07:01:24 -04:00
|
|
|
|
2018-10-30 09:58:45 -04:00
|
|
|
Logger::log('dfrn_confirm: request: POST=' . print_r($_POST, true), Logger::DATA);
|
2010-11-18 23:58:46 -05:00
|
|
|
|
2010-10-11 07:01:24 -04:00
|
|
|
// If $aes_key is set, both of these items require unpacking from the hex transport encoding.
|
|
|
|
|
2018-11-30 09:06:22 -05:00
|
|
|
if (!empty($aes_key)) {
|
2010-10-11 07:01:24 -04:00
|
|
|
$aes_key = hex2bin($aes_key);
|
|
|
|
$public_key = hex2bin($public_key);
|
|
|
|
}
|
|
|
|
|
2010-10-10 21:25:34 -04:00
|
|
|
// Find our user's account
|
2018-07-20 08:19:26 -04:00
|
|
|
$user = DBA::selectFirst('user', [], ['nickname' => $node]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($user)) {
|
2018-01-21 13:33:59 -05:00
|
|
|
$message = L10n::t('No user record found for \'%s\' ', $node);
|
2018-01-27 11:59:10 -05:00
|
|
|
System::xmlExit(3, $message); // failure
|
2010-10-10 21:25:34 -04:00
|
|
|
// NOTREACHED
|
|
|
|
}
|
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
$my_prvkey = $user['prvkey'];
|
|
|
|
$local_uid = $user['uid'];
|
2010-10-10 21:25:34 -04:00
|
|
|
|
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if (!strstr($my_prvkey, 'PRIVATE KEY')) {
|
2018-01-21 13:33:59 -05:00
|
|
|
$message = L10n::t('Our site encryption key is apparently messed up.');
|
2018-01-27 11:59:10 -05:00
|
|
|
System::xmlExit(3, $message);
|
2010-10-10 21:25:34 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// verify everything
|
|
|
|
|
|
|
|
$decrypted_source_url = "";
|
2018-01-12 23:23:51 -05:00
|
|
|
openssl_private_decrypt($source_url, $decrypted_source_url, $my_prvkey);
|
2010-10-10 21:25:34 -04:00
|
|
|
|
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if (!strlen($decrypted_source_url)) {
|
2018-01-21 13:33:59 -05:00
|
|
|
$message = L10n::t('Empty site URL was provided or URL could not be decrypted by us.');
|
2018-01-27 11:59:10 -05:00
|
|
|
System::xmlExit(3, $message);
|
2010-10-10 21:25:34 -04:00
|
|
|
// NOTREACHED
|
|
|
|
}
|
|
|
|
|
2018-07-20 08:19:26 -04:00
|
|
|
$contact = DBA::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($contact)) {
|
2018-01-12 23:23:51 -05:00
|
|
|
if (strstr($decrypted_source_url, 'http:')) {
|
|
|
|
$newurl = str_replace('http:', 'https:', $decrypted_source_url);
|
2017-01-25 09:59:27 -05:00
|
|
|
} else {
|
2018-01-12 23:23:51 -05:00
|
|
|
$newurl = str_replace('https:', 'http:', $decrypted_source_url);
|
2017-01-25 09:59:27 -05:00
|
|
|
}
|
2011-08-12 05:58:29 -04:00
|
|
|
|
2018-07-20 08:19:26 -04:00
|
|
|
$contact = DBA::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($contact)) {
|
2011-08-12 05:58:29 -04:00
|
|
|
// this is either a bogus confirmation (?) or we deleted the original introduction.
|
2018-01-21 13:33:59 -05:00
|
|
|
$message = L10n::t('Contact record was not found for you on our site.');
|
2018-01-27 11:59:10 -05:00
|
|
|
System::xmlExit(3, $message);
|
2014-09-06 11:28:46 -04:00
|
|
|
return; // NOTREACHED
|
2011-08-12 05:58:29 -04:00
|
|
|
}
|
2010-10-10 21:25:34 -04:00
|
|
|
}
|
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
$relation = $contact['rel'];
|
2010-10-10 21:25:34 -04:00
|
|
|
|
|
|
|
// Decrypt all this stuff we just received
|
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
$foreign_pubkey = $contact['site-pubkey'];
|
|
|
|
$dfrn_record = $contact['id'];
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if (!$foreign_pubkey) {
|
2018-01-21 13:33:59 -05:00
|
|
|
$message = L10n::t('Site public key not available in contact record for URL %s.', $decrypted_source_url);
|
2018-01-27 11:59:10 -05:00
|
|
|
System::xmlExit(3, $message);
|
2011-09-07 05:23:17 -04:00
|
|
|
}
|
|
|
|
|
2010-10-10 21:25:34 -04:00
|
|
|
$decrypted_dfrn_id = "";
|
2018-01-12 23:23:51 -05:00
|
|
|
openssl_public_decrypt($dfrn_id, $decrypted_dfrn_id, $foreign_pubkey);
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2017-01-25 09:59:27 -05:00
|
|
|
if (strlen($aes_key)) {
|
2010-10-10 21:25:34 -04:00
|
|
|
$decrypted_aes_key = "";
|
2018-01-12 23:23:51 -05:00
|
|
|
openssl_private_decrypt($aes_key, $decrypted_aes_key, $my_prvkey);
|
|
|
|
$dfrn_pubkey = openssl_decrypt($public_key, 'AES-256-CBC', $decrypted_aes_key);
|
|
|
|
} else {
|
2010-10-10 21:25:34 -04:00
|
|
|
$dfrn_pubkey = $public_key;
|
|
|
|
}
|
|
|
|
|
2018-07-20 08:19:26 -04:00
|
|
|
if (DBA::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
|
2018-01-21 13:33:59 -05:00
|
|
|
$message = L10n::t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
|
2018-01-27 11:59:10 -05:00
|
|
|
System::xmlExit(1, $message); // Birthday paradox - duplicate dfrn-id
|
2010-10-10 21:25:34 -04:00
|
|
|
// NOTREACHED
|
|
|
|
}
|
|
|
|
|
2014-03-11 18:52:32 -04:00
|
|
|
$r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d",
|
2018-07-21 09:10:13 -04:00
|
|
|
DBA::escape($decrypted_dfrn_id),
|
|
|
|
DBA::escape($dfrn_pubkey),
|
2010-10-10 21:25:34 -04:00
|
|
|
intval($dfrn_record)
|
|
|
|
);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($r)) {
|
2018-01-21 13:33:59 -05:00
|
|
|
$message = L10n::t('Unable to set your contact credentials on our system.');
|
2018-01-27 11:59:10 -05:00
|
|
|
System::xmlExit(3, $message);
|
2010-10-10 21:25:34 -04:00
|
|
|
}
|
|
|
|
|
2012-02-28 20:32:44 -05:00
|
|
|
// It's possible that the other person also requested friendship.
|
2014-03-11 18:52:32 -04:00
|
|
|
// If it is a duplex relationship, ditch the issued-id if one exists.
|
2012-02-28 20:32:44 -05:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if ($duplex) {
|
|
|
|
q("UPDATE `contact` SET `issued-id` = '' WHERE `id` = %d",
|
2012-02-28 20:32:44 -05:00
|
|
|
intval($dfrn_record)
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2010-10-10 21:25:34 -04:00
|
|
|
// We're good but now we have to scrape the profile photo and send notifications.
|
2018-07-20 08:19:26 -04:00
|
|
|
$contact = DBA::selectFirst('contact', ['photo'], ['id' => $dfrn_record]);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($contact)) {
|
2018-01-12 23:23:51 -05:00
|
|
|
$photo = $contact['photo'];
|
2016-12-20 04:35:28 -05:00
|
|
|
} else {
|
2018-10-23 09:16:58 -04:00
|
|
|
$photo = System::baseUrl() . '/images/person-300.jpg';
|
2016-12-20 04:35:28 -05:00
|
|
|
}
|
2014-03-11 18:52:32 -04:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
Contact::updateAvatar($photo, $local_uid, $dfrn_record);
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('dfrn_confirm: request - photos imported');
|
2010-11-18 23:58:46 -05:00
|
|
|
|
2018-07-24 22:53:46 -04:00
|
|
|
$new_relation = Contact::SHARING;
|
Cleanups: isResult() more used, readability improved (#5608)
* [diaspora]: Maybe SimpleXMLElement is the right type-hint?
* Changes proposed + pre-renaming:
- pre-renamed $db -> $connection
- added TODOs for not allowing bad method invocations (there is a
BadMethodCallException in SPL)
* If no record is found, below $r[0] will fail with a E_NOTICE and the code
doesn't behave as expected.
* Ops, one more left ...
* Continued:
- added documentation for Contact::updateSslPolicy() method
- added type-hint for $contact of same method
- empty lines added + TODO where the bug origins that $item has no element 'body'
* Added empty lines for better readability
* Cleaned up:
- no more x() (deprecated) usage but empty() instead
- fixed mixing of space/tab indending
- merged else/if block goether in elseif() (lesser nested code blocks)
* Re-fixed DBM -> DBA switch
* Fixes/rewrites:
- use empty()/isset() instead of deprecated x()
- merged 2 nested if() blocks into one
- avoided nested if() block inside else block by rewriting it to elseif()
- $contact_id is an integer, let's test on > 0 here
- added a lot spaces and some empty lines for better readability
* Rewrite:
- moved all CONTACT_* constants from boot.php to Contact class
* CR request:
- renamed Contact::CONTACT_IS_* -> Contact::* ;-)
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class
- fixed mixure with "Contact::* rewrite"
* Ops, one still there (return is no function)
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
will do this for us
- renamed those proxy_*() functions to better names:
+ proxy_init() -> Proxy::init() (public)
+ proxy_url() -> Proxy::proxifyUrl() (public)
+ proxy_parse_html() -> Proxy::proxifyHtml() (public)
+ proxy_is_local_image() -> Proxy::isLocalImage() (private)
+ proxy_parse_query() -> Proxy::parseQuery() (private)
+ proxy_img_cb() -> Proxy::replaceUrl() (private)
* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes
* Ops, need to set $a here ...
* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule
* Ops, no need for own instance of $a when self::getApp() is around.
* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module
* No instances from utility classes
* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`
* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.
* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.
* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...
* Ops, was added accidentally ...
* Ops, why these wrong moves?
* Ops, one to much (thanks to MrPetovan)
* Ops, wrong moving ...
* moved back to original place ...
* spaces added
* empty lines add for better readability.
* convertered spaces -> tab for code indenting.
* CR request: Add space between if and brace.
* CR requests fixed + move reverted
- ops, src/Module/*.php has been moved to src/Network/ accidentally
- reverted some parts in src/Database/DBA.php as pointed out by Annando
- removed internal TODO items
- added some spaces for better readability
2018-08-24 01:05:49 -04:00
|
|
|
|
2018-07-24 22:53:46 -04:00
|
|
|
if (($relation == Contact::FOLLOWER) || ($duplex)) {
|
|
|
|
$new_relation = Contact::FRIEND;
|
2016-12-20 04:35:28 -05:00
|
|
|
}
|
2010-10-10 21:25:34 -04:00
|
|
|
|
2018-07-24 22:53:46 -04:00
|
|
|
if (($relation == Contact::FOLLOWER) && ($duplex)) {
|
2010-11-09 20:53:20 -05:00
|
|
|
$duplex = 0;
|
2016-12-20 04:35:28 -05:00
|
|
|
}
|
2010-11-09 20:53:20 -05:00
|
|
|
|
2014-03-11 18:52:32 -04:00
|
|
|
$r = q("UPDATE `contact` SET
|
|
|
|
`rel` = %d,
|
|
|
|
`name-date` = '%s',
|
|
|
|
`uri-date` = '%s',
|
|
|
|
`blocked` = 0,
|
2010-10-10 21:25:34 -04:00
|
|
|
`pending` = 0,
|
2014-03-11 18:52:32 -04:00
|
|
|
`duplex` = %d,
|
2012-03-15 19:38:26 -04:00
|
|
|
`forum` = %d,
|
2012-05-30 01:57:15 -04:00
|
|
|
`prv` = %d,
|
2014-03-11 18:52:32 -04:00
|
|
|
`network` = '%s' WHERE `id` = %d
|
2010-10-10 21:25:34 -04:00
|
|
|
",
|
|
|
|
intval($new_relation),
|
2018-07-21 09:10:13 -04:00
|
|
|
DBA::escape(DateTimeFormat::utcNow()),
|
|
|
|
DBA::escape(DateTimeFormat::utcNow()),
|
2010-10-10 21:25:34 -04:00
|
|
|
intval($duplex),
|
2012-05-30 01:57:15 -04:00
|
|
|
intval($forum),
|
|
|
|
intval($prv),
|
2018-08-11 16:40:44 -04:00
|
|
|
DBA::escape(Protocol::DFRN),
|
2010-10-10 21:25:34 -04:00
|
|
|
intval($dfrn_record)
|
|
|
|
);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (!DBA::isResult($r)) { // indicates schema is messed up or total db failure
|
2018-01-21 13:33:59 -05:00
|
|
|
$message = L10n::t('Unable to update your contact profile details on our system');
|
2018-01-27 11:59:10 -05:00
|
|
|
System::xmlExit(3, $message);
|
2010-10-10 21:25:34 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// Otherwise everything seems to have worked and we are almost done. Yay!
|
|
|
|
// Send an email notification
|
|
|
|
|
2018-10-29 17:20:46 -04:00
|
|
|
Logger::log('dfrn_confirm: request: info updated');
|
2010-11-19 00:14:16 -05:00
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
$combined = null;
|
|
|
|
$r = q("SELECT `contact`.*, `user`.*
|
|
|
|
FROM `contact`
|
|
|
|
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
|
|
|
WHERE `contact`.`id` = %d
|
|
|
|
LIMIT 1",
|
2010-10-10 21:25:34 -04:00
|
|
|
intval($dfrn_record)
|
|
|
|
);
|
2018-07-21 08:46:04 -04:00
|
|
|
if (DBA::isResult($r)) {
|
2012-04-30 22:01:41 -04:00
|
|
|
$combined = $r[0];
|
|
|
|
|
2018-01-12 23:23:51 -05:00
|
|
|
if ($combined['notify-flags'] & NOTIFY_CONFIRM) {
|
2018-07-24 22:53:46 -04:00
|
|
|
$mutual = ($new_relation == Contact::FRIEND);
|
2018-01-12 23:23:51 -05:00
|
|
|
notification([
|
|
|
|
'type' => NOTIFY_CONFIRM,
|
|
|
|
'notify_flags' => $combined['notify-flags'],
|
|
|
|
'language' => $combined['language'],
|
|
|
|
'to_name' => $combined['username'],
|
|
|
|
'to_email' => $combined['email'],
|
|
|
|
'uid' => $combined['uid'],
|
2018-10-13 07:29:56 -04:00
|
|
|
'link' => System::baseUrl() . '/contact/' . $dfrn_record,
|
2018-01-21 13:33:59 -05:00
|
|
|
'source_name' => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : L10n::t('[Name Withheld]')),
|
2018-01-12 23:23:51 -05:00
|
|
|
'source_link' => $combined['url'],
|
|
|
|
'source_photo' => $combined['photo'],
|
|
|
|
'verb' => ($mutual?ACTIVITY_FRIEND:ACTIVITY_FOLLOW),
|
|
|
|
'otype' => 'intro'
|
|
|
|
]);
|
|
|
|
}
|
2010-10-10 21:25:34 -04:00
|
|
|
}
|
2012-04-30 22:01:41 -04:00
|
|
|
|
2018-01-27 11:59:10 -05:00
|
|
|
System::xmlExit(0); // Success
|
2010-10-10 21:25:34 -04:00
|
|
|
return; // NOTREACHED
|
2018-01-12 23:23:51 -05:00
|
|
|
////////////////////// End of this scenario ///////////////////////////////////////////////
|
2010-10-10 21:25:34 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// somebody arrived here by mistake or they are fishing. Send them to the homepage.
|
2018-10-19 14:11:27 -04:00
|
|
|
$a->internalRedirect();
|
2010-10-10 21:25:34 -04:00
|
|
|
// NOTREACHED
|
2010-07-01 19:48:07 -04:00
|
|
|
}
|