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

test(federation): run AP delivery tests in production env

Browse Source 
ActivityPubDeliveryService::pool() and queueDelivery() only perform HTTP
delivery when app()->environment('production'); outside production they log
and return. The pool/job delivery tests were written before that guard was
added (commit 868e09b64) and never forced production, so no requests were
made and every assertSent/assertSentCount failed (6 failing tests).

Wrap the delivery-exercising tests in a forged production environment
(restored afterwards) and seed the public-ips DNS cache plus an empty
banned-domains cache so validateDestination() passes without a real DNS
lookup or DB query. Seed after factory creation, since the lazy DB refresh
can flush the cache store.

Also fix a by-value capture bug in the onError assertions: the $errors
array was captured through an arrow-fn wrapper, so the inner callback's
by-reference mutations never reached the assertion. Use a regular closure.

No production code changed; the production delivery gate is intended
behavior.
pull/7259/head
Your Name 1 week ago
parent 0b9ef4dba0
commit 7b11b72e1d
2 changed files with 98 additions and 9 deletions
Show Stats Download Patch File Download Diff File

56
tests/Feature/ActivityPubDeliveryServiceTest.php
Unescape Escape View File

@ -3,10 +3,46 @@
use App\Models\User;
use App\Services\ActivityPubDeliveryService;
use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Http;
uses(LazilyRefreshDatabase::class);
/**
* ActivityPubDeliveryService::pool()/queueDelivery() only perform HTTP delivery
* in the production environment; outside production they log and return. Run
* the delivery in a forged production environment so these tests exercise the
* real send path, and restore the environment afterwards.
*/
function deliverInProduction(callable $fn): mixed
{
$app = app();
$previous = $app['env'];
$app['env'] = 'production';
try {
return $fn();
} finally {
$app['env'] = $previous;
}
}
/**
* In production, validateDestination() resolves each host to a public IP and
* checks the banned-domains list. Seed both caches so validation passes without
* a real DNS lookup or DB query. Seed after any User/Profile factory creation,
* since the lazy DB refresh can flush the cache store.
*
* @param array<int, string> $hosts
*/
function seedDeliveryHosts(array $hosts): void
{
foreach ($hosts as $host) {
Cache::put('helpers:url:public-ips:'.hash('xxh128', $host), ['203.0.113.40'], 3600);
}
Cache::put('instances:banned:domains', [], 1209600);
}
describe('ActivityPubDeliveryService::pool()', function () {
it('delivers activity to all audience inboxes via POST', function () {
Http::fake();
@ -15,6 +51,8 @@ describe('ActivityPubDeliveryService::pool()', function () {
$user->refresh();
$profile = $user->profile;
seedDeliveryHosts(['remote1.example', 'remote2.example', 'remote3.example']);
$audience = [
'https://remote1.example/inbox',
'https://remote2.example/inbox',
@ -32,7 +70,7 @@ describe('ActivityPubDeliveryService::pool()', function () {
],
];
ActivityPubDeliveryService::pool($profile, $audience, $activity);
deliverInProduction(fn () => ActivityPubDeliveryService::pool($profile, $audience, $activity));
Http::assertSentCount(3);
@ -54,6 +92,8 @@ describe('ActivityPubDeliveryService::pool()', function () {
$user->refresh();
$profile = $user->profile;
seedDeliveryHosts(['remote.example']);
$audience = ['https://remote.example/inbox'];
$activity = [
@ -63,7 +103,7 @@ describe('ActivityPubDeliveryService::pool()', function () {
'actor' => $profile->permalink(),
];
ActivityPubDeliveryService::pool($profile, $audience, $activity);
deliverInProduction(fn () => ActivityPubDeliveryService::pool($profile, $audience, $activity));
Http::assertSent(function ($request) {
$contentType = $request->header('Content-Type')[0] ?? '';
@ -81,6 +121,8 @@ describe('ActivityPubDeliveryService::pool()', function () {
$user->refresh();
$profile = $user->profile;
seedDeliveryHosts(['remote.example']);
$audience = ['https://remote.example/inbox'];
$activity = [
@ -90,7 +132,7 @@ describe('ActivityPubDeliveryService::pool()', function () {
'actor' => $profile->permalink(),
];
ActivityPubDeliveryService::pool($profile, $audience, $activity);
deliverInProduction(fn () => ActivityPubDeliveryService::pool($profile, $audience, $activity));
Http::assertSent(function ($request) use ($activity) {
$body = json_decode($request->body(), true);
@ -126,6 +168,8 @@ describe('ActivityPubDeliveryService::pool()', function () {
$user->refresh();
$profile = $user->profile;
seedDeliveryHosts(['good.example', 'bad.example']);
$audience = [
'https://good.example/inbox',
'https://bad.example/inbox',
@ -138,9 +182,11 @@ describe('ActivityPubDeliveryService::pool()', function () {
];
$errors = [];
deliverInProduction(function () use ($profile, $audience, $activity, &$errors) {
ActivityPubDeliveryService::pool($profile, $audience, $activity, function ($reason, $index) use (&$errors) {
$errors[] = $index;
});
});
expect($errors)->toHaveCount(1);
});
@ -155,6 +201,8 @@ describe('ActivityPubDeliveryService::pool()', function () {
$user->refresh();
$profile = $user->profile;
seedDeliveryHosts(['remote1.example', 'remote2.example']);
$audience = [
'https://remote1.example/inbox',
'https://remote2.example/inbox',
@ -167,9 +215,11 @@ describe('ActivityPubDeliveryService::pool()', function () {
];
$errors = [];
deliverInProduction(function () use ($profile, $audience, $activity, &$errors) {
ActivityPubDeliveryService::pool($profile, $audience, $activity, function ($reason, $index) use (&$errors) {
$errors[] = $index;
});
});
expect($errors)->toBeEmpty();
});

43
tests/Feature/HttpClientMigrationTest.php
Unescape Escape View File

@ -26,6 +26,41 @@ uses(LazilyRefreshDatabase::class);
|
*/
/**
* ActivityPub delivery only performs HTTP requests in the production
* environment; outside production the service logs and returns. Run the job
* in a forged production environment so delivery is actually attempted, and
* restore the environment afterwards.
*/
function runJobInProduction(callable $fn): void
{
$app = app();
$previous = $app['env'];
$app['env'] = 'production';
try {
$fn();
} finally {
$app['env'] = $previous;
}
}
/**
* In production, delivery validates each destination host (public-IP DNS
* resolution + banned-domain check). Seed both caches so validation passes
* without a real DNS lookup or DB query. Seed after any factory creation, since
* the lazy DB refresh can flush the cache store.
*
* @param array<int, string> $hosts
*/
function seedMigrationDeliveryHosts(array $hosts): void
{
foreach ($hosts as $host) {
Cache::put('helpers:url:public-ips:'.hash('xxh128', $host), ['203.0.113.40'], 3600);
}
Cache::put('instances:banned:domains', [], 1209600);
}
describe('MediaStorageService::head()', function () {
it('returns length and mime on successful HEAD response', function () {
Http::fake([
@ -106,8 +141,10 @@ describe('FanoutDeletePipeline delivery', function () {
Cache::forget('pf:ap:known_instances');
seedMigrationDeliveryHosts(['remote1.example', 'remote2.example']);
$job = new FanoutDeletePipeline($profile);
$job->handle();
runJobInProduction(fn () => $job->handle());
Http::assertSentCount(2);
Http::assertSent(
@ -172,8 +209,10 @@ describe('StatusActivityPubDeliver delivery', function () {
$status->saveQuietly();
$status->refresh();
seedMigrationDeliveryHosts(['remote.example']);
$job = new StatusActivityPubDeliver($status);
$job->handle();
runJobInProduction(fn () => $job->handle());
Http::assertSent(
fn ($request) => $request->url() === 'https://remote.example/inbox'

Write Preview
Loading…
Cancel
Save