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

Merge pull request #6235 from shleeable/JobBatchv1-FollowPipeline

Browse Source 
JobBatch v1- Follow pipelines defensive checks
pull/6261/head
dansup 2 weeks ago committed by GitHub
parent 27daf6ec2b fe63326479
commit 87e2953b19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 64 additions and 16 deletions
Show Stats Download Patch File Download Diff File

40
app/Jobs/FollowPipeline/FollowAcceptPipeline.php
Unescape Escape View File

@ -8,7 +8,8 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Cache, Log;
use Cache;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Redis;
use League\Fractal;
use League\Fractal\Serializer\ArraySerializer;
@ -47,22 +48,45 @@ class FollowAcceptPipeline implements ShouldQueue
public function handle()
{
$follow = $this->followRequest;
// Verify follow request exists
if (!$follow) {
Log::info("FollowAcceptPipeline: Follow request no longer exists, skipping job");
return;
}
$actor = $follow->actor;
$target = $follow->target;
// Verify actor and target exist
if (!$actor) {
Log::info("FollowAcceptPipeline: Actor no longer exists for follow request {$follow->id}, skipping job");
return;
}
if (!$target) {
Log::info("FollowAcceptPipeline: Target no longer exists for follow request {$follow->id}, skipping job");
return;
}
if($actor->domain == null || $actor->inbox_url == null || !$target->private_key) {
Log::info("FollowAcceptPipeline: Missing required fields for follow request {$follow->id}, skipping job");
return;
}
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($follow, new AcceptFollow());
$activity = $fractal->createData($resource)->toArray();
$url = $actor->sharedInbox ?? $actor->inbox_url;
try {
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($follow, new AcceptFollow());
$activity = $fractal->createData($resource)->toArray();
$url = $actor->sharedInbox ?? $actor->inbox_url;
Helpers::sendSignedObject($target, $url, $activity);
Helpers::sendSignedObject($target, $url, $activity);
$follow->delete();
$follow->delete();
} catch (\Exception $e) {
Log::warning("FollowAcceptPipeline: Failed to process follow request {$follow->id}: " . $e->getMessage());
throw $e;
}
return;
}

40
app/Jobs/FollowPipeline/FollowRejectPipeline.php
Unescape Escape View File

@ -8,7 +8,8 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Cache, Log;
use Cache;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Redis;
use League\Fractal;
use League\Fractal\Serializer\ArraySerializer;
@ -47,22 +48,45 @@ class FollowRejectPipeline implements ShouldQueue
public function handle()
{
$follow = $this->followRequest;
// Verify follow request exists
if (!$follow) {
Log::info("FollowRejectPipeline: Follow request no longer exists, skipping job");
return;
}
$actor = $follow->actor;
$target = $follow->target;
// Verify actor and target exist
if (!$actor) {
Log::info("FollowRejectPipeline: Actor no longer exists for follow request {$follow->id}, skipping job");
return;
}
if (!$target) {
Log::info("FollowRejectPipeline: Target no longer exists for follow request {$follow->id}, skipping job");
return;
}
if($actor->domain == null || $actor->inbox_url == null || !$target->private_key) {
Log::info("FollowRejectPipeline: Missing required fields for follow request {$follow->id}, skipping job");
return;
}
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($follow, new RejectFollow());
$activity = $fractal->createData($resource)->toArray();
$url = $actor->sharedInbox ?? $actor->inbox_url;
try {
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($follow, new RejectFollow());
$activity = $fractal->createData($resource)->toArray();
$url = $actor->sharedInbox ?? $actor->inbox_url;
Helpers::sendSignedObject($target, $url, $activity);
Helpers::sendSignedObject($target, $url, $activity);
$follow->delete();
$follow->delete();
} catch (\Exception $e) {
Log::warning("FollowRejectPipeline: Failed to process follow request {$follow->id}: " . $e->getMessage());
throw $e;
}
return;
}

Write Preview
Loading…
Cancel
Save