Node.js based forum software built for the modern web
fix(activitypub): accept same-domain legacy actors via self-link fallback
Julian Lam6cca6a410009
diff --git a/src/activitypub/helpers.js b/src/activitypub/helpers.jsindex 3c38b876a5..9d8cab650d 100644--- a/src/activitypub/helpers.js+++ b/src/activitypub/helpers.js@@ -56,6 +56,27 @@ Helpers.log = (message) => {}};+Helpers._hasValidSelfLink = (actorId, actor) => {+ // Check if the actor document has a self-link pointing to its own URI.+ // This is used as a fallback for legacy actors when WebFinger query fails.+ // We look for an explicit { rel: 'self' } link, NOT just a `url` field+ // which any actor can set regardless of whether it's a valid self-reference.+ if (!actor || typeof actor !== 'object') {+ return false;+ }++ // Check for `link` array with explicit rel=self pointing to actorId+ if (Array.isArray(actor.link)) {+ return actor.link.some(+ l =>+ (l && typeof l === 'object' && l.rel === 'self' && l.href === actorId) ||+ (typeof l === 'string' && l === actorId),+ );+ }++ return false;+};+Helpers.isUri = (value) => {if (typeof value !== 'string') {value = String(value);@@ -212,7 +233,20 @@ Helpers.verifyActorWebfinger = async (actorId, actor) => {// Step 1: Backreference — non-strict query on domain B (the actor's id host).// This allows the WebFinger subject to point elsewhere (split-domain forward target).- const backref = await Helpers.query(`${preferredUsername}@${idHostname}`, { strict: false });+ let backref = await Helpers.query(`${preferredUsername}@${idHostname}`, { strict: false });++ // Fallback for legacy actors (pre-split-domain): if WebFinger query fails, check+ // the actor document for a self-link pointing to its own URI. This handles actors+ // that were asserted before split-domain logic required WebFinger backreferences.+ if (!backref && Helpers._hasValidSelfLink(actorId, actor)) {+ backref = {+ actorUri: actorId,+ subject: `acct:${preferredUsername}@${idHostname}`,+ hostname: idHostname,+ subjectHostname: idHostname,+ splitDomain: false,+ };+ }if (!backref) {return { ok: false, splitDomain: false, canonicalHandle: null, reason: 'no-backreference' };}diff --git a/test/activitypub/split-domain.js b/test/activitypub/split-domain.jsindex 5e77f1e7e8..7ae94311d2 100644--- a/test/activitypub/split-domain.js+++ b/test/activitypub/split-domain.js@@ -159,6 +159,18 @@ describe('verifyActorWebfinger', () => {assert.equal(verdict.reason, 'no-backreference');});+ it('accepts same-domain legacy actors via self-link fallback (upgrade to split-domain)', async () => {+ const { domainB, username, actorUri } = Helpers.genSplitDomain();+ // Seed actor with a link array containing rel=self (simulates real AP actor docs)+ const actor = Helpers.seedActor(actorUri, { preferredUsername: username, link: [{ rel: 'self', href: actorUri, type: 'application/activity+json' }] });+ const verdict = await activitypub.helpers.verifyActorWebfinger(+ actorUri, activitypub._cache.get(`0;${actorUri}`));+ assert.ok(verdict);+ assert.ok(verdict.ok);+ assert.equal(verdict.canonicalHandle, `${username}@${domainB}`);+ assert.equal(verdict.splitDomain, false);+ });+it('rejects with subject-mismatch when backreference self-link points elsewhere', async () => {const { domainB, username, actorUri } = Helpers.genSplitDomain();const spoofedUri = `https://${domainB}/uid/spoofed_user`;@@ -271,6 +283,20 @@ describe('Actors.assert - hostname mismatch', () => {meta.config.activitypubAllowSplitDomain = orig;assert.equal(result.length, 0);});++ it('upgrades same-domain legacy actors via self-link fallback', async () => {+ const { domainB, username, actorUri } = Helpers.genSplitDomain();+ // Seed actor with link array (rel=self) — simulates real AP actor doc+ const actor = Helpers.seedActor(actorUri, { preferredUsername: username, link: [{ rel: 'self', href: actorUri, type: 'application/activity+json' }] });+ const result = await activitypub.actors.assert([actorUri]);+ assert.ok(Array.isArray(result));+ assert.equal(result.length, 1);+ assert.equal(result[0]._canonicalHandle, `${username}@${domainB}`);+ // Verify profile uses canonical handle+ const profile = await activitypub.mocks.profile(result);+ assert.equal(profile[0].username, `${username}@${domainB}`);+ assert.equal(profile[0].webfinger, undefined); // same-domain → undefined+ });});// ============================================================================