strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Account for the PUBLIC value for id parameter in Depository\PermissionSet::selectOneById

Browse source
This commit is contained in:
Hypolite Petovan 2021-10-16 15:23:40 -04:00
parent 907f45b0f4
commit ca2c73a2cd
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/ProfileField.php
View file

@ -65,7 +65,7 @@ class ProfileField extends BaseModel
switch ($name) { switch ($name) {
case 'permissionSet': case 'permissionSet':
if (empty($this->permissionSet)) { if (empty($this->permissionSet)) {
$permissionSet = $this->permissionSetDepository->selectOneById($this->psid); $permissionSet = $this->permissionSetDepository->selectOneById($this->psid, $this->uid);
if ($permissionSet->uid !== $this->uid) { if ($permissionSet->uid !== $this->uid) {
throw new NotFoundException(sprintf('PermissionSet %d (user-id: %d) for ProfileField %d (user-id: %d) is invalid.', $permissionSet->id, $permissionSet->uid, $this->id, $this->uid)); throw new NotFoundException(sprintf('PermissionSet %d (user-id: %d) for ProfileField %d (user-id: %d) is invalid.', $permissionSet->id, $permissionSet->uid, $this->id, $this->uid));
} }

2
src/Module/PermissionTooltip.php
View file

@ -39,7 +39,7 @@ class PermissionTooltip extends \Friendica\BaseModule
} }
if (isset($model['psid'])) { if (isset($model['psid'])) {
$permissionSet = DI::permissionSet()->selectOneById($model['psid']); $permissionSet = DI::permissionSet()->selectOneById($model['psid'], $model['uid']);
$model['allow_cid'] = $permissionSet->allow_cid; $model['allow_cid'] = $permissionSet->allow_cid;
$model['allow_gid'] = $permissionSet->allow_gid; $model['allow_gid'] = $permissionSet->allow_gid;
$model['deny_cid'] = $permissionSet->deny_cid; $model['deny_cid'] = $permissionSet->deny_cid;

14
src/Security/PermissionSet/Depository/PermissionSet.php
View file

@ -89,13 +89,21 @@ class PermissionSet extends BaseDepository
} }
/** /**
* @param int $id * @param int $id A permissionset table row id or self::PUBLIC
* * @param int|null $uid Should be provided when id can be self::PUBLIC
* @return Entity\PermissionSet * @return Entity\PermissionSet
* @throws NotFoundException * @throws NotFoundException
*/ */
public function selectOneById(int $id): Entity\PermissionSet public function selectOneById(int $id, int $uid = null): Entity\PermissionSet
{ {
if ($id === self::PUBLIC) {
if (empty($uid)) {
throw new \InvalidArgumentException('Missing uid for Public permission set instantiation');
}
return $this->factory->createFromString($uid);
}
return $this->selectOne(['id' => $id]); return $this->selectOne(['id' => $id]);
} }