X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=302cb370ea4af5aaa700176d6439779e4a106d41;hb=b6000b3395167283fddee3fe9286f99c73f629d1;hp=48ce3c6aa65684bfe6b47e7ba1794e8709327fb6;hpb=bfa05156ca5096fe9db8ca4a66ca32ef4cbf0ca5;p=friendica.git diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 48ce3c6aa6..302cb370ea 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -20,6 +20,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\L10n; +use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Database\DBA; @@ -32,11 +33,9 @@ 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'; -require_once 'include/items.php'; - function dfrn_confirm_post(App $a, $handsfree = null) { $node = null; @@ -61,7 +60,7 @@ 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); @@ -76,14 +75,14 @@ function dfrn_confirm_post(App $a, $handsfree = null) // 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)); @@ -99,9 +98,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); } /* @@ -124,7 +123,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) intval($uid) ); if (!DBA::isResult($r)) { - logger('Contact not found in DB.'); + 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; @@ -144,6 +143,11 @@ function dfrn_confirm_post(App $a, $handsfree = null) $network = $contact['network']; } + // an empty DFRN-ID tells us that it had been a request via AP from a Friendica contact + if (($network === Protocol::DFRN) && empty($dfrn_id)) { + $network = Contact::getProtocol($contact['url'], $contact['network']); + } + if ($network === Protocol::DFRN) { /* * Generate a key pair for all further communications with this person. @@ -158,11 +162,8 @@ function dfrn_confirm_post(App $a, $handsfree = null) $public_key = $res['pubkey']; // Save the private key. Send them the public key. - q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d", - DBA::escape($private_key), - intval($contact_id), - intval($uid) - ); + $fields = ['prvkey' => $private_key, 'protocol' => Protocol::DFRN]; + DBA::update('contact', $fields, ['id' => $contact_id]); $params = []; @@ -203,15 +204,15 @@ function dfrn_confirm_post(App $a, $handsfree = null) $params['duplex'] = 1; } - if ($user['page-flags'] == Contact::PAGE_COMMUNITY) { + if ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) { $params['page'] = 1; } - if ($user['page-flags'] == Contact::PAGE_PRVGROUP) { + if ($user['page-flags'] == User::PAGE_FLAGS_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); /* * @@ -223,7 +224,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $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. @@ -248,21 +249,21 @@ 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", DBA::escape($new_dfrn_id), intval($contact_id), @@ -294,6 +295,8 @@ function dfrn_confirm_post(App $a, $handsfree = null) if ($status != 0) { return; } + } else { + DBA::update('contact', ['protocol' => $network], ['id' => $contact_id]); } /* @@ -305,7 +308,7 @@ 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 === Protocol::DFRN) { $new_relation = Contact::FOLLOWER; @@ -338,7 +341,12 @@ function dfrn_confirm_post(App $a, $handsfree = null) } else { if ($network == Protocol::ACTIVITYPUB) { ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $uid); - $pending = true; + // 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; } @@ -387,7 +395,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) 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); } } @@ -400,7 +408,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) // 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() . '/contact/' . intval($contact_id)); + $a->internalRedirect('contact/' . intval($contact_id)); } else { return; } @@ -415,7 +423,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' , '')); @@ -427,13 +435,13 @@ 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); } @@ -537,12 +545,12 @@ function dfrn_confirm_post(App $a, $handsfree = null) 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; @@ -582,7 +590,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`.* @@ -620,6 +628,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 }