Node.js based forum software built for the modern web
fix(activitypub): require completed handshake for relay trust
Julian Lam2b76bc12aa44
diff --git a/src/activitypub/relays.js b/src/activitypub/relays.jsindex fe71537843..b7b7ca6ed3 100644--- a/src/activitypub/relays.js+++ b/src/activitypub/relays.js@@ -8,7 +8,8 @@ const activitypub = module.parent.exports;const Relays = module.exports;Relays.is = async (actor) => {- return db.isSortedSetMember('relays:createtime', actor);+ const score = await db.sortedSetScore('relays:state', actor);+ return typeof score === 'number' && score >= 1;};Relays.list = async () => {@@ -123,12 +124,18 @@ Relays.handshake = async (body) => {if (type === 'Follow') {// Check if NodeBB is the target of the follow (unsolicited relay subscription)if (target === `${nconf.get('url')}/actor`) {- await db.sortedSetAdd('relays:state', -1, actor);- await db.sortedSetAdd('relays:createtime', now.getTime(), actor);+ const score = await db.sortedSetScore('relays:state', actor);+ if (score === null) {+ // New follower+ await db.sortedSetAdd('relays:state', -1, actor);+ await db.sortedSetAdd('relays:createtime', now.getTime(), actor);+ }+ // Already a solicited relay: the follow-back completes the mutual+ // relationship without altering the existing state.} else {- // Confirm relay was added (NodeBB is the follower)- const exists = await db.isSortedSetMember('relays:createtime', actor);- if (!exists) {+ // Only a pending, solicited relay (state 0) may be confirmed+ const score = await db.sortedSetScore('relays:state', actor);+ if (score !== 0) {throw new Error('[[error:api.400]]');}await db.sortedSetIncrBy('relays:state', 1, actor);@@ -146,9 +153,9 @@ Relays.handshake = async (body) => {object: body,});} else if (type === 'Accept') {- const isSolicited = await db.isSortedSetMember('relays:createtime', actor);- if (!isSolicited) {- // Unsolicited Accept — should not happen, but handle gracefully+ // Only a pending, solicited relay (state 0) may be accepted+ const score = await db.sortedSetScore('relays:state', actor);+ if (score !== 0) {return;}await db.sortedSetIncrBy('relays:state', 1, actor);diff --git a/test/activitypub/inbox.js b/test/activitypub/inbox.jsindex a26e3fa088..2cc5d934b7 100644--- a/test/activitypub/inbox.js+++ b/test/activitypub/inbox.js@@ -1288,6 +1288,86 @@ describe('Inbox', () => {assert.strictEqual(score, -1);});+ it('should not report an unsolicited follower as a relay', async () => {+ const { activity } = helpers.mocks.follow({+ actor: relayActor,+ object: { id: `${nconf.get('url')}/actor` },+ });++ await activitypub.inbox.follow({ body: activity });++ // State -1 ("Follower") must not confer relay trust+ assert.strictEqual(await activitypub.relays.is(relayActor), false);++ await db.sortedSetRemove('relays:state', relayActor);+ await db.sortedSetRemove('relays:createtime', relayActor);+ });++ it('should not create a post from an Announce(Create(Note)) by an unsolicited follower', async () => {+ // Attacker writes itself into the relay list with a signed Follow of the instance actor+ const { activity: followActivity } = helpers.mocks.follow({+ actor: relayActor,+ object: { id: `${nconf.get('url')}/actor` },+ });+ await activitypub.inbox.follow({ body: followActivity });++ // Announce a Create(Note) with no category in to/cc, no local follower, no local mention+ const { note } = helpers.mocks.note({+ attributedTo: relayActor,+ cc: [`${relayActor}/followers`],+ });+ const { activity: createActivity } = helpers.mocks.create({ actor: relayActor, object: note });+ const { activity: announceActivity } = helpers.mocks.announce({+ actor: relayActor,+ object: createActivity,+ });++ // Must be dropped as orphan content, not written to the database+ await activitypub.inbox.announce({ body: announceActivity });++ const exists = await posts.exists(note.id);+ assert.strictEqual(exists, false, 'Announce from an unsolicited follower must not create a post');++ await db.sortedSetRemove('relays:state', relayActor);+ await db.sortedSetRemove('relays:createtime', relayActor);+ });++ it('should not escalate an unsolicited follower\'s state via a crafted Accept', async () => {+ await db.sortedSetAdd('relays:state', -1, relayActor);+ await db.sortedSetAdd('relays:createtime', Date.now(), relayActor);++ const body = {+ type: 'Accept',+ actor: relayActor,+ object: {+ id: `${nconf.get('url')}/actor`,+ type: 'Follow',+ object: { id: `${nconf.get('url')}/actor` },+ },+ };++ await activitypub.inbox.accept({ body });++ const score = await db.sortedSetScore('relays:state', relayActor);+ assert.strictEqual(score, -1);+ assert.strictEqual(await activitypub.relays.is(relayActor), false);+ });++ it('should not demote a solicited relay\'s state when it follows back', async () => {+ // NodeBB followed the relay first (pending, state 0)+ await db.sortedSetAdd('relays:state', 0, relayActor);+ await db.sortedSetAdd('relays:createtime', Date.now(), relayActor);++ const { activity } = helpers.mocks.follow({+ actor: relayActor,+ object: { id: `${nconf.get('url')}/actor` },+ });+ await activitypub.inbox.follow({ body: activity });++ const score = await db.sortedSetScore('relays:state', relayActor);+ assert.strictEqual(score, 0);+ });+it('should remove a follower when a Follow activity is undone', async () => {await db.sortedSetAdd('relays:state', -1, relayActor);await db.sortedSetAdd('relays:createtime', Date.now(), relayActor);@@ -1310,9 +1390,16 @@ describe('Inbox', () => {});it('should broadcast a public activity received via announce to relay followers', async () => {- await db.sortedSetAdd('relays:state', -1, relayActor);+ // The announcing actor must be a trusted relay (state >= 1) for an unaddressed+ // Announce(Create) to be processed; unsolicited followers no longer confer relay trust.+ await db.sortedSetAdd('relays:state', 1, relayActor);await db.sortedSetAdd('relays:createtime', Date.now(), relayActor);+ // A separate unsolicited follower is the outbound broadcast target+ const followerActor = 'https://follower.example.com/actor';+ await db.sortedSetAdd('relays:state', -1, followerActor);+ await db.sortedSetAdd('relays:createtime', Date.now(), followerActor);+const { note, id } = helpers.mocks.note();const { activity: createActivity } = helpers.mocks.create(note);const { activity: announceActivity } = helpers.mocks.announce({@@ -1364,7 +1451,7 @@ describe('Inbox', () => {// We expect a broadcast to relay followers// Feps.announce will call activitypub.sendassert(sentTo.length > 0);- const broadcast = sentTo.find(s => s.targets.includes(relayActor));+ const broadcast = sentTo.find(s => s.targets.includes(followerActor));assert(broadcast, 'Should have broadcast to relay follower');activitypub.send = originalSend;@@ -1376,6 +1463,8 @@ describe('Inbox', () => {activitypub.relays.list = originalRelaysList;await db.sortedSetRemove('relays:state', relayActor);await db.sortedSetRemove('relays:createtime', relayActor);+ await db.sortedSetRemove('relays:state', followerActor);+ await db.sortedSetRemove('relays:createtime', followerActor);});});});diff --git a/test/activitypub/relays.js b/test/activitypub/relays.jsindex 5d37df8a1e..94e9589c0b 100644--- a/test/activitypub/relays.js+++ b/test/activitypub/relays.js@@ -21,6 +21,28 @@ describe('ActivityPub Relays', () => {assert.strictEqual(score, -1);});+ it('should only report relays with a completed solicited handshake (state >= 1) as relays', async () => {+ // Unknown actor+ assert.strictEqual(await activitypub.relays.is(actor), false);++ // Unsolicited follower (wrote itself in with a signed Follow of the instance actor)+ await db.sortedSetAdd('relays:state', -1, actor);+ await db.sortedSetAdd('relays:createtime', Date.now(), actor);+ assert.strictEqual(await activitypub.relays.is(actor), false);++ // Pending solicited relay (handshake not yet completed)+ await db.sortedSetAdd('relays:state', 0, actor);+ assert.strictEqual(await activitypub.relays.is(actor), false);++ // Confirmed relay ("Receiving only")+ await db.sortedSetAdd('relays:state', 1, actor);+ assert.strictEqual(await activitypub.relays.is(actor), true);++ // Active relay+ await db.sortedSetAdd('relays:state', 2, actor);+ assert.strictEqual(await activitypub.relays.is(actor), true);+ });+it('should remove a relay follower', async () => {await db.sortedSetAdd('relays:state', -1, actor);await db.sortedSetAdd('relays:createtime', Date.now(), actor);