X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=6f365c5315bf99aa3a35deaa08ea40fe1ca7bf7c;hb=5a802bc474abca945240f6a9a2730213e88b30af;hp=0bcf137857ab5a2ca6f3e8614e4327dfd4e7451a;hpb=c41332364f2f8f2a55db8d318d8f96a22ce85f73;p=friendica.git diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 0bcf137857..6f365c5315 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -20,19 +20,20 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\L10n; -use Friendica\Core\PConfig; +use Friendica\Core\Logger; +use Friendica\Core\Protocol; use Friendica\Core\System; -use Friendica\Core\Worker; -use Friendica\Database\DBM; +use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Group; -use Friendica\Model\Item; 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; +use Friendica\Util\Strings; use Friendica\Util\XML; require_once 'include/enotify.php'; @@ -62,29 +63,29 @@ function dfrn_confirm_post(App $a, $handsfree = null) * 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. */ - if (!x($_POST, 'source_url')) { + if (empty($_POST['source_url'])) { $uid = defaults($handsfree, 'uid', local_user()); if (!$uid) { notice(L10n::t('Permission denied.') . EOL); return; } - $user = dba::selectFirst('user', [], ['uid' => $uid]); - if (!DBM::is_result($user)) { + $user = DBA::selectFirst('user', [], ['uid' => $uid]); + if (!DBA::isResult($user)) { notice(L10n::t('Profile not found.') . EOL); return; } // These data elements may come from either the friend request notification form or $handsfree array. if (is_array($handsfree)) { - logger('Confirm in handsfree mode'); + Logger::log('Confirm in handsfree mode'); $dfrn_id = $handsfree['dfrn_id']; $intro_id = $handsfree['intro_id']; $duplex = $handsfree['duplex']; $cid = 0; $hidden = intval(defaults($handsfree, 'hidden' , 0)); } else { - $dfrn_id = notags(trim(defaults($_POST, 'dfrn_id' , ''))); + $dfrn_id = Strings::escapeTags(trim(defaults($_POST, 'dfrn_id' , ''))); $intro_id = intval(defaults($_POST, 'intro_id' , 0)); $duplex = intval(defaults($_POST, 'duplex' , 0)); $cid = intval(defaults($_POST, 'contact_id', 0)); @@ -100,9 +101,9 @@ function dfrn_confirm_post(App $a, $handsfree = null) $cid = 0; } - logger('Confirming request for dfrn_id (issued) ' . $dfrn_id); + Logger::log('Confirming request for dfrn_id (issued) ' . $dfrn_id); if ($cid) { - logger('Confirming follower with contact_id: ' . $cid); + Logger::log('Confirming follower with contact_id: ' . $cid); } /* @@ -120,12 +121,12 @@ function dfrn_confirm_post(App $a, $handsfree = null) AND `uid` = %d AND `duplex` = 0 LIMIT 1", - dbesc($dfrn_id), + DBA::escape($dfrn_id), intval($cid), intval($uid) ); - if (!DBM::is_result($r)) { - logger('Contact not found in DB.'); + if (!DBA::isResult($r)) { + Logger::log('Contact not found in DB.'); 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); return; @@ -139,13 +140,13 @@ function dfrn_confirm_post(App $a, $handsfree = null) $dfrn_confirm = $contact['confirm']; $aes_allow = $contact['aes_allow']; - $network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS); + $network = ((strlen($contact['issued-id'])) ? Protocol::DFRN : Protocol::OSTATUS); if ($contact['network']) { $network = $contact['network']; } - if ($network === NETWORK_DFRN) { + if ($network === 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. @@ -160,7 +161,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) // Save the private key. Send them the public key. q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d", - dbesc($private_key), + DBA::escape($private_key), intval($contact_id), intval($uid) ); @@ -204,15 +205,15 @@ function dfrn_confirm_post(App $a, $handsfree = null) $params['duplex'] = 1; } - if ($user['page-flags'] == PAGE_COMMUNITY) { + if ($user['page-flags'] == Contact::PAGE_COMMUNITY) { $params['page'] = 1; } - if ($user['page-flags'] == PAGE_PRVGROUP) { + if ($user['page-flags'] == Contact::PAGE_PRVGROUP) { $params['page'] = 2; } - logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), LOGGER_DATA); + Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), Logger::DATA); /* * @@ -222,9 +223,9 @@ function dfrn_confirm_post(App $a, $handsfree = null) * */ - $res = Network::post($dfrn_confirm, $params, null, $redirects, 120); + $res = Network::post($dfrn_confirm, $params, null, $redirects, 120)->getBody(); - logger(' Confirm: received data: ' . $res, LOGGER_DATA); + 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. @@ -249,22 +250,23 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (stristr($res, "status; - $message = unxmlify($xml->message); // human readable text of what may have gone wrong. + $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 = random_string(); + $new_dfrn_id = Strings::getRandomHex(); q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d", - dbesc($new_dfrn_id), + DBA::escape($new_dfrn_id), intval($contact_id), intval($uid) ); @@ -282,13 +284,13 @@ function dfrn_confirm_post(App $a, $handsfree = null) } if (($status == 0) && $intro_id) { - $intro = dba::selectFirst('intro', ['note'], ['id' => $intro_id]); - if (DBM::is_result($intro)) { - dba::update('contact', ['reason' => $intro['note']], ['id' => $contact_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]); + DBA::delete('intro', ['id' => $intro_id]); } if ($status != 0) { @@ -305,15 +307,16 @@ function dfrn_confirm_post(App $a, $handsfree = null) */ Contact::updateAvatar($contact['photo'], $uid, $contact_id); - logger('dfrn_confirm: confirm - imported photos'); + Logger::log('dfrn_confirm: confirm - imported photos'); - if ($network === NETWORK_DFRN) { - $new_relation = CONTACT_IS_FOLLOWER; - if (($relation == CONTACT_IS_SHARING) || ($duplex)) { - $new_relation = CONTACT_IS_FRIEND; + if ($network === Protocol::DFRN) { + $new_relation = Contact::FOLLOWER; + + if (($relation == Contact::SHARING) || ($duplex)) { + $new_relation = Contact::FRIEND; } - if (($relation == CONTACT_IS_SHARING) && ($duplex)) { + if (($relation == Contact::SHARING) && ($duplex)) { $duplex = 0; } @@ -327,18 +330,25 @@ function dfrn_confirm_post(App $a, $handsfree = null) `network` = '%s' WHERE `id` = %d ", intval($new_relation), - dbesc(DateTimeFormat::utcNow()), - dbesc(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), intval($duplex), intval($hidden), - dbesc(NETWORK_DFRN), + DBA::escape(Protocol::DFRN), intval($contact_id) ); } else { - // $network !== NETWORK_DFRN - $network = defaults($contact, 'network', NETWORK_OSTATUS); + if ($network == Protocol::ACTIVITYPUB) { + ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid); + $pending = true; + } else { + $pending = false; + } + + // $network !== Protocol::DFRN + $network = defaults($contact, 'network', Protocol::OSTATUS); - $arr = Probe::uri($contact['url']); + $arr = Probe::uri($contact['url'], $network); $notify = defaults($contact, 'notify' , $arr['notify']); $poll = defaults($contact, 'poll' , $arr['poll']); @@ -348,65 +358,51 @@ function dfrn_confirm_post(App $a, $handsfree = null) $new_relation = $contact['rel']; $writable = $contact['writable']; - if ($network === NETWORK_DIASPORA) { + if (in_array($network, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { if ($duplex) { - $new_relation = CONTACT_IS_FRIEND; + $new_relation = Contact::FRIEND; } else { - $new_relation = CONTACT_IS_FOLLOWER; + $new_relation = Contact::FOLLOWER; } - if ($new_relation != CONTACT_IS_FOLLOWER) { + if ($new_relation != Contact::FOLLOWER) { $writable = 1; } } - dba::delete('intro', ['id' => $intro_id]); + DBA::delete('intro', ['id' => $intro_id]); - $r = q("UPDATE `contact` SET `name-date` = '%s', - `uri-date` = '%s', - `addr` = '%s', - `notify` = '%s', - `poll` = '%s', - `blocked` = 0, - `pending` = 0, - `network` = '%s', - `writable` = %d, - `hidden` = %d, - `rel` = %d - WHERE `id` = %d - ", - dbesc(DateTimeFormat::utcNow()), - dbesc(DateTimeFormat::utcNow()), - dbesc($addr), - dbesc($notify), - dbesc($poll), - dbesc($network), - intval($writable), - intval($hidden), - intval($new_relation), - intval($contact_id) - ); + $fields = ['name-date' => DateTimeFormat::utcNow(), + 'uri-date' => DateTimeFormat::utcNow(), 'addr' => $addr, + 'notify' => $notify, 'poll' => $poll, 'blocked' => false, + 'pending' => $pending, 'network' => $network, + 'writable' => $writable, 'hidden' => $hidden, 'rel' => $new_relation]; + DBA::update('contact', $fields, ['id' => $contact_id]); } - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { notice(L10n::t('Unable to set contact photo.') . EOL); } // reload contact info - $contact = dba::selectFirst('contact', [], ['id' => $contact_id]); - if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) { - if (DBM::is_result($contact) && ($contact['network'] === NETWORK_DIASPORA)) { + $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('share returns: ' . $ret); + Logger::log('share returns: ' . $ret); } } Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']); + if ($network == 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) { - goaway(System::baseUrl() . '/contacts/' . intval($contact_id)); + $a->internalRedirect('contact/' . intval($contact_id)); } else { return; } @@ -421,7 +417,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) * In the section above where the confirming party makes a POST and * retrieves xml status information, they are communicating with the following code. */ - if (x($_POST, 'source_url')) { + if (!empty($_POST['source_url'])) { // We are processing an external confirmation to an introduction created by our user. $public_key = defaults($_POST, 'public_key', ''); $dfrn_id = hex2bin(defaults($_POST, 'dfrn_id' , '')); @@ -433,20 +429,20 @@ function dfrn_confirm_post(App $a, $handsfree = null) $forum = (($page == 1) ? 1 : 0); $prv = (($page == 2) ? 1 : 0); - logger('dfrn_confirm: requestee contacted: ' . $node); + Logger::log('dfrn_confirm: requestee contacted: ' . $node); - logger('dfrn_confirm: request: POST=' . print_r($_POST, true), LOGGER_DATA); + Logger::log('dfrn_confirm: request: POST=' . print_r($_POST, true), Logger::DATA); // If $aes_key is set, both of these items require unpacking from the hex transport encoding. - if (x($aes_key)) { + if (!empty($aes_key)) { $aes_key = hex2bin($aes_key); $public_key = hex2bin($public_key); } // Find our user's account - $user = dba::selectFirst('user', [], ['nickname' => $node]); - if (!DBM::is_result($user)) { + $user = DBA::selectFirst('user', [], ['nickname' => $node]); + if (!DBA::isResult($user)) { $message = L10n::t('No user record found for \'%s\' ', $node); System::xmlExit(3, $message); // failure // NOTREACHED @@ -473,16 +469,16 @@ function dfrn_confirm_post(App $a, $handsfree = null) // NOTREACHED } - $contact = dba::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]); - if (!DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]); + if (!DBA::isResult($contact)) { if (strstr($decrypted_source_url, 'http:')) { $newurl = str_replace('http:', 'https:', $decrypted_source_url); } else { $newurl = str_replace('https:', 'http:', $decrypted_source_url); } - $contact = dba::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]); - if (!DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]); + if (!DBA::isResult($contact)) { // this is either a bogus confirmation (?) or we deleted the original introduction. $message = L10n::t('Contact record was not found for you on our site.'); System::xmlExit(3, $message); @@ -513,18 +509,18 @@ function dfrn_confirm_post(App $a, $handsfree = null) $dfrn_pubkey = $public_key; } - if (dba::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) { + if (DBA::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) { $message = L10n::t('The ID provided by your system is a duplicate on our system. It should work if you try again.'); System::xmlExit(1, $message); // Birthday paradox - duplicate dfrn-id // NOTREACHED } $r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d", - dbesc($decrypted_dfrn_id), - dbesc($dfrn_pubkey), + DBA::escape($decrypted_dfrn_id), + DBA::escape($dfrn_pubkey), intval($dfrn_record) ); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { $message = L10n::t('Unable to set your contact credentials on our system.'); System::xmlExit(3, $message); } @@ -539,23 +535,24 @@ function dfrn_confirm_post(App $a, $handsfree = null) } // We're good but now we have to scrape the profile photo and send notifications. - $contact = dba::selectFirst('contact', ['photo'], ['id' => $dfrn_record]); - if (DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', ['photo'], ['id' => $dfrn_record]); + if (DBA::isResult($contact)) { $photo = $contact['photo']; } else { - $photo = System::baseUrl() . '/images/person-175.jpg'; + $photo = System::baseUrl() . '/images/person-300.jpg'; } Contact::updateAvatar($photo, $local_uid, $dfrn_record); - logger('dfrn_confirm: request - photos imported'); + Logger::log('dfrn_confirm: request - photos imported'); + + $new_relation = Contact::SHARING; - $new_relation = CONTACT_IS_SHARING; - if (($relation == CONTACT_IS_FOLLOWER) || ($duplex)) { - $new_relation = CONTACT_IS_FRIEND; + if (($relation == Contact::FOLLOWER) || ($duplex)) { + $new_relation = Contact::FRIEND; } - if (($relation == CONTACT_IS_FOLLOWER) && ($duplex)) { + if (($relation == Contact::FOLLOWER) && ($duplex)) { $duplex = 0; } @@ -571,15 +568,15 @@ function dfrn_confirm_post(App $a, $handsfree = null) `network` = '%s' WHERE `id` = %d ", intval($new_relation), - dbesc(DateTimeFormat::utcNow()), - dbesc(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape(DateTimeFormat::utcNow()), intval($duplex), intval($forum), intval($prv), - dbesc(NETWORK_DFRN), + DBA::escape(Protocol::DFRN), intval($dfrn_record) ); - if (!DBM::is_result($r)) { // indicates schema is messed up or total db failure + if (!DBA::isResult($r)) { // indicates schema is messed up or total db failure $message = L10n::t('Unable to update your contact profile details on our system'); System::xmlExit(3, $message); } @@ -587,7 +584,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) // Otherwise everything seems to have worked and we are almost done. Yay! // Send an email notification - logger('dfrn_confirm: request: info updated'); + Logger::log('dfrn_confirm: request: info updated'); $combined = null; $r = q("SELECT `contact`.*, `user`.* @@ -597,11 +594,11 @@ function dfrn_confirm_post(App $a, $handsfree = null) LIMIT 1", intval($dfrn_record) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { $combined = $r[0]; if ($combined['notify-flags'] & NOTIFY_CONFIRM) { - $mutual = ($new_relation == CONTACT_IS_FRIEND); + $mutual = ($new_relation == Contact::FRIEND); notification([ 'type' => NOTIFY_CONFIRM, 'notify_flags' => $combined['notify-flags'], @@ -609,7 +606,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) 'to_name' => $combined['username'], 'to_email' => $combined['email'], 'uid' => $combined['uid'], - 'link' => System::baseUrl() . '/contacts/' . $dfrn_record, + 'link' => System::baseUrl() . '/contact/' . $dfrn_record, 'source_name' => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : L10n::t('[Name Withheld]')), 'source_link' => $combined['url'], 'source_photo' => $combined['photo'], @@ -625,6 +622,6 @@ function dfrn_confirm_post(App $a, $handsfree = null) } // somebody arrived here by mistake or they are fishing. Send them to the homepage. - goaway(System::baseUrl()); + $a->internalRedirect(); // NOTREACHED }