GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[ENTITY][Actor] Basic check if can admin for remote actors

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro 2021-12-28 15:02:03 +00:00
parent b7c82b9dcb
commit 9585472679
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/ActivityPub/ActivityPub.php
View File

@ -152,6 +152,24 @@ class ActivityPub extends Plugin
return Event::next; return Event::next;
} }
/**
* Fill Actor->canAdmin() for Actors that came from ActivityPub
*/
public function onFreeNetworkActorCanAdmin(Actor $actor, Actor $other, bool &$canAdmin): bool
{
// Are both in AP?
if (
!\is_null($ap_actor = ActivitypubActor::getByPK(['actor_id' => $actor->getId()]))
&& !\is_null($ap_other = ActivitypubActor::getByPK(['actor_id' => $other->getId()]))
) {
// Are they both in the same server?
$canAdmin = parse_url($ap_actor->getUri(), PHP_URL_HOST) === parse_url($ap_other->getUri(), PHP_URL_HOST);
return Event::stop;
}
return Event::next;
}
/** /**
* Overload core endpoints to make resources available in ActivityStreams 2.0 * Overload core endpoints to make resources available in ActivityStreams 2.0
* *

38
src/Entity/Actor.php
View File

@ -517,22 +517,28 @@ class Actor extends Entity
*/ */
public function canAdmin(self $other): bool public function canAdmin(self $other): bool
{ {
switch ($other->getType()) { if ($this->getIsLocal()) {
case self::PERSON: switch ($other->getType()) {
return $this->getId() === $other->getId(); case self::PERSON:
case self::GROUP: return $this->getId() === $other->getId();
return Cache::get( case self::GROUP:
self::cacheKeys($this->getId(), $other->getId())['can-admin'], return Cache::get(
function () use ($other) { self::cacheKeys($this->getId(), $other->getId())['can-admin'],
try { function () use ($other) {
return DB::findOneBy('group_member', ['group_id' => $other->getId(), 'actor_id' => $this->getId()])->getIsAdmin(); try {
} catch (NotFoundException) { return DB::findOneBy('group_member', ['group_id' => $other->getId(), 'actor_id' => $this->getId()])->getIsAdmin();
return false; } catch (NotFoundException) {
} return false;
}, }
); },
default: );
return false; default:
return false;
}
} else {
$canAdmin = false;
Event::handle('FreeNetworkActorCanAdmin', [$this, $other, &$canAdmin]);
return $canAdmin;
} }
} }