Skip to content

Fix Relay tests discard inbox responses, hiding 500 Internal Server Errors #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dahlia merged 4 commits into from
Sep 24, 2026
+113 −43
Merged

Fix Relay tests discard inbox responses, hiding 500 Internal Server Errors #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd9943e
Use intercepted IPv6 inboxes for relay fixtures
sij411 Sep 22, 2026
c83fe40
Assert relay inbox response statuses
sij411 Sep 22, 2026
74cab84
Verify Accept delivery in relay approval tests
sij411 Sep 22, 2026
1ce0eb8
Tighten relay fixtures and actor assertions
sij411 Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 60 additions & 23 deletions packages/relay/src/litepub.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const mockDocumentLoader = async (url: string): Promise<RemoteDocument> => {
id: url,
type: "Person",
preferredUsername: "alice",
inbox: "https://remote.example.com/users/alice/inbox",
inbox: aliceInbox,
publicKey: {
id: "https://remote.example.com/users/alice#main-key",
owner: url.replace(/#main-key$/, ""),
Expand Down Expand Up @@ -119,6 +119,7 @@ const davePublicKey = {
// before the request is made. mastodon.test.ts uses a disjoint /48 so that
// neither file's interceptor can swallow the other's deliveries.
const INBOX_PREFIX = "https://[2001:db8:1::";
const aliceInbox = `${INBOX_PREFIX}4]/users/alice/inbox`;
const daveInbox = `${INBOX_PREFIX}1]/users/dave/inbox`;
const pendingInbox = `${INBOX_PREFIX}2]/users/bob/inbox`;
const acceptedInbox = `${INBOX_PREFIX}3]/users/carol/inbox`;
Expand All @@ -141,6 +142,25 @@ function recordInbox(inbox: string): DeliveredRequest[] {
return recorded;
}

const aliceDeliveries = recordInbox(aliceInbox);

function assertAcceptDelivered(
follow: Follow,
deliveries: readonly DeliveredRequest[] = aliceDeliveries,
): void {
const accepts = deliveries.filter(({ body }) =>
body.type === "Accept" && body.object?.id === follow.id?.href
);
strictEqual(accepts.length, 1, "Expected exactly one Accept for this Follow");
strictEqual(accepts[0].method, "POST");
strictEqual(accepts[0].body.actor, "https://relay.example.com/users/relay");
strictEqual(accepts[0].body.object.type, "Follow");
strictEqual(
accepts[0].body.object.actor.id,
follow.actorId?.href,
);
}

const nextFetch = globalThis.fetch;
globalThis.fetch = (async (input: URL | RequestInfo, init?: RequestInit) => {
const request = input instanceof Request ? input : new Request(input, init);
Expand Down Expand Up @@ -360,7 +380,10 @@ describe("LitePubRelay", () => {
});

const followActivity = new Follow({
id: new URL("https://remote.example.com/activities/follow/1"),
// Isolate delivery assertions from other tests and loop iterations.
id: new URL(
`https://remote.example.com/activities/follow/${crypto.randomUUID()}`,
),
actor: follower.id,
object: new URL("https://relay.example.com/users/relay"),
});
Expand All @@ -383,10 +406,8 @@ describe("LitePubRelay", () => {

const deliveredActivities = recordInbox(daveInbox);
const response = await relay.fetch(request);
ok(
response.status === 200 || response.status === 202,
`Unexpected inbox response status: ${response.status}`,
);
strictEqual(response.status, 202);
assertAcceptDelivered(followActivity, deliveredActivities);

// Verify handler was called
strictEqual(handlerCalled, true);
Expand Down Expand Up @@ -434,7 +455,7 @@ describe("LitePubRelay", () => {
const follower = new Person({
id: new URL("https://remote.example.com/users/alice"),
preferredUsername: "alice",
inbox: new URL("https://remote.example.com/users/alice/inbox"),
inbox: new URL(aliceInbox),
});

const followActivity = new Follow({
Expand All @@ -459,7 +480,8 @@ describe("LitePubRelay", () => {
rsaPublicKey.id,
);

await relay.fetch(request);
const response = await relay.fetch(request);
strictEqual(response.status, 202);

// Verify follower was NOT stored
const followerData = await kv.get([
Expand All @@ -483,12 +505,15 @@ describe("LitePubRelay", () => {
const follower = new Person({
id: new URL("https://remote.example.com/users/alice"),
preferredUsername: "alice",
inbox: new URL("https://remote.example.com/users/alice/inbox"),
inbox: new URL(aliceInbox),
});

// Public follow activity
const followActivity = new Follow({
id: new URL("https://remote.example.com/activities/follow/1"),
// Isolate delivery assertions from other tests and loop iterations.
id: new URL(
`https://remote.example.com/activities/follow/${crypto.randomUUID()}`,
),
actor: follower.id,
object: new URL("https://www.w3.org/ns/activitystreams#Public"),
});
Expand All @@ -509,7 +534,9 @@ describe("LitePubRelay", () => {
rsaPublicKey.id,
);

await relay.fetch(request);
const response = await relay.fetch(request);
strictEqual(response.status, 202);
assertAcceptDelivered(followActivity);

// Verify follower was stored with "pending" state
const followerData = await kv.get([
Expand Down Expand Up @@ -553,7 +580,8 @@ describe("LitePubRelay", () => {
rsaPublicKey.id,
);

await relay.fetch(request);
const response = await relay.fetch(request);
strictEqual(response.status, 202);

// Verify follower was NOT stored
const followerData = await kv.get([
Expand Down Expand Up @@ -593,7 +621,10 @@ describe("LitePubRelay", () => {
strictEqual(await relay.getFollower(followerId), null);

const followActivity = new Follow({
id: new URL("https://remote.example.com/activities/follow/1"),
// Isolate delivery assertions from other tests and loop iterations.
id: new URL(
`https://remote.example.com/activities/follow/${crypto.randomUUID()}`,
),
actor: new URL(followerId),
object: new URL("https://relay.example.com/users/relay"),
});
Expand All @@ -610,7 +641,9 @@ describe("LitePubRelay", () => {
rsaPublicKey.id,
);

await relay.fetch(request);
const response = await relay.fetch(request);
strictEqual(response.status, 202);
assertAcceptDelivered(followActivity);

strictEqual(handlerCallCount, 1);
const follower = await relay.getFollower(followerId);
Expand Down Expand Up @@ -639,7 +672,7 @@ describe("LitePubRelay", () => {
const follower = new Person({
id: new URL("https://remote.example.com/users/alice"),
preferredUsername: "alice",
inbox: new URL("https://remote.example.com/users/alice/inbox"),
inbox: new URL(aliceInbox),
});
await kv.set(
["follower", "https://remote.example.com/users/alice"],
Expand Down Expand Up @@ -667,7 +700,8 @@ describe("LitePubRelay", () => {
rsaPublicKey.id,
);

await relay.fetch(request);
const response = await relay.fetch(request);
strictEqual(response.status, 202);

strictEqual(handlerCallCount, 0);
const followerData = await kv.get([
Expand All @@ -685,7 +719,7 @@ describe("LitePubRelay", () => {
const follower = new Person({
id: new URL("https://remote.example.com/users/alice"),
preferredUsername: "alice",
inbox: new URL("https://remote.example.com/users/alice/inbox"),
inbox: new URL(aliceInbox),
});

// Pre-populate with pending follower
Expand Down Expand Up @@ -730,7 +764,8 @@ describe("LitePubRelay", () => {
rsaPublicKey.id,
);

await relay.fetch(request);
const response = await relay.fetch(request);
strictEqual(response.status, 202);

// Verify follower state changed to "accepted"
const followerData = await kv.get([
Expand Down Expand Up @@ -791,7 +826,8 @@ describe("LitePubRelay", () => {
rsaPublicKey.id,
);

await relay.fetch(request);
const response = await relay.fetch(request);
strictEqual(response.status, 202);

deepStrictEqual(await kv.get(["follower", followerId]), invalidRow);
}
Expand All @@ -805,7 +841,7 @@ describe("LitePubRelay", () => {
const follower = new Person({
id: new URL(followerId),
preferredUsername: "alice",
inbox: new URL("https://remote.example.com/users/alice/inbox"),
inbox: new URL(aliceInbox),
});

await kv.set(
Expand Down Expand Up @@ -849,7 +885,8 @@ describe("LitePubRelay", () => {
rsaPublicKey.id,
);

await relay.fetch(request);
const response = await relay.fetch(request);
strictEqual(response.status, 202);

const followerData = await kv.get(["follower", followerId]);
strictEqual(followerData, undefined);
Expand All @@ -864,7 +901,7 @@ describe("LitePubRelay", () => {
const follower = new Person({
id: new URL(followerId),
preferredUsername: "alice",
inbox: new URL("https://remote.example.com/users/alice/inbox"),
inbox: new URL(aliceInbox),
});

await kv.set(
Expand Down Expand Up @@ -1314,7 +1351,7 @@ describe("LitePubRelay", () => {
id: new URL(followerId),
preferredUsername: "alice",
name: "Alice Wonderland",
inbox: new URL("https://remote.example.com/users/alice/inbox"),
inbox: new URL(aliceInbox),
});

await kv.set(
Expand Down
Loading
Loading