UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update ProcessMovePipeline

Browse source
This commit is contained in:
Daniel Supernault 2024-09-09 00:22:24 -06:00
parent 5fb5054d64
commit cfb95f6897
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/Jobs/MovePipeline/ProcessMovePipeline.php
View file

@ -74,16 +74,18 @@ class ProcessMovePipeline implements ShouldQueue
throw new Exception('Activitypub not enabled');
}
if (! self::checkTarget()) {
$validTarget = $this->checkTarget();
if (! $validTarget) {
Log::info('pmp: invalid target');
throw new Exception('Invalid target');
}
if (! self::checkActor()) {
$validActor = $this->checkActor();
if (! $validActor) {
Log::info('pmp: invalid actor');
throw new Exception('Invalid actor');
}
return;
}
protected function checkTarget()
@ -104,7 +106,7 @@ class ProcessMovePipeline implements ShouldQueue
}
if (is_string($res['alsoKnownAs'])) {
return self::lowerTrim($res['alsoKnownAs']) === self::lowerTrim($this->activity);
return $this->lowerTrim($res['alsoKnownAs']) === $this->lowerTrim($this->activity);
}
if (is_array($res['alsoKnownAs'])) {
@ -127,7 +129,7 @@ class ProcessMovePipeline implements ShouldQueue
{
$res = ActivityPubFetchService::fetchRequest($this->activity, true);
if (! $res || ! isset($res['movedTo'])) {
if (! $res || ! isset($res['movedTo']) || empty($res['movedTo'])) {
Log::info('[AP][INBOX][MOVE] actor_movedTo failure');
return false;
@ -141,7 +143,18 @@ class ProcessMovePipeline implements ShouldQueue
}
if (is_string($res['movedTo'])) {
return self::lowerTrim($res['movedTo']) === self::lowerTrim($this->target);
$match = $this->lowerTrim($res['movedTo']) === $this->lowerTrim($this->target);
if (! $match) {
$msg = json_encode([
'movedTo' => $res['movedTo'],
'target' => $this->target,
]);
Log::info('[AP][INBOX][MOVE] invalid actor match.'.$msg);
return false;
}
return $match;
}
return false;