MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4223 from MrPetovan/task/fix-scrutinizer-issues

Browse source 
[Scrutinizer] Fix formatting in dfrn_confirm and a few other files
This commit is contained in:
Michael Vogel 2018-01-14 16:20:23 +01:00 committed by GitHub
commit 4000e81f1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 358 additions and 479 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
include/dba.php
View file

@ -852,24 +852,24 @@ class dba {
/** /**
* @brief Delete a row from a table * @brief Delete a row from a table
* *
* @param string $table Table name * @param string $table Table name
* @param array $param parameter array * @param array $conditions Field condition(s)
* @param boolean $in_process Internal use: Only do a commit after the last delete * @param boolean $in_process Internal use: Only do a commit after the last delete
* @param array $callstack Internal use: prevent endless loops * @param array $callstack Internal use: prevent endless loops
* *
* @return boolean|array was the delete successfull? When $in_process is set: deletion data * @return boolean|array was the delete successful? When $in_process is set: deletion data
*/ */
public static function delete($table, $param, $in_process = false, &$callstack = array()) { public static function delete($table, array $conditions, $in_process = false, array &$callstack = [])
{
if (empty($table) || empty($param)) { if (empty($table) || empty($conditions)) {
logger('Table and condition have to be set'); logger('Table and conditions have to be set');
return false; return false;
} }
$commands = array(); $commands = [];
// Create a key for the loop prevention // Create a key for the loop prevention
$key = $table.':'.implode(':', array_keys($param)).':'.implode(':', $param); $key = $table . ':' . implode(':', array_keys($conditions)) . ':' . implode(':', $conditions);
// We quit when this key already exists in the callstack. // We quit when this key already exists in the callstack.
if (isset($callstack[$key])) { if (isset($callstack[$key])) {
@ -880,7 +880,7 @@ class dba {
$table = self::escape($table); $table = self::escape($table);
$commands[$key] = array('table' => $table, 'param' => $param); $commands[$key] = ['table' => $table, 'conditions' => $conditions];
// To speed up the whole process we cache the table relations // To speed up the whole process we cache the table relations
if (count(self::$relation) == 0) { if (count(self::$relation) == 0) {
@ -894,24 +894,24 @@ class dba {
$rel_def = array_values(self::$relation[$table])[0]; $rel_def = array_values(self::$relation[$table])[0];
// Create a key for preventing double queries // Create a key for preventing double queries
$qkey = $field.'-'.$table.':'.implode(':', array_keys($param)).':'.implode(':', $param); $qkey = $field . '-' . $table . ':' . implode(':', array_keys($conditions)) . ':' . implode(':', $conditions);
// When the search field is the relation field, we don't need to fetch the rows // When the search field is the relation field, we don't need to fetch the rows
// This is useful when the leading record is already deleted in the frontend but the rest is done in the backend // This is useful when the leading record is already deleted in the frontend but the rest is done in the backend
if ((count($param) == 1) && ($field == array_keys($param)[0])) { if ((count($conditions) == 1) && ($field == array_keys($conditions)[0])) {
foreach ($rel_def AS $rel_table => $rel_fields) { foreach ($rel_def AS $rel_table => $rel_fields) {
foreach ($rel_fields AS $rel_field) { foreach ($rel_fields AS $rel_field) {
$retval = self::delete($rel_table, array($rel_field => array_values($param)[0]), true, $callstack); $retval = self::delete($rel_table, array($rel_field => array_values($conditions)[0]), true, $callstack);
$commands = array_merge($commands, $retval); $commands = array_merge($commands, $retval);
} }
} }
// We quit when this key already exists in the callstack. // We quit when this key already exists in the callstack.
} elseif (!isset($callstack[$qkey])) { } elseif (!isset($callstack[$qkey])) {
$callstack[$qkey] = true; $callstack[$qkey] = true;
// Fetch all rows that are to be deleted // Fetch all rows that are to be deleted
$data = self::select($table, array($field), $param); $data = self::select($table, array($field), $conditions);
while ($row = self::fetch($data)) { while ($row = self::fetch($data)) {
// Now we accumulate the delete commands // Now we accumulate the delete commands
@ -934,24 +934,24 @@ class dba {
self::transaction(); self::transaction();
} }
$compacted = array(); $compacted = [];
$counter = array(); $counter = [];
foreach ($commands AS $command) { foreach ($commands AS $command) {
$condition = $command['param']; $conditions = $command['conditions'];
$array_element = each($condition); $array_element = each($conditions);
$array_key = $array_element['key']; $array_key = $array_element['key'];
if (is_int($array_key)) { if (is_int($array_key)) {
$condition_string = " WHERE ".array_shift($condition); $condition_string = " WHERE " . array_shift($conditions);
} else { } else {
$condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?"; $condition_string = " WHERE `" . implode("` = ? AND `", array_keys($conditions)) . "` = ?";
} }
if ((count($command['param']) > 1) || is_int($array_key)) { if ((count($command['conditions']) > 1) || is_int($array_key)) {
$sql = "DELETE FROM `".$command['table']."`".$condition_string; $sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string;
logger(self::replace_parameters($sql, $condition), LOGGER_DATA); logger(self::replace_parameters($sql, $conditions), LOGGER_DATA);
if (!self::e($sql, $condition)) { if (!self::e($sql, $conditions)) {
if ($do_transaction) { if ($do_transaction) {
self::rollback(); self::rollback();
} }
@ -959,25 +959,25 @@ class dba {
} }
} else { } else {
$key_table = $command['table']; $key_table = $command['table'];
$key_param = array_keys($command['param'])[0]; $key_condition = array_keys($command['conditions'])[0];
$value = array_values($command['param'])[0]; $value = array_values($command['conditions'])[0];
// Split the SQL queries in chunks of 100 values // Split the SQL queries in chunks of 100 values
// We do the $i stuff here to make the code better readable // We do the $i stuff here to make the code better readable
$i = $counter[$key_table][$key_param]; $i = $counter[$key_table][$key_condition];
if (count($compacted[$key_table][$key_param][$i]) > 100) { if (count($compacted[$key_table][$key_condition][$i]) > 100) {
++$i; ++$i;
} }
$compacted[$key_table][$key_param][$i][$value] = $value; $compacted[$key_table][$key_condition][$i][$value] = $value;
$counter[$key_table][$key_param] = $i; $counter[$key_table][$key_condition] = $i;
} }
} }
foreach ($compacted AS $table => $values) { foreach ($compacted AS $table => $values) {
foreach ($values AS $field => $field_value_list) { foreach ($values AS $field => $field_value_list) {
foreach ($field_value_list AS $field_values) { foreach ($field_value_list AS $field_values) {
$sql = "DELETE FROM `".$table."` WHERE `".$field."` IN (". $sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" .
substr(str_repeat("?, ", count($field_values)), 0, -2).");"; substr(str_repeat("?, ", count($field_values)), 0, -2) . ");";
logger(self::replace_parameters($sql, $field_values), LOGGER_DATA); logger(self::replace_parameters($sql, $field_values), LOGGER_DATA);

5
include/text.php
View file

@ -1041,7 +1041,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
* @param string $url Search url. * @param string $url Search url.
* @param bool $save Show save search button. * @param bool $save Show save search button.
* @param bool $aside Display the search widgit aside. * @param bool $aside Display the search widgit aside.
* *
* @return string Formatted HTML. * @return string Formatted HTML.
*/ */
function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true) function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true)
@ -2106,7 +2106,8 @@ function text_highlight($s, $lang) {
} }
$renderer = new Text_Highlighter_Renderer_Html($options); $renderer = new Text_Highlighter_Renderer_Html($options);
$hl = Text_Highlighter::factory($lang); $factory = new Text_Highlighter();
$hl = $factory->factory($lang);
$hl->setRenderer($renderer); $hl->setRenderer($renderer);
$o = $hl->highlight($s); $o = $hl->highlight($s);
$o = str_replace("\n", '', $o); $o = str_replace("\n", '', $o);

17
mod/contacts.php
View file

@ -1,7 +1,9 @@
<?php <?php
/** /**
* @file mod/contacts.php * @file mod/contacts.php
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Content\ContactSelector; use Friendica\Content\ContactSelector;
use Friendica\Core\System; use Friendica\Core\System;
@ -30,6 +32,7 @@ function contacts_init(App $a)
$a->page['aside'] = ''; $a->page['aside'] = '';
} }
$contact_id = null;
$contact = null; $contact = null;
if ((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) { if ((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) {
$contact_id = intval($a->argv[1]); $contact_id = intval($a->argv[1]);
@ -164,11 +167,7 @@ function contacts_post(App $a)
return; return;
} }
$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", if (!dba::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
intval($contact_id),
intval(local_user())
);
if (!DBM::is_result($orig_record)) {
notice(t('Could not access contact record.') . EOL); notice(t('Could not access contact record.') . EOL);
goaway('contacts'); goaway('contacts');
return; // NOTREACHED return; // NOTREACHED
@ -178,11 +177,7 @@ function contacts_post(App $a)
$profile_id = intval($_POST['profile-assign']); $profile_id = intval($_POST['profile-assign']);
if ($profile_id) { if ($profile_id) {
$r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", if (!dba::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
intval($profile_id),
intval(local_user())
);
if (!DBM::is_result($r)) {
notice(t('Could not locate selected profile.') . EOL); notice(t('Could not locate selected profile.') . EOL);
return; return;
} }
@ -229,6 +224,7 @@ function contacts_post(App $a)
return; return;
} }
/* contact actions */ /* contact actions */
function _contact_update($contact_id) function _contact_update($contact_id)
@ -764,7 +760,6 @@ function contacts_content(App $a)
$total = 0; $total = 0;
$searching = false; $searching = false;
$search_hdr = null; $search_hdr = null;
$search_txt = '';
if ($search) { if ($search) {
$searching = true; $searching = true;
$search_hdr = $search; $search_hdr = $search;

16
mod/credits.php
View file

@ -5,19 +5,17 @@
* (only contributors to the git repositories for friendica core and the * (only contributors to the git repositories for friendica core and the
* addons repository will be listed though ATM) * addons repository will be listed though ATM)
*/ */
use Friendica\App; use Friendica\App;
function credits_content(App $a) { function credits_content()
{
/* fill the page with credits */ /* fill the page with credits */
$f = fopen('util/credits.txt', 'r'); $credits_string = file_get_contents('util/credits.txt');
$names = fread($f, filesize('util/credits.txt')); $names = explode("\n", htmlspecialchars($credits_string));
$arr = explode("\n", htmlspecialchars($names));
fclose($f);
$tpl = get_markup_template('credits.tpl'); $tpl = get_markup_template('credits.tpl');
return replace_macros($tpl, array( return replace_macros($tpl, [
'$title' => t('Credits'), '$title' => t('Credits'),
'$thanks' => t('Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!'), '$thanks' => t('Friendica is a community project, that would not be possible without the help of many people. Here is a list of those who have contributed to the code or the translation of Friendica. Thank you all!'),
'$names' => $arr, '$names' => $names,
)); ]);
} }

37
mod/crepair.php
View file

@ -16,26 +16,17 @@ function crepair_init(App $a)
return; return;
} }
$contact_id = 0; $contact = null;
if (($a->argc == 2) && intval($a->argv[1])) { if (($a->argc == 2) && intval($a->argv[1])) {
$contact_id = intval($a->argv[1]); $contact = dba::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
intval(local_user()),
intval($contact_id)
);
if (!DBM::is_result($r)) {
$contact_id = 0;
}
} }
if (!x($a->page, 'aside')) { if (!x($a->page, 'aside')) {
$a->page['aside'] = ''; $a->page['aside'] = '';
} }
if ($contact_id) { if (DBM::is_result($contact)) {
$a->data['contact'] = $r[0]; $a->data['contact'] = $contact;
$contact = $r[0];
profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"])); profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
} }
} }
@ -48,19 +39,15 @@ function crepair_post(App $a)
$cid = (($a->argc > 1) ? intval($a->argv[1]) : 0); $cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
$contact = null;
if ($cid) { if ($cid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
intval($cid),
intval(local_user())
);
} }
if (!DBM::is_result($r)) { if (!DBM::is_result($contact)) {
return; return;
} }
$contact = $r[0];
$name = defaults($_POST, 'name' , $contact['name']); $name = defaults($_POST, 'name' , $contact['name']);
$nick = defaults($_POST, 'nick' , ''); $nick = defaults($_POST, 'nick' , '');
$url = defaults($_POST, 'url' , ''); $url = defaults($_POST, 'url' , '');
@ -113,20 +100,16 @@ function crepair_content(App $a)
$cid = (($a->argc > 1) ? intval($a->argv[1]) : 0); $cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
$contact = null;
if ($cid) { if ($cid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
intval($cid),
intval(local_user())
);
} }
if (!DBM::is_result($r)) { if (!DBM::is_result($contact)) {
notice(t('Contact not found.') . EOL); notice(t('Contact not found.') . EOL);
return; return;
} }
$contact = $r[0];
$warning = t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.'); $warning = t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
$info = t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.'); $info = t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');

126
mod/delegate.php
View file

@ -4,130 +4,118 @@ use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
require_once('mod/settings.php'); require_once 'mod/settings.php';
function delegate_init(App $a) { function delegate_init(App $a)
{
return settings_init($a); return settings_init($a);
} }
function delegate_content(App $a) { function delegate_content(App $a)
{
if (! local_user()) { if (!local_user()) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
} }
if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) { if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
// delegated admins can view but not change delegation permissions // delegated admins can view but not change delegation permissions
if (x($_SESSION, 'submanage')) {
if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
goaway(System::baseUrl() . '/delegate'); goaway(System::baseUrl() . '/delegate');
} }
$id = $a->argv[2]; $user_id = $a->argv[2];
$r = q("select `nickname` from user where uid = %d limit 1", $user = dba::selectFirst('user', ['nickname'], ['uid' => $user_id]);
intval($id) if (DBM::is_result($user)) {
); $condition = [
if (DBM::is_result($r)) { 'uid' => local_user(),
$r = q("select id from contact where uid = %d and nurl = '%s' limit 1", 'nurl' => normalise_link(System::baseUrl() . '/profile/' . $user['nickname'])
intval(local_user()), ];
dbesc(normalise_link(System::baseUrl() . '/profile/' . $r[0]['nickname'])) if (dba::exists('contact', $condition)) {
); dba::insert('manage', ['uid' => $user_id, 'mid' => local_user()]);
if (DBM::is_result($r)) {
dba::insert('manage', array('uid' => $a->argv[2], 'mid' => local_user()));
} }
} }
goaway(System::baseUrl() . '/delegate'); goaway(System::baseUrl() . '/delegate');
} }
if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) { if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
// delegated admins can view but not change delegation permissions // delegated admins can view but not change delegation permissions
if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) { if (x($_SESSION, 'submanage')) {
goaway(System::baseUrl() . '/delegate'); goaway(System::baseUrl() . '/delegate');
} }
q("DELETE FROM `manage` WHERE `uid` = %d AND `mid` = %d LIMIT 1", dba::delete('manage', ['uid' => $a->argv[2], 'mid' => local_user()]);
intval($a->argv[2]),
intval(local_user())
);
goaway(System::baseUrl() . '/delegate'); goaway(System::baseUrl() . '/delegate');
} }
$full_managers = array();
// These people can manage this account/page with full privilege // These people can manage this account/page with full privilege
$full_managers = [];
$r = q("SELECT * FROM `user` WHERE `email` = '%s' AND `password` = '%s' ", $r = q("SELECT * FROM `user` WHERE `email` = '%s' AND `password` = '%s' ",
dbesc($a->user['email']), dbesc($a->user['email']),
dbesc($a->user['password']) dbesc($a->user['password'])
); );
if (DBM::is_result($r)) if (DBM::is_result($r)) {
$full_managers = $r; $full_managers = $r;
}
$delegates = array();
// find everybody that currently has delegated management to this account/page // find everybody that currently has delegated management to this account/page
$delegates = [];
$r = q("select * from user where uid in ( select uid from manage where mid = %d ) ", $r = q("SELECT * FROM `user` WHERE `uid` IN (SELECT `uid` FROM `manage` WHERE `mid` = %d)",
intval(local_user()) intval(local_user())
); );
if (DBM::is_result($r)) {
if (DBM::is_result($r))
$delegates = $r; $delegates = $r;
}
$uids = array(); $uids = [];
foreach ($full_managers as $rr) {
$uids[] = $rr['uid'];
}
if(count($full_managers)) foreach ($delegates as $rr) {
foreach($full_managers as $rr) $uids[] = $rr['uid'];
$uids[] = $rr['uid']; }
if(count($delegates))
foreach($delegates as $rr)
$uids[] = $rr['uid'];
// find every contact who might be a candidate for delegation // find every contact who might be a candidate for delegation
$r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s' $r = q("SELECT `nurl`
and contact.uid = %d and contact.self = 0 and network = '%s' ", FROM `contact`
WHERE `self` = 0
AND SUBSTRING_INDEX(`nurl`, '/', 3) = '%s'
AND `uid` = %d
AND `network` = '%s' ",
dbesc(normalise_link(System::baseUrl())), dbesc(normalise_link(System::baseUrl())),
intval(local_user()), intval(local_user()),
dbesc(NETWORK_DFRN) dbesc(NETWORK_DFRN)
); );
if (!DBM::is_result($r)) {
if (! DBM::is_result($r)) { notice(t('No potential page delegates located.') . EOL);
notice( t('No potential page delegates located.') . EOL);
return; return;
} }
$nicknames = array(); $nicknames = [];
foreach ($r as $rr) {
$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
}
$potentials = [];
$nicks = implode(',', $nicknames);
// get user records for all potential page delegates who are not already delegates or managers
$r = q("SELECT `uid`, `username`, `nickname` FROM `user` WHERE `nickname` IN ($nicks)");
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'"; if (!in_array($rr['uid'], $uids)) {
$potentials[] = $rr;
}
} }
} }
$potentials = array();
$nicks = implode(',',$nicknames);
// get user records for all potential page delegates who are not already delegates or managers
$r = q("select `uid`, `username`, `nickname` from user where nickname in ( $nicks )");
if (DBM::is_result($r))
foreach($r as $rr)
if(! in_array($rr['uid'],$uids))
$potentials[] = $rr;
require_once("mod/settings.php");
settings_init($a); settings_init($a);
$o = replace_macros(get_markup_template('delegate.tpl'),array( $o = replace_macros(get_markup_template('delegate.tpl'), [
'$header' => t('Delegate Page Management'), '$header' => t('Delegate Page Management'),
'$base' => System::baseUrl(), '$base' => System::baseUrl(),
'$desc' => t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'), '$desc' => t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'),
@ -140,10 +128,8 @@ function delegate_content(App $a) {
'$remove' => t('Remove'), '$remove' => t('Remove'),
'$add' => t('Add'), '$add' => t('Add'),
'$none' => t('No entries.') '$none' => t('No entries.')
)); ]);
return $o; return $o;
} }

558
mod/dfrn_confirm.php
View file

@ -4,15 +4,15 @@
* @file mod/dfrn_confirm.php * @file mod/dfrn_confirm.php
* @brief Module: dfrn_confirm * @brief Module: dfrn_confirm
* Purpose: Friendship acceptance for DFRN contacts * Purpose: Friendship acceptance for DFRN contacts
*. *
* There are two possible entry points and three scenarios. * There are two possible entry points and three scenarios.
*. *
* 1. A form was submitted by our user approving a friendship that originated elsewhere. * 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. * This may also be called from dfrn_request to automatically approve a friendship.
* *
* 2. We may be the target or other side of the conversation to scenario 1, and will * 2. We may be the target or other side of the conversation to scenario 1, and will
* interact with that process on our own user's behalf. * interact with that process on our own user's behalf.
*. *
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf * @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 * You also find a graphic which describes the confirmation process at
* https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_confirmation.png * https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_confirmation.png
@ -32,110 +32,100 @@ use Friendica\Protocol\Diaspora;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
require_once 'include/items.php';
function dfrn_confirm_post(App $a, $handsfree = null) { function dfrn_confirm_post(App $a, $handsfree = null)
{
if(is_array($handsfree)) { $node = null;
if (is_array($handsfree)) {
/* /*
* We were called directly from dfrn_request due to automatic friend acceptance. * We were called directly from dfrn_request due to automatic friend acceptance.
* Any $_POST parameters we may require are supplied in the $handsfree array. * Any $_POST parameters we may require are supplied in the $handsfree array.
* *
*/ */
$node = $handsfree['node']; $node = $handsfree['node'];
$a->interactive = false; // notice() becomes a no-op since nobody is there to see it $a->interactive = false; // notice() becomes a no-op since nobody is there to see it
} elseif ($a->argc > 1) {
} $node = $a->argv[1];
else {
if($a->argc > 1)
$node = $a->argv[1];
} }
/* /*
* * Main entry point. Scenario 1. Our user received a friend request notification (perhaps
* Main entry point. Scenario 1. Our user received a friend request notification (perhaps * from another site) and clicked 'Approve'.
* from another site) and clicked 'Approve'. * $POST['source_url'] is not set. If it is, it indicates Scenario 2.
* $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
* 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
* 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.
* since we are operating on behalf of our registered user to approve a friendship. */
* if (!x($_POST, 'source_url')) {
*/ $uid = defaults($handsfree, 'uid', local_user());
if (!$uid) {
if(! x($_POST,'source_url')) { notice(t('Permission denied.') . EOL);
$uid = ((is_array($handsfree)) ? $handsfree['uid'] : local_user());
if(! $uid) {
notice( t('Permission denied.') . EOL );
return; return;
} }
$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", $user = dba::selectFirst('user', [], ['uid' => $uid]);
intval($uid) if (!DBM::is_result($user)) {
); notice(t('Profile not found.') . EOL);
if(! $user) {
notice( t('Profile not found.') . EOL );
return; return;
} }
// These data elements may come from either the friend request notification form or $handsfree array. // These data elements may come from either the friend request notification form or $handsfree array.
if (is_array($handsfree)) {
if(is_array($handsfree)) {
logger('Confirm in handsfree mode'); logger('Confirm in handsfree mode');
$dfrn_id = $handsfree['dfrn_id']; $dfrn_id = $handsfree['dfrn_id'];
$intro_id = $handsfree['intro_id']; $intro_id = $handsfree['intro_id'];
$duplex = $handsfree['duplex']; $duplex = $handsfree['duplex'];
$hidden = ((array_key_exists('hidden',$handsfree)) ? intval($handsfree['hidden']) : 0 ); $cid = 0;
$activity = ((array_key_exists('activity',$handsfree)) ? intval($handsfree['activity']) : 0 ); $hidden = intval(defaults($handsfree, 'hidden' , 0));
} $activity = intval(defaults($handsfree, 'activity', 0));
else { } else {
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : ""); $dfrn_id = notags(trim(defaults($_POST, 'dfrn_id' , '')));
$intro_id = ((x($_POST,'intro_id')) ? intval($_POST['intro_id']) : 0 ); $intro_id = intval(defaults($_POST, 'intro_id' , 0));
$duplex = ((x($_POST,'duplex')) ? intval($_POST['duplex']) : 0 ); $duplex = intval(defaults($_POST, 'duplex' , 0));
$cid = ((x($_POST,'contact_id')) ? intval($_POST['contact_id']) : 0 ); $cid = intval(defaults($_POST, 'contact_id', 0));
$hidden = ((x($_POST,'hidden')) ? intval($_POST['hidden']) : 0 ); $hidden = intval(defaults($_POST, 'hidden' , 0));
$activity = ((x($_POST,'activity')) ? intval($_POST['activity']) : 0 ); $activity = intval(defaults($_POST, 'activity' , 0));
} }
/* /*
*
* Ensure that dfrn_id has precedence when we go to find the contact record. * Ensure that dfrn_id has precedence when we go to find the contact record.
* We only want to search based on contact id if there is no dfrn_id, * We only want to search based on contact id if there is no dfrn_id,
* e.g. for OStatus network followers. * e.g. for OStatus network followers.
*
*/ */
if (strlen($dfrn_id)) {
if(strlen($dfrn_id))
$cid = 0; $cid = 0;
}
logger('Confirming request for dfrn_id (issued) ' . $dfrn_id); logger('Confirming request for dfrn_id (issued) ' . $dfrn_id);
if($cid) if ($cid) {
logger('Confirming follower with contact_id: ' . $cid); logger('Confirming follower with contact_id: ' . $cid);
}
/* /*
*
* The other person will have been issued an ID when they first requested friendship. * The other person will have been issued an ID when they first requested friendship.
* Locate their record. At this time, their record will have both pending and blocked set to 1. * Locate their record. At this time, their record will have both pending and blocked set to 1.
* There won't be any dfrn_id if this is a network follower, so use the contact_id instead. * There won't be any dfrn_id if this is a network follower, so use the contact_id instead.
*
*/ */
$r = q("SELECT *
$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", FROM `contact`
WHERE (
(`issued-id` != '' AND `issued-id` = '%s')
OR
(`id` = %d AND `id` != 0)
)
AND `uid` = %d
AND `duplex` = 0
LIMIT 1",
dbesc($dfrn_id), dbesc($dfrn_id),
intval($cid), intval($cid),
intval($uid) intval($uid)
); );
if (!DBM::is_result($r)) {
if (! DBM::is_result($r)) {
logger('Contact not found in DB.'); logger('Contact not found in DB.');
notice( t('Contact not found.') . EOL ); notice(t('Contact not found.') . EOL);
notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL ); notice(t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL);
return; return;
} }
@ -149,38 +139,33 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
$network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS); $network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS);
if($contact['network']) if ($contact['network']) {
$network = $contact['network']; $network = $contact['network'];
}
if($network === NETWORK_DFRN) { if ($network === NETWORK_DFRN) {
/* /*
*
* Generate a key pair for all further communications with this person. * 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. * 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 * 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 * any single key is compromised. It is a robust key. We're much more
* worried about key leakage than anybody cracking it. * worried about key leakage than anybody cracking it.
*
*/ */
$res = Crypto::newKeypair(4096); $res = Crypto::newKeypair(4096);
$private_key = $res['prvkey']; $private_key = $res['prvkey'];
$public_key = $res['pubkey']; $public_key = $res['pubkey'];
// Save the private key. Send them the public key. // Save the private key. Send them the public key.
q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d",
$r = q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($private_key), dbesc($private_key),
intval($contact_id), intval($contact_id),
intval($uid) intval($uid)
); );
$params = array(); $params = [];
/* /*
*
* Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our * 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). * 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 * Then encrypt our profile URL with the other person's site public key. They can decrypt
@ -191,39 +176,41 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
* If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 * 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 * 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. * random key which is encrypted with their site public key.
*
*/ */
$src_aes_key = openssl_random_pseudo_bytes(64); $src_aes_key = openssl_random_pseudo_bytes(64);
$result = ''; $result = '';
openssl_private_encrypt($dfrn_id, $result, $user[0]['prvkey']); openssl_private_encrypt($dfrn_id, $result, $user['prvkey']);
$params['dfrn_id'] = bin2hex($result); $params['dfrn_id'] = bin2hex($result);
$params['public_key'] = $public_key; $params['public_key'] = $public_key;
$my_url = System::baseUrl() . '/profile/' . $user['nickname'];
$my_url = System::baseUrl() . '/profile/' . $user[0]['nickname'];
openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey); openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey);
$params['source_url'] = bin2hex($params['source_url']); $params['source_url'] = bin2hex($params['source_url']);
if($aes_allow && function_exists('openssl_encrypt')) { if ($aes_allow && function_exists('openssl_encrypt')) {
openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey); openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey);
$params['aes_key'] = bin2hex($params['aes_key']); $params['aes_key'] = bin2hex($params['aes_key']);
$params['public_key'] = bin2hex(openssl_encrypt($public_key,'AES-256-CBC',$src_aes_key)); $params['public_key'] = bin2hex(openssl_encrypt($public_key, 'AES-256-CBC', $src_aes_key));
} }
$params['dfrn_version'] = DFRN_PROTOCOL_VERSION ; $params['dfrn_version'] = DFRN_PROTOCOL_VERSION;
if($duplex == 1) if ($duplex == 1) {
$params['duplex'] = 1; $params['duplex'] = 1;
}
if($user[0]['page-flags'] == PAGE_COMMUNITY) if ($user['page-flags'] == PAGE_COMMUNITY) {
$params['page'] = 1; $params['page'] = 1;
if($user[0]['page-flags'] == PAGE_PRVGROUP) }
$params['page'] = 2;
logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA); if ($user['page-flags'] == PAGE_PRVGROUP) {
$params['page'] = 2;
}
logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), LOGGER_DATA);
/* /*
* *
@ -240,104 +227,91 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
// Now figure out what they responded. Try to be robust if the remote site is // Now figure out what they responded. Try to be robust if the remote site is
// having difficulty and throwing up errors of some kind. // having difficulty and throwing up errors of some kind.
$leading_junk = substr($res,0,strpos($res,'<?xml')); $leading_junk = substr($res, 0, strpos($res, '<?xml'));
$res = substr($res,strpos($res,'<?xml')); $res = substr($res, strpos($res, '<?xml'));
if(! strlen($res)) { if (!strlen($res)) {
// No XML at all, this exchange is messed up really bad.
// No XML at all, this exchange is messed up really bad. // We shouldn't proceed, because the xml parser might choke,
// We shouldn't proceed, because the xml parser might choke, // and $status is going to be zero, which indicates success.
// and $status is going to be zero, which indicates success. // We can hardly call this a success.
// We can hardly call this a success. notice(t('Response from remote site was not understood.') . EOL);
notice( t('Response from remote site was not understood.') . EOL);
return; return;
} }
if(strlen($leading_junk) && Config::get('system','debugging')) { if (strlen($leading_junk) && Config::get('system', 'debugging')) {
// This might be more common. Mixed error text and some XML.
// This might be more common. Mixed error text and some XML. // If we're configured for debugging, show the text. Proceed in either case.
// If we're configured for debugging, show the text. Proceed in either case. notice(t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL);
notice( t('Unexpected response from remote site: ') . EOL . $leading_junk . EOL );
} }
if(stristr($res, "<status")===false) { if (stristr($res, "<status") === false) {
// wrong xml! stop here! // wrong xml! stop here!
notice( t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL ); notice(t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
return; return;
} }
$xml = parse_xml_string($res); $xml = parse_xml_string($res);
$status = (int) $xml->status; $status = (int) $xml->status;
$message = unxmlify($xml->message); // human readable text of what may have gone wrong. $message = unxmlify($xml->message); // human readable text of what may have gone wrong.
switch($status) { switch ($status) {
case 0: case 0:
info( t("Confirmation completed successfully.") . EOL); info(t("Confirmation completed successfully.") . EOL);
if(strlen($message))
notice( t('Remote site reported: ') . $message . EOL);
break; break;
case 1: case 1:
// birthday paradox - generate new dfrn-id and fall through. // birthday paradox - generate new dfrn-id and fall through.
$new_dfrn_id = random_string(); $new_dfrn_id = random_string();
$r = q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d", q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($new_dfrn_id), dbesc($new_dfrn_id),
intval($contact_id), intval($contact_id),
intval($uid) intval($uid)
); );
case 2: case 2:
notice( t("Temporary failure. Please wait and try again.") . EOL); notice(t("Temporary failure. Please wait and try again.") . EOL);
if(strlen($message))
notice( t('Remote site reported: ') . $message . EOL);
break; break;
case 3: case 3:
notice( t("Introduction failed or was revoked.") . EOL); notice(t("Introduction failed or was revoked.") . EOL);
if(strlen($message))
notice( t('Remote site reported: ') . $message . EOL);
break; break;
} }
if(($status == 0) && ($intro_id)) { if (strlen($message)) {
notice(t('Remote site reported: ') . $message . EOL);
}
if (($status == 0) && ($intro_id)) {
// Success. Delete the notification. // Success. Delete the notification.
q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d",
$r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d",
intval($intro_id), intval($intro_id),
intval($uid) intval($uid)
); );
} }
if($status != 0) if ($status != 0) {
return; return;
}
} }
/* /*
*
* We have now established a relationship with the other site. * 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 * Let's make our own personal copy of their profile photo so we don't have
* to always load it from their site. * to always load it from their site.
* *
* We will also update the contact record with the nature and scope of the relationship. * We will also update the contact record with the nature and scope of the relationship.
*
*/ */
Contact::updateAvatar($contact['photo'], $uid, $contact_id); Contact::updateAvatar($contact['photo'], $uid, $contact_id);
logger('dfrn_confirm: confirm - imported photos'); logger('dfrn_confirm: confirm - imported photos');
if($network === NETWORK_DFRN) { if ($network === NETWORK_DFRN) {
$new_relation = CONTACT_IS_FOLLOWER; $new_relation = CONTACT_IS_FOLLOWER;
if(($relation == CONTACT_IS_SHARING) || ($duplex)) if (($relation == CONTACT_IS_SHARING) || ($duplex)) {
$new_relation = CONTACT_IS_FRIEND; $new_relation = CONTACT_IS_FRIEND;
}
if(($relation == CONTACT_IS_SHARING) && ($duplex)) if (($relation == CONTACT_IS_SHARING) && ($duplex)) {
$duplex = 0; $duplex = 0;
}
$r = q("UPDATE `contact` SET `rel` = %d, $r = q("UPDATE `contact` SET `rel` = %d,
`name-date` = '%s', `name-date` = '%s',
@ -357,42 +331,36 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
intval($contact_id) intval($contact_id)
); );
} else { } else {
// $network !== NETWORK_DFRN // $network !== NETWORK_DFRN
$network = defaults($contact, 'network', NETWORK_OSTATUS);
$network = (($contact['network']) ? $contact['network'] : NETWORK_OSTATUS);
$notify = (($contact['notify']) ? $contact['notify'] : '');
$poll = (($contact['poll']) ? $contact['poll'] : '');
$arr = Probe::uri($contact['url']); $arr = Probe::uri($contact['url']);
if (empty($contact['notify'])) {
$notify = $arr['notify']; $notify = defaults($contact, 'notify' , $arr['notify']);
} $poll = defaults($contact, 'poll' , $arr['poll']);
if (empty($contact['poll'])) {
$poll = $arr['poll'];
}
$addr = $arr['addr']; $addr = $arr['addr'];
$new_relation = $contact['rel']; $new_relation = $contact['rel'];
$writable = $contact['writable']; $writable = $contact['writable'];
if($network === NETWORK_DIASPORA) { if ($network === NETWORK_DIASPORA) {
if($duplex) if ($duplex) {
$new_relation = CONTACT_IS_FRIEND; $new_relation = CONTACT_IS_FRIEND;
else } else {
$new_relation = CONTACT_IS_FOLLOWER; $new_relation = CONTACT_IS_FOLLOWER;
}
if($new_relation != CONTACT_IS_FOLLOWER) if ($new_relation != CONTACT_IS_FOLLOWER) {
$writable = 1; $writable = 1;
}
} }
$r = q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d", q("DELETE FROM `intro` WHERE `id` = %d AND `uid` = %d",
intval($intro_id), intval($intro_id),
intval($uid) intval($uid)
); );
$r = q("UPDATE `contact` SET `name-date` = '%s', $r = q("UPDATE `contact` SET `name-date` = '%s',
`uri-date` = '%s', `uri-date` = '%s',
`addr` = '%s', `addr` = '%s',
@ -420,67 +388,43 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
} }
/// @TODO is DBM::is_result() working here? /// @TODO is DBM::is_result() working here?
if ($r === false) { if (!DBM::is_result($r)) {
notice( t('Unable to set contact photo.') . EOL); notice(t('Unable to set contact photo.') . EOL);
} }
// reload contact info // reload contact info
$contact = dba::selectFirst('contact', [], ['id' => $contact_id]);
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
intval($contact_id)
);
if (DBM::is_result($r)) {
$contact = $r[0];
} else {
$contact = null;
}
if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) { if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
if (DBM::is_result($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) { $ret = Diaspora::sendShare($user, $contact);
$ret = Diaspora::sendShare($user[0],$r[0]);
logger('share returns: ' . $ret); logger('share returns: ' . $ret);
} }
// Send a new friend post if we are allowed to... // Send a new friend post if we are allowed to...
$profile = dba::selectFirst('profile', ['hide-friends'], ['is-default' => true, 'uid' => $uid]);
$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", if (x($profile, 'hide-friends') === 0 && $activity && !$hidden) {
intval($uid) $self = dba::selectFirst('contact', [], ['self' => true, 'uid' => $uid]);
); if (DBM::is_result($self)) {
$arr = [];
if((DBM::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
require_once 'include/items.php';
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($uid)
);
if(count($self)) {
$arr = array();
$arr['guid'] = get_guid(32); $arr['guid'] = get_guid(32);
$arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid); $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid);
$arr['uid'] = $uid; $arr['uid'] = $uid;
$arr['contact-id'] = $self[0]['id']; $arr['contact-id'] = $self['id'];
$arr['wall'] = 1; $arr['wall'] = 1;
$arr['type'] = 'wall'; $arr['type'] = 'wall';
$arr['gravity'] = 0; $arr['gravity'] = 0;
$arr['origin'] = 1; $arr['origin'] = 1;
$arr['author-name'] = $arr['owner-name'] = $self[0]['name']; $arr['author-name'] = $arr['owner-name'] = $self['name'];
$arr['author-link'] = $arr['owner-link'] = $self[0]['url']; $arr['author-link'] = $arr['owner-link'] = $self['url'];
$arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; $arr['author-avatar'] = $arr['owner-avatar'] = $self['thumb'];
$A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
$APhoto = '[url=' . $self[0]['url'] . ']' . '[img]' . $self[0]['thumb'] . '[/img][/url]';
$A = '[url=' . $self['url'] . ']' . $self['name'] . '[/url]';
$B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
$BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]'; $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
$arr['verb'] = ACTIVITY_FRIEND; $arr['verb'] = ACTIVITY_FRIEND;
$arr['object-type'] = ACTIVITY_OBJ_PERSON; $arr['object-type'] = ACTIVITY_OBJ_PERSON;
$arr['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto; $arr['body'] = t('%1$s is now friends with %2$s', $A, $B) . "\n\n\n" . $BPhoto;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>' $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>'
. '<id>' . $contact['url'] . '/' . $contact['name'] . '</id>'; . '<id>' . $contact['url'] . '/' . $contact['name'] . '</id>';
@ -490,14 +434,15 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
$arr['last-child'] = 1; $arr['last-child'] = 1;
$arr['allow_cid'] = $user[0]['allow_cid']; $arr['allow_cid'] = $user['allow_cid'];
$arr['allow_gid'] = $user[0]['allow_gid']; $arr['allow_gid'] = $user['allow_gid'];
$arr['deny_cid'] = $user[0]['deny_cid']; $arr['deny_cid'] = $user['deny_cid'];
$arr['deny_gid'] = $user[0]['deny_gid']; $arr['deny_gid'] = $user['deny_gid'];
$i = item_store($arr); $i = item_store($arr);
if($i) if ($i) {
Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i); Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
}
} }
} }
} }
@ -515,35 +460,28 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
} }
/* /*
*
*
* End of Scenario 1. [Local confirmation of remote friend request]. * End of Scenario 1. [Local confirmation of remote friend request].
* *
* Begin Scenario 2. This is the remote response to the above scenario. * 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. * This will take place on the site that originally initiated the friend request.
* In the section above where the confirming party makes a POST and * In the section above where the confirming party makes a POST and
* retrieves xml status information, they are communicating with the following code. * retrieves xml status information, they are communicating with the following code.
*
*/ */
if (x($_POST, 'source_url')) {
if (x($_POST,'source_url')) {
// We are processing an external confirmation to an introduction created by our user. // We are processing an external confirmation to an introduction created by our user.
$public_key = defaults($_POST, 'public_key', '');
$public_key = ((x($_POST,'public_key')) ? $_POST['public_key'] : ''); $dfrn_id = hex2bin(defaults($_POST, 'dfrn_id' , ''));
$dfrn_id = ((x($_POST,'dfrn_id')) ? hex2bin($_POST['dfrn_id']) : ''); $source_url = hex2bin(defaults($_POST, 'source_url', ''));
$source_url = ((x($_POST,'source_url')) ? hex2bin($_POST['source_url']) : ''); $aes_key = defaults($_POST, 'aes_key' , '');
$aes_key = ((x($_POST,'aes_key')) ? $_POST['aes_key'] : ''); $duplex = intval(defaults($_POST, 'duplex' , 0));
$duplex = ((x($_POST,'duplex')) ? intval($_POST['duplex']) : 0 ); $page = intval(defaults($_POST, 'page' , 0));
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0 );
$version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
$forum = (($page == 1) ? 1 : 0); $forum = (($page == 1) ? 1 : 0);
$prv = (($page == 2) ? 1 : 0); $prv = (($page == 2) ? 1 : 0);
logger('dfrn_confirm: requestee contacted: ' . $node); logger('dfrn_confirm: requestee contacted: ' . $node);
logger('dfrn_confirm: request: POST=' . print_r($_POST,true), LOGGER_DATA); logger('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 $aes_key is set, both of these items require unpacking from the hex transport encoding.
@ -553,90 +491,77 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
} }
// Find our user's account // Find our user's account
$user = dba::selectFirst('user', [], ['nickname' => $node]);
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", if (!DBM::is_result($user)) {
dbesc($node)); $message = t('No user record found for \'%s\' ', $node);
xml_status(3, $message); // failure
if (! DBM::is_result($r)) {
$message = sprintf(t('No user record found for \'%s\' '), $node);
xml_status(3,$message); // failure
// NOTREACHED // NOTREACHED
} }
$my_prvkey = $r[0]['prvkey']; $my_prvkey = $user['prvkey'];
$local_uid = $r[0]['uid']; $local_uid = $user['uid'];
if(! strstr($my_prvkey,'PRIVATE KEY')) { if (!strstr($my_prvkey, 'PRIVATE KEY')) {
$message = t('Our site encryption key is apparently messed up.'); $message = t('Our site encryption key is apparently messed up.');
xml_status(3,$message); xml_status(3, $message);
} }
// verify everything // verify everything
$decrypted_source_url = ""; $decrypted_source_url = "";
openssl_private_decrypt($source_url,$decrypted_source_url,$my_prvkey); openssl_private_decrypt($source_url, $decrypted_source_url, $my_prvkey);
if(! strlen($decrypted_source_url)) { if (!strlen($decrypted_source_url)) {
$message = t('Empty site URL was provided or URL could not be decrypted by us.'); $message = t('Empty site URL was provided or URL could not be decrypted by us.');
xml_status(3,$message); xml_status(3, $message);
// NOTREACHED // NOTREACHED
} }
$ret = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", $contact = dba::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]);
dbesc($decrypted_source_url), if (!DBM::is_result($contact)) {
intval($local_uid) if (strstr($decrypted_source_url, 'http:')) {
); $newurl = str_replace('http:', 'https:', $decrypted_source_url);
if (!DBM::is_result($ret)) {
if (strstr($decrypted_source_url,'http:')) {
$newurl = str_replace('http:','https:',$decrypted_source_url);
} else { } else {
$newurl = str_replace('https:','http:',$decrypted_source_url); $newurl = str_replace('https:', 'http:', $decrypted_source_url);
} }
$ret = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", $contact = dba::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]);
dbesc($newurl), if (!DBM::is_result($contact)) {
intval($local_uid)
);
if (!DBM::is_result($ret)) {
// this is either a bogus confirmation (?) or we deleted the original introduction. // this is either a bogus confirmation (?) or we deleted the original introduction.
$message = t('Contact record was not found for you on our site.'); $message = t('Contact record was not found for you on our site.');
xml_status(3,$message); xml_status(3, $message);
return; // NOTREACHED return; // NOTREACHED
} }
} }
$relation = $ret[0]['rel']; $relation = $contact['rel'];
// Decrypt all this stuff we just received // Decrypt all this stuff we just received
$foreign_pubkey = $ret[0]['site-pubkey']; $foreign_pubkey = $contact['site-pubkey'];
$dfrn_record = $ret[0]['id']; $dfrn_record = $contact['id'];
if (! $foreign_pubkey) { if (!$foreign_pubkey) {
$message = sprintf( t('Site public key not available in contact record for URL %s.'), $newurl); $message = t('Site public key not available in contact record for URL %s.', $decrypted_source_url);
xml_status(3,$message); xml_status(3, $message);
} }
$decrypted_dfrn_id = ""; $decrypted_dfrn_id = "";
openssl_public_decrypt($dfrn_id,$decrypted_dfrn_id,$foreign_pubkey); openssl_public_decrypt($dfrn_id, $decrypted_dfrn_id, $foreign_pubkey);
if (strlen($aes_key)) { if (strlen($aes_key)) {
$decrypted_aes_key = ""; $decrypted_aes_key = "";
openssl_private_decrypt($aes_key,$decrypted_aes_key,$my_prvkey); openssl_private_decrypt($aes_key, $decrypted_aes_key, $my_prvkey);
$dfrn_pubkey = openssl_decrypt($public_key,'AES-256-CBC',$decrypted_aes_key); $dfrn_pubkey = openssl_decrypt($public_key, 'AES-256-CBC', $decrypted_aes_key);
} } else {
else {
$dfrn_pubkey = $public_key; $dfrn_pubkey = $public_key;
} }
$r = q("SELECT * FROM `contact` WHERE `dfrn-id` = '%s' LIMIT 1", if (dba::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
dbesc($decrypted_dfrn_id)
);
if (DBM::is_result($r)) {
$message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.'); $message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
xml_status(1,$message); // Birthday paradox - duplicate dfrn-id xml_status(1, $message); // Birthday paradox - duplicate dfrn-id
// NOTREACHED // NOTREACHED
} }
@ -645,34 +570,29 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
dbesc($dfrn_pubkey), dbesc($dfrn_pubkey),
intval($dfrn_record) intval($dfrn_record)
); );
if (! DBM::is_result($r)) { if (!DBM::is_result($r)) {
$message = t('Unable to set your contact credentials on our system.'); $message = t('Unable to set your contact credentials on our system.');
xml_status(3,$message); xml_status(3, $message);
} }
// It's possible that the other person also requested friendship. // It's possible that the other person also requested friendship.
// If it is a duplex relationship, ditch the issued-id if one exists. // If it is a duplex relationship, ditch the issued-id if one exists.
if($duplex) { if ($duplex) {
$r = q("UPDATE `contact` SET `issued-id` = '' WHERE `id` = %d", q("UPDATE `contact` SET `issued-id` = '' WHERE `id` = %d",
intval($dfrn_record) intval($dfrn_record)
); );
} }
// We're good but now we have to scrape the profile photo and send notifications. // 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)) {
$photo = $contact['photo'];
$r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
intval($dfrn_record));
if (DBM::is_result($r)) {
$photo = $r[0]['photo'];
} else { } else {
$photo = System::baseUrl() . '/images/person-175.jpg'; $photo = System::baseUrl() . '/images/person-175.jpg';
} }
Contact::updateAvatar($photo,$local_uid,$dfrn_record); Contact::updateAvatar($photo, $local_uid, $dfrn_record);
logger('dfrn_confirm: request - photos imported'); logger('dfrn_confirm: request - photos imported');
@ -705,9 +625,9 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
intval($dfrn_record) intval($dfrn_record)
); );
if ($r === false) { // indicates schema is messed up or total db failure if (!DBM::is_result($r)) { // indicates schema is messed up or total db failure
$message = t('Unable to update your contact profile details on our system'); $message = t('Unable to update your contact profile details on our system');
xml_status(3,$message); xml_status(3, $message);
} }
// Otherwise everything seems to have worked and we are almost done. Yay! // Otherwise everything seems to have worked and we are almost done. Yay!
@ -715,70 +635,61 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
logger('dfrn_confirm: request: info updated'); logger('dfrn_confirm: request: info updated');
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` $combined = null;
WHERE `contact`.`id` = %d LIMIT 1", $r = q("SELECT `contact`.*, `user`.*
FROM `contact`
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`id` = %d
LIMIT 1",
intval($dfrn_record) intval($dfrn_record)
); );
if (DBM::is_result($r)) {
if (DBM::is_result($r))
$combined = $r[0]; $combined = $r[0];
if((DBM::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { if ($combined['notify-flags'] & NOTIFY_CONFIRM) {
$mutual = ($new_relation == CONTACT_IS_FRIEND); $mutual = ($new_relation == CONTACT_IS_FRIEND);
notification(array( notification([
'type' => NOTIFY_CONFIRM, 'type' => NOTIFY_CONFIRM,
'notify_flags' => $r[0]['notify-flags'], 'notify_flags' => $combined['notify-flags'],
'language' => $r[0]['language'], 'language' => $combined['language'],
'to_name' => $r[0]['username'], 'to_name' => $combined['username'],
'to_email' => $r[0]['email'], 'to_email' => $combined['email'],
'uid' => $r[0]['uid'], 'uid' => $combined['uid'],
'link' => System::baseUrl() . '/contacts/' . $dfrn_record, 'link' => System::baseUrl() . '/contacts/' . $dfrn_record,
'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')), 'source_name' => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : t('[Name Withheld]')),
'source_link' => $r[0]['url'], 'source_link' => $combined['url'],
'source_photo' => $r[0]['photo'], 'source_photo' => $combined['photo'],
'verb' => ($mutual?ACTIVITY_FRIEND:ACTIVITY_FOLLOW), 'verb' => ($mutual?ACTIVITY_FRIEND:ACTIVITY_FOLLOW),
'otype' => 'intro' 'otype' => 'intro'
)); ]);
}
} }
// Send a new friend post if we are allowed to... // Send a new friend post if we are allowed to...
if ($page && intval(PConfig::get($local_uid, 'system', 'post_joingroup'))) {
if($page && intval(PConfig::get($local_uid,'system','post_joingroup'))) { $profile = dba::selectFirst('profile', ['hide-friends'], ['is-default' => true, 'uid' => $local_uid]);
$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", if (x($profile, 'hide-friends') === 0) {
intval($local_uid) $self = dba::selectFirst('contact', [], ['self' => true, 'uid' => $local_uid]);
); if (DBM::is_result($self)) {
$arr = [];
if((DBM::is_result($r)) && ($r[0]['hide-friends'] == 0)) {
require_once 'include/items.php';
$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($local_uid)
);
if(count($self)) {
$arr = array();
$arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid); $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid);
$arr['uid'] = $local_uid; $arr['uid'] = $local_uid;
$arr['contact-id'] = $self[0]['id']; $arr['contact-id'] = $self['id'];
$arr['wall'] = 1; $arr['wall'] = 1;
$arr['type'] = 'wall'; $arr['type'] = 'wall';
$arr['gravity'] = 0; $arr['gravity'] = 0;
$arr['origin'] = 1; $arr['origin'] = 1;
$arr['author-name'] = $arr['owner-name'] = $self[0]['name']; $arr['author-name'] = $arr['owner-name'] = $self['name'];
$arr['author-link'] = $arr['owner-link'] = $self[0]['url']; $arr['author-link'] = $arr['owner-link'] = $self['url'];
$arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; $arr['author-avatar'] = $arr['owner-avatar'] = $self['thumb'];
$A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
$APhoto = '[url=' . $self[0]['url'] . ']' . '[img]' . $self[0]['thumb'] . '[/img][/url]';
$A = '[url=' . $self['url'] . ']' . $self['name'] . '[/url]';
$B = '[url=' . $combined['url'] . ']' . $combined['name'] . '[/url]'; $B = '[url=' . $combined['url'] . ']' . $combined['name'] . '[/url]';
$BPhoto = '[url=' . $combined['url'] . ']' . '[img]' . $combined['thumb'] . '[/img][/url]'; $BPhoto = '[url=' . $combined['url'] . ']' . '[img]' . $combined['thumb'] . '[/img][/url]';
$arr['verb'] = ACTIVITY_JOIN; $arr['verb'] = ACTIVITY_JOIN;
$arr['object-type'] = ACTIVITY_OBJ_GROUP; $arr['object-type'] = ACTIVITY_OBJ_GROUP;
$arr['body'] = sprintf( t('%1$s has joined %2$s'), $A, $B)."\n\n\n" .$BPhoto; $arr['body'] = t('%1$s has joined %2$s', $A, $B) . "\n\n\n" . $BPhoto;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_GROUP . '</type><title>' . $combined['name'] . '</title>' $arr['object'] = '<object><type>' . ACTIVITY_OBJ_GROUP . '</type><title>' . $combined['name'] . '</title>'
. '<id>' . $combined['url'] . '/' . $combined['name'] . '</id>'; . '<id>' . $combined['url'] . '/' . $combined['name'] . '</id>';
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $combined['url'] . '" />' . "\n"); $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $combined['url'] . '" />' . "\n");
@ -787,27 +698,24 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
$arr['last-child'] = 1; $arr['last-child'] = 1;
$arr['allow_cid'] = $user[0]['allow_cid']; $arr['allow_cid'] = $user['allow_cid'];
$arr['allow_gid'] = $user[0]['allow_gid']; $arr['allow_gid'] = $user['allow_gid'];
$arr['deny_cid'] = $user[0]['deny_cid']; $arr['deny_cid'] = $user['deny_cid'];
$arr['deny_gid'] = $user[0]['deny_gid']; $arr['deny_gid'] = $user['deny_gid'];
$i = item_store($arr); $i = item_store($arr);
if($i) if ($i) {
Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i); Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
}
} }
} }
} }
xml_status(0); // Success xml_status(0); // Success
return; // NOTREACHED return; // NOTREACHED
////////////////////// End of this scenario ///////////////////////////////////////////////
////////////////////// End of this scenario ///////////////////////////////////////////////
} }
// somebody arrived here by mistake or they are fishing. Send them to the homepage. // somebody arrived here by mistake or they are fishing. Send them to the homepage.
goaway(System::baseUrl()); goaway(System::baseUrl());
// NOTREACHED // NOTREACHED
} }

8
src/Protocol/Diaspora.php
View file

@ -4301,6 +4301,10 @@ class Diaspora
} }
$message = self::constructLike($r[0], $contact); $message = self::constructLike($r[0], $contact);
if ($message === false) {
return false;
}
$message["author_signature"] = self::signature($contact, $message); $message["author_signature"] = self::signature($contact, $message);
/* /*
@ -4333,6 +4337,10 @@ class Diaspora
$contact["uprvkey"] = $uprvkey; $contact["uprvkey"] = $uprvkey;
$message = self::constructComment($item, $contact); $message = self::constructComment($item, $contact);
if ($message === false) {
return false;
}
$message["author_signature"] = self::signature($contact, $message); $message["author_signature"] = self::signature($contact, $message);
/* /*