Fix ACL data

This commit is contained in:
Michael 2018-03-24 18:38:05 +00:00
parent 801d2ee166
commit 885d794958

View file

@ -1,358 +1,368 @@
<?php <?php
/** /**
* @file src/Core/Acl.php * @file src/Core/Acl.php
*/ */
namespace Friendica\Core; namespace Friendica\Core;
use dba; use dba;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Util\Network; use Friendica\Util\Network;
use const CONTACT_IS_FRIEND; use const CONTACT_IS_FRIEND;
use const NETWORK_DFRN; use const NETWORK_DFRN;
use const NETWORK_DIASPORA; use const NETWORK_DIASPORA;
use const NETWORK_FACEBOOK; use const NETWORK_FACEBOOK;
use const NETWORK_MAIL; use const NETWORK_MAIL;
use const NETWORK_OSTATUS; use const NETWORK_OSTATUS;
use const PHP_EOL; use const PHP_EOL;
use function dbesc; use function dbesc;
use function defaults; use function defaults;
use function get_markup_template; use function get_markup_template;
use function get_server; use function get_server;
use function local_user; use function local_user;
use function remote_user; use function remote_user;
use function replace_macros; use function replace_macros;
/** /**
* Handle ACL management and display * Handle ACL management and display
* *
* @author Hypolite Petovan <mrpetovan@gmail.com> * @author Hypolite Petovan <mrpetovan@gmail.com>
*/ */
class ACL extends BaseObject class ACL extends BaseObject
{ {
/** /**
* Returns a select input tag with all the contact of the local user * Returns a select input tag with all the contact of the local user
* *
* @param string $selname Name attribute of the select input tag * @param string $selname Name attribute of the select input tag
* @param string $selclass Class attribute of the select input tag * @param string $selclass Class attribute of the select input tag
* @param array $options Available options: * @param array $options Available options:
* - size: length of the select box * - size: length of the select box
* - mutual_friends: Only used for the hook * - mutual_friends: Only used for the hook
* - single: Only used for the hook * - single: Only used for the hook
* - exclude: Only used for the hook * - exclude: Only used for the hook
* @param array $preselected Contact ID that should be already selected * @param array $preselected Contact ID that should be already selected
* @return string * @return string
*/ */
public static function getSuggestContactSelectHTML($selname, $selclass, array $options = [], array $preselected = []) public static function getSuggestContactSelectHTML($selname, $selclass, array $options = [], array $preselected = [])
{ {
$a = self::getApp(); $a = self::getApp();
$networks = null; $networks = null;
$size = defaults($options, 'size', 4); $size = defaults($options, 'size', 4);
$mutual = !empty($options['mutual_friends']); $mutual = !empty($options['mutual_friends']);
$single = !empty($options['single']) && empty($options['multiple']); $single = !empty($options['single']) && empty($options['multiple']);
$exclude = defaults($options, 'exclude', false); $exclude = defaults($options, 'exclude', false);
switch (defaults($options, 'networks', Protocol::PHANTOM)) { switch (defaults($options, 'networks', Protocol::PHANTOM)) {
case 'DFRN_ONLY': case 'DFRN_ONLY':
$networks = [NETWORK_DFRN]; $networks = [NETWORK_DFRN];
break; break;
case 'PRIVATE': case 'PRIVATE':
if (!empty($a->user['prvnets'])) { if (!empty($a->user['prvnets'])) {
$networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA]; $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA];
} else { } else {
$networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA]; $networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA];
} }
break; break;
case 'TWO_WAY': case 'TWO_WAY':
if (!empty($a->user['prvnets'])) { if (!empty($a->user['prvnets'])) {
$networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA]; $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA];
} else { } else {
$networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS]; $networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS];
} }
break; break;
default: /// @TODO Maybe log this call? default: /// @TODO Maybe log this call?
break; break;
} }
$x = ['options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks]; $x = ['options' => $options, 'size' => $size, 'single' => $single, 'mutual' => $mutual, 'exclude' => $exclude, 'networks' => $networks];
Addon::callHooks('contact_select_options', $x); Addon::callHooks('contact_select_options', $x);
$o = ''; $o = '';
$sql_extra = ''; $sql_extra = '';
if (!empty($x['mutual'])) { if (!empty($x['mutual'])) {
$sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND)); $sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
} }
if (!empty($x['exclude'])) { if (!empty($x['exclude'])) {
$sql_extra .= sprintf(" AND `id` != %d ", intval($x['exclude'])); $sql_extra .= sprintf(" AND `id` != %d ", intval($x['exclude']));
} }
if (!empty($x['networks'])) { if (!empty($x['networks'])) {
/// @TODO rewrite to foreach() /// @TODO rewrite to foreach()
array_walk($x['networks'], function (&$value) { array_walk($x['networks'], function (&$value) {
$value = "'" . dbesc($value) . "'"; $value = "'" . dbesc($value) . "'";
}); });
$str_nets = implode(',', $x['networks']); $str_nets = implode(',', $x['networks']);
$sql_extra .= " AND `network` IN ( $str_nets ) "; $sql_extra .= " AND `network` IN ( $str_nets ) ";
} }
$tabindex = (!empty($options['tabindex']) ? 'tabindex="' . $options["tabindex"] . '"' : ''); $tabindex = (!empty($options['tabindex']) ? 'tabindex="' . $options["tabindex"] . '"' : '');
if (!empty($x['single'])) { if (!empty($x['single'])) {
$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"" . $x['size'] . "\" $tabindex >\r\n"; $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"" . $x['size'] . "\" $tabindex >\r\n";
} else { } else {
$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n"; $o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n";
} }
$stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact` $stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
$sql_extra $sql_extra
ORDER BY `name` ASC ", intval(local_user()) ORDER BY `name` ASC ", intval(local_user())
); );
$contacts = dba::inArray($stmt); $contacts = dba::inArray($stmt);
$arr = ['contact' => $contacts, 'entry' => $o]; $arr = ['contact' => $contacts, 'entry' => $o];
// e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow' // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
Addon::callHooks($a->module . '_pre_' . $selname, $arr); Addon::callHooks($a->module . '_pre_' . $selname, $arr);
if (DBM::is_result($contacts)) { if (DBM::is_result($contacts)) {
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
if (in_array($contact['id'], $preselected)) { if (in_array($contact['id'], $preselected)) {
$selected = ' selected="selected" '; $selected = ' selected="selected" ';
} else { } else {
$selected = ''; $selected = '';
} }
$trimmed = mb_substr($contact['name'], 0, 20); $trimmed = mb_substr($contact['name'], 0, 20);
$o .= "<option value=\"{$contact['id']}\" $selected title=\"{$contact['name']}|{$contact['url']}\" >$trimmed</option>\r\n"; $o .= "<option value=\"{$contact['id']}\" $selected title=\"{$contact['name']}|{$contact['url']}\" >$trimmed</option>\r\n";
} }
} }
$o .= '</select>' . PHP_EOL; $o .= '</select>' . PHP_EOL;
Addon::callHooks($a->module . '_post_' . $selname, $o); Addon::callHooks($a->module . '_post_' . $selname, $o);
return $o; return $o;
} }
/** /**
* Returns a select input tag with all the contact of the local user * Returns a select input tag with all the contact of the local user
* *
* @param string $selname Name attribute of the select input tag * @param string $selname Name attribute of the select input tag
* @param string $selclass Class attribute of the select input tag * @param string $selclass Class attribute of the select input tag
* @param array $preselected Contact IDs that should be already selected * @param array $preselected Contact IDs that should be already selected
* @param int $size Length of the select box * @param int $size Length of the select box
* @param int $tabindex Select input tag tabindex attribute * @param int $tabindex Select input tag tabindex attribute
* @return string * @return string
*/ */
public static function getMessageContactSelectHTML($selname, $selclass, array $preselected = [], $size = 4, $tabindex = null) public static function getMessageContactSelectHTML($selname, $selclass, array $preselected = [], $size = 4, $tabindex = null)
{ {
$a = self::getApp(); $a = self::getApp();
$o = ''; $o = '';
// When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector // When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector
// to one recipient. By default our selector allows multiple selects amongst all contacts. // to one recipient. By default our selector allows multiple selects amongst all contacts.
$sql_extra = sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND)); $sql_extra = sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
$sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ", NETWORK_DFRN, NETWORK_DIASPORA); $sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ", NETWORK_DFRN, NETWORK_DIASPORA);
$tabindex_attr = !empty($tabindex) ? ' tabindex="' . intval($tabindex) . '"' : ''; $tabindex_attr = !empty($tabindex) ? ' tabindex="' . intval($tabindex) . '"' : '';
$hidepreselected = ''; $hidepreselected = '';
if ($preselected) { if ($preselected) {
$sql_extra .= " AND `id` IN (" . implode(",", $preselected) . ")"; $sql_extra .= " AND `id` IN (" . implode(",", $preselected) . ")";
$hidepreselected = ' style="display: none;"'; $hidepreselected = ' style="display: none;"';
} }
$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\"$tabindex_attr$hidepreselected>\r\n"; $o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\"$tabindex_attr$hidepreselected>\r\n";
$stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact` $stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != '' WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
$sql_extra $sql_extra
ORDER BY `name` ASC ", intval(local_user()) ORDER BY `name` ASC ", intval(local_user())
); );
$contacts = dba::inArray($stmt); $contacts = dba::inArray($stmt);
$arr = ['contact' => $contacts, 'entry' => $o]; $arr = ['contact' => $contacts, 'entry' => $o];
// e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow' // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
Addon::callHooks($a->module . '_pre_' . $selname, $arr); Addon::callHooks($a->module . '_pre_' . $selname, $arr);
$receiverlist = []; $receiverlist = [];
if (DBM::is_result($contacts)) { if (DBM::is_result($contacts)) {
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
if (in_array($contact['id'], $preselected)) { if (in_array($contact['id'], $preselected)) {
$selected = ' selected="selected"'; $selected = ' selected="selected"';
} else { } else {
$selected = ''; $selected = '';
} }
$trimmed = Protocol::formatMention($contact['url'], $contact['name']); $trimmed = Protocol::formatMention($contact['url'], $contact['name']);
$receiverlist[] = $trimmed; $receiverlist[] = $trimmed;
$o .= "<option value=\"{$contact['id']}\"$selected title=\"{$contact['name']}|{$contact['url']}\" >$trimmed</option>\r\n"; $o .= "<option value=\"{$contact['id']}\"$selected title=\"{$contact['name']}|{$contact['url']}\" >$trimmed</option>\r\n";
} }
} }
$o .= '</select>' . PHP_EOL; $o .= '</select>' . PHP_EOL;
if ($preselected) { if ($preselected) {
$o .= implode(', ', $receiverlist); $o .= implode(', ', $receiverlist);
} }
Addon::callHooks($a->module . '_post_' . $selname, $o); Addon::callHooks($a->module . '_post_' . $selname, $o);
return $o; return $o;
} }
/** private static function fixACL(&$item) {
* Return the default permission of the provided user array $item = intval(str_replace(['<', '>'], ['', ''], $item));
* }
* @param array $user
* @return array Hash of contact id lists /**
*/ * Return the default permission of the provided user array
public static function getDefaultUserPermissions(array $user = null) *
{ * @param array $user
$matches = []; * @return array Hash of contact id lists
*/
$acl_regex = '/<([0-9]+)>/i'; public static function getDefaultUserPermissions(array $user = null)
{
preg_match_all($acl_regex, defaults($user, 'allow_cid', ''), $matches); $matches = [];
$allow_cid = $matches[1];
preg_match_all($acl_regex, defaults($user, 'allow_gid', ''), $matches); $acl_regex = '/<([0-9]+)>/i';
$allow_gid = $matches[1];
preg_match_all($acl_regex, defaults($user, 'deny_cid', ''), $matches); preg_match_all($acl_regex, defaults($user, 'allow_cid', ''), $matches);
$deny_cid = $matches[1]; $allow_cid = $matches[1];
preg_match_all($acl_regex, defaults($user, 'deny_gid', ''), $matches); preg_match_all($acl_regex, defaults($user, 'allow_gid', ''), $matches);
$deny_gid = $matches[1]; $allow_gid = $matches[1];
preg_match_all($acl_regex, defaults($user, 'deny_cid', ''), $matches);
Contact::pruneUnavailable($allow_cid); $deny_cid = $matches[1];
preg_match_all($acl_regex, defaults($user, 'deny_gid', ''), $matches);
return [ $deny_gid = $matches[1];
'allow_cid' => $allow_cid,
'allow_gid' => $allow_gid, // Reformats the ACL data so that it is accepted by the JS frontend
'deny_cid' => $deny_cid, array_walk($allow_cid, 'self::fixACL');
'deny_gid' => $deny_gid, array_walk($allow_gid, 'self::fixACL');
]; array_walk($deny_cid, 'self::fixACL');
} array_walk($deny_gid, 'self::fixACL');
/** Contact::pruneUnavailable($allow_cid);
* Return the full jot ACL selector HTML
* return [
* @param array $user 'allow_cid' => $allow_cid,
* @param bool $show_jotnets 'allow_gid' => $allow_gid,
* @return string 'deny_cid' => $deny_cid,
*/ 'deny_gid' => $deny_gid,
public static function getFullSelectorHTML(array $user = null, $show_jotnets = false) ];
{ }
$perms = self::getDefaultUserPermissions($user);
/**
$jotnets = ''; * Return the full jot ACL selector HTML
if ($show_jotnets) { *
$imap_disabled = !function_exists('imap_open') || Config::get('system', 'imap_disabled'); * @param array $user
* @param bool $show_jotnets
$mail_enabled = false; * @return string
$pubmail_enabled = false; */
public static function getFullSelectorHTML(array $user = null, $show_jotnets = false)
if (!$imap_disabled) { {
$mailacct = dba::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]); $perms = self::getDefaultUserPermissions($user);
if (DBM::is_result($mailacct)) {
$mail_enabled = true; $jotnets = '';
$pubmail_enabled = !empty($mailacct['pubmail']); if ($show_jotnets) {
} $imap_disabled = !function_exists('imap_open') || Config::get('system', 'imap_disabled');
}
$mail_enabled = false;
if (empty($user['hidewall'])) { $pubmail_enabled = false;
if ($mail_enabled) {
$selected = $pubmail_enabled ? ' checked="checked"' : ''; if (!$imap_disabled) {
$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . L10n::t("Post to Email") . '</div>'; $mailacct = dba::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
} if (DBM::is_result($mailacct)) {
$mail_enabled = true;
Addon::callHooks('jot_networks', $jotnets); $pubmail_enabled = !empty($mailacct['pubmail']);
} else { }
$jotnets .= L10n::t('Connectors disabled, since "%s" is enabled.', }
L10n::t('Hide your profile details from unknown viewers?'));
} if (empty($user['hidewall'])) {
} if ($mail_enabled) {
$selected = $pubmail_enabled ? ' checked="checked"' : '';
$tpl = get_markup_template('acl_selector.tpl'); $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . L10n::t("Post to Email") . '</div>';
$o = replace_macros($tpl, [ }
'$showall' => L10n::t('Visible to everybody'),
'$show' => L10n::t('show'), Addon::callHooks('jot_networks', $jotnets);
'$hide' => L10n::t('don\'t show'), } else {
'$allowcid' => json_encode($perms['allow_cid']), $jotnets .= L10n::t('Connectors disabled, since "%s" is enabled.',
'$allowgid' => json_encode($perms['allow_gid']), L10n::t('Hide your profile details from unknown viewers?'));
'$denycid' => json_encode($perms['deny_cid']), }
'$denygid' => json_encode($perms['deny_gid']), }
'$networks' => $show_jotnets, logger('Blubb: '.json_encode($perms));
'$emailcc' => L10n::t('CC: email addresses'), $tpl = get_markup_template('acl_selector.tpl');
'$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'), $o = replace_macros($tpl, [
'$jotnets' => $jotnets, '$showall' => L10n::t('Visible to everybody'),
'$aclModalTitle' => L10n::t('Permissions'), '$show' => L10n::t('show'),
'$aclModalDismiss' => L10n::t('Close'), '$hide' => L10n::t('don\'t show'),
'$features' => [ '$allowcid' => json_encode($perms['allow_cid']),
'aclautomention' => Feature::isEnabled($user['uid'], 'aclautomention') ? 'true' : 'false' '$allowgid' => json_encode($perms['allow_gid']),
], '$denycid' => json_encode($perms['deny_cid']),
]); '$denygid' => json_encode($perms['deny_gid']),
'$networks' => $show_jotnets,
return $o; '$emailcc' => L10n::t('CC: email addresses'),
} '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
'$jotnets' => $jotnets,
/** '$aclModalTitle' => L10n::t('Permissions'),
* Searching for global contacts for autocompletion '$aclModalDismiss' => L10n::t('Close'),
* '$features' => [
* @brief Searching for global contacts for autocompletion 'aclautomention' => Feature::isEnabled($user['uid'], 'aclautomention') ? 'true' : 'false'
* @param string $search Name or part of a name or nick ],
* @param string $mode Search mode (e.g. "community") ]);
* @return array with the search results
*/ return $o;
public static function contactAutocomplete($search, $mode) }
{
if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) { /**
return []; * Searching for global contacts for autocompletion
} *
* @brief Searching for global contacts for autocompletion
// don't search if search term has less than 2 characters * @param string $search Name or part of a name or nick
if (!$search || mb_strlen($search) < 2) { * @param string $mode Search mode (e.g. "community")
return []; * @return array with the search results
} */
public static function contactAutocomplete($search, $mode)
if (substr($search, 0, 1) === '@') { {
$search = substr($search, 1); if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
} return [];
}
// check if searching in the local global contact table is enabled
if (Config::get('system', 'poco_local_search')) { // don't search if search term has less than 2 characters
$return = GContact::searchByName($search, $mode); if (!$search || mb_strlen($search) < 2) {
} else { return [];
$a = self::getApp(); }
$p = $a->pager['page'] != 1 ? '&p=' . $a->pager['page'] : '';
if (substr($search, 0, 1) === '@') {
$response = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search)); $search = substr($search, 1);
if ($response['success']) { }
$lsearch = json_decode($response['body'], true);
if (!empty($lsearch['results'])) { // check if searching in the local global contact table is enabled
$return = $lsearch['results']; if (Config::get('system', 'poco_local_search')) {
} $return = GContact::searchByName($search, $mode);
} } else {
} $a = self::getApp();
$p = $a->pager['page'] != 1 ? '&p=' . $a->pager['page'] : '';
return defaults($return, []);
} $response = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search));
} if ($response['success']) {
$lsearch = json_decode($response['body'], true);
if (!empty($lsearch['results'])) {
$return = $lsearch['results'];
}
}
}
return defaults($return, []);
}
}