Node.js based forum software built for the modern web
fix(activitypub): use createtime check for Accept handler instead of follow target
Julian Lam6e7c057d86b2
diff --git a/src/activitypub/relays.js b/src/activitypub/relays.jsindex 237effa277..3af52b18b8 100644--- a/src/activitypub/relays.js+++ b/src/activitypub/relays.js@@ -119,10 +119,10 @@ Relays.handshake = async (body) => {}const target = typeof followActivity === 'object' ? followActivity.id : followActivity;- const isUnsolicited = target === `${nconf.get('url')}/actor`;if (type === 'Follow') {- if (isUnsolicited) {+ // 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);} else {@@ -146,7 +146,8 @@ Relays.handshake = async (body) => {object: body,});} else if (type === 'Accept') {- if (isUnsolicited) {+ const isSolicited = await db.isSortedSetMember('relays:createtime', actor);+ if (!isSolicited) {// Unsolicited Accept — should not happen, but handle gracefullyreturn;}