Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 09:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove support for user.parent-uid = 0

Browse source 
- uid = 0 is the system user which isn't supposed to be the parent-uid of all the non-delegate users
This commit is contained in:
Hypolite Petovan 2023-05-27 18:19:02 -04:00
parent 70674f2ecc
commit fc09017dd1
4 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Delegation.php
View file

@ -53,7 +53,7 @@ class Delegation extends BaseModule
}
}
$identity = intval($_POST['identity'] ?? 0);
$identity = intval($request['identity'] ?? 0);
if (!$identity) {
return;
}
@ -76,16 +76,16 @@ class Delegation extends BaseModule
$user = DBA::selectFirst('user', [], ['uid' => $identity, 'parent-uid' => $orig_record['uid']]);
// Check if the target user is one of our siblings
if (!DBA::isResult($user) && ($orig_record['parent-uid'] != 0)) {
if (!DBA::isResult($user) && $orig_record['parent-uid']) {
$user = DBA::selectFirst('user', [], ['uid' => $identity, 'parent-uid' => $orig_record['parent-uid']]);
}
// Check if it's our parent or our own user
if (!DBA::isResult($user)
&& (
$orig_record['parent-uid'] != 0 && $orig_record['parent-uid'] == $identity
$orig_record['parent-uid'] && $orig_record['parent-uid'] === $identity
||
$orig_record['uid'] != 0 && $orig_record['uid'] == $identity
$orig_record['uid'] && $orig_record['uid'] === $identity
)
) {
$user = User::getById($identity);

10
src/Module/Settings/Delegation.php
View file

@ -43,11 +43,13 @@ class Delegation extends BaseSettings
BaseModule::checkFormSecurityTokenRedirectOnError('settings/delegation', 'delegate');
$parent_uid = (int)$_POST['parent_user'] ?? 0;
$parent_password = $_POST['parent_password'] ?? '';
$parent_uid = $request['parent_user'] ?? null;
$parent_password = $request['parent_password'] ?? '';
if ($parent_uid != 0) {
if ($parent_uid) {
try {
// An integer value will trigger the direct user query on uid in User::getAuthenticationInfo
$parent_uid = (int)$parent_uid;
User::getIdFromPasswordAuthentication($parent_uid, $parent_password);
DI::sysmsg()->addInfo(DI::l10n()->t('Delegation successfully granted.'));
} catch (\Exception $ex) {
@ -142,7 +144,7 @@ class Delegation extends BaseSettings
$parents = [0 => DI::l10n()->t('No parent user')];
$fields = ['uid', 'username', 'nickname'];
$condition = ['email' => $user['email'], 'verified' => true, 'blocked' => false, 'parent-uid' => 0];
$condition = ['email' => $user['email'], 'verified' => true, 'blocked' => false, 'parent-uid' => null];
$parent_users = DBA::selectToArray('user', $fields, $condition);
foreach($parent_users as $parent) {
if ($parent['uid'] != DI::userSession()->getLocalUserId()) {