friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Fix permissions when viewing photos, applying same fix to items as well

This commit is contained in:
Michael 2019-09-27 05:49:23 +00:00
parent abecf62f2d
commit 3dd94355b7
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/photos.php
View File

@ -88,7 +88,7 @@ function photos_init(App $a) {
$ret['albums'] = []; $ret['albums'] = [];
foreach ($albums as $k => $album) { foreach ($albums as $k => $album) {
//hide profile photos to others //hide profile photos to others
if (!$is_owner && !remote_user() && ($album['album'] == L10n::t('Profile Photos'))) if (!$is_owner && !remote_user($a->profile_uid) && ($album['album'] == L10n::t('Profile Photos')))
continue; continue;
$entry = [ $entry = [
'text' => $album['album'], 'text' => $album['album'],
@ -1573,7 +1573,7 @@ function photos_content(App $a)
$twist = false; $twist = false;
foreach ($r as $rr) { foreach ($r as $rr) {
//hide profile photos to others //hide profile photos to others
if (!$is_owner && !remote_user() && ($rr['album'] == L10n::t('Profile Photos'))) { if (!$is_owner && !remote_user($owner_uid) && ($rr['album'] == L10n::t('Profile Photos'))) {
continue; continue;
} }

6
src/Model/Item.php
View File

@ -3263,7 +3263,11 @@ class Item extends BaseObject
public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null, $remote_cid = null) public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null, $remote_cid = null)
{ {
$local_user = local_user(); $local_user = local_user();
$remote_user = remote_user(); $remote_user = remote_user($owner_id);
if (is_null($remote_cid)) {
$remote_cid = $remote_user;
}
/* /*
* Construct permissions * Construct permissions

22
src/Util/Security.php
View File

@ -51,7 +51,7 @@ class Security extends BaseObject
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `user`.`uid` = `contact`.`uid` $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `user`.`blockwall` = 0 AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1", AND `user`.`blockwall` = 0 AND `readonly` = 0 AND (`contact`.`rel` IN (%d , %d) OR `user`.`page-flags` = %d) LIMIT 1",
intval($owner), intval($owner),
intval($cid), intval($cid),
intval(Contact::SHARING), intval(Contact::SHARING),
@ -75,7 +75,7 @@ class Security extends BaseObject
public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null) public static function getPermissionsSQLByUserId($owner_id, $remote_verified = false, $groups = null)
{ {
$local_user = local_user(); $local_user = local_user();
$remote_user = remote_user(); $remote_user = remote_user($owner_id);
/* /*
* Construct permissions * Construct permissions
@ -83,10 +83,9 @@ class Security extends BaseObject
* default permissions - anonymous user * default permissions - anonymous user
*/ */
$sql = " AND allow_cid = '' $sql = " AND allow_cid = ''
AND allow_gid = '' AND allow_gid = ''
AND deny_cid = '' AND deny_cid = ''
AND deny_gid = '' AND deny_gid = '' ";
";
/* /*
* Profile owner - everything is visible * Profile owner - everything is visible
@ -101,6 +100,8 @@ class Security extends BaseObject
* done this and passed the groups into this function. * done this and passed the groups into this function.
*/ */
} elseif ($remote_user) { } elseif ($remote_user) {
$cid = \Friendica\Core\Session::getVisitorContactIDForUserID($owner_id);
/* /*
* Authenticated visitor. Unless pre-verified, * Authenticated visitor. Unless pre-verified,
* check that the contact belongs to this $owner_id * check that the contact belongs to this $owner_id
@ -110,8 +111,6 @@ class Security extends BaseObject
*/ */
if (!$remote_verified) { if (!$remote_verified) {
$cid = \Friendica\Core\Session::getVisitorContactIDForUserID($owner_id);
if ($cid && DBA::exists('contact', ['id' => $cid, 'uid' => $owner_id, 'blocked' => false])) { if ($cid && DBA::exists('contact', ['id' => $cid, 'uid' => $owner_id, 'blocked' => false])) {
$remote_verified = true; $remote_verified = true;
$groups = Group::getIdsByContactId($cid); $groups = Group::getIdsByContactId($cid);
@ -128,10 +127,8 @@ class Security extends BaseObject
} }
$sql = sprintf( $sql = sprintf(
" AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s') " AND (NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s')
AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') ) AND (allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR (allow_cid = '' AND allow_gid = ''))) ",
)
",
intval($cid), intval($cid),
DBA::escape($gs), DBA::escape($gs),
intval($cid), intval($cid),
@ -141,5 +138,4 @@ class Security extends BaseObject
} }
return $sql; return $sql;
} }
} }