Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: assume object is full object and not just id everywhere

Browse Source
This commit is contained in:
Opliko
2024-04-10 00:26:01 +02:00
parent 962c63511c
commit e0166cccb2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/activitypub/inbox.js
View File

@@ -109,9 +109,9 @@ inbox.announce = async (req) => {
let tid; let tid;
let pid; let pid;
if (String(object).startsWith(nconf.get('url'))) { if (String(object.id).startsWith(nconf.get('url'))) {
// Local object // Local object
const { type, id } = await activitypub.helpers.resolveLocalId(object); const { type, id } = await activitypub.helpers.resolveLocalId(object.id);
if (type !== 'post' || !(await posts.exists(id))) { if (type !== 'post' || !(await posts.exists(id))) {
throw new Error('[[error:activitypub.invalid-id]]'); throw new Error('[[error:activitypub.invalid-id]]');
} }
@@ -124,12 +124,12 @@ inbox.announce = async (req) => {
// Remote object // Remote object
const isFollowed = await db.sortedSetCard(`followersRemote:${actor}`); const isFollowed = await db.sortedSetCard(`followersRemote:${actor}`);
if (!isFollowed) { if (!isFollowed) {
winston.info(`[activitypub/inbox.announce] Rejecting ${object} via ${actor} due to no followers`); winston.info(`[activitypub/inbox.announce] Rejecting ${object.id} via ${actor} due to no followers`);
reject('Announce', object, actor); reject('Announce', object, actor);
return; return;
} }
pid = object; pid = object.id;
pid = await activitypub.resolveId(0, pid); // in case wrong id is passed-in; unlikely, but still. pid = await activitypub.resolveId(0, pid); // in case wrong id is passed-in; unlikely, but still.
if (!pid) { if (!pid) {
return; return;
@@ -169,7 +169,7 @@ inbox.announce = async (req) => {
inbox.follow = async (req) => { inbox.follow = async (req) => {
const { actor, object } = req.body; const { actor, object } = req.body;
// Sanity checks // Sanity checks
const { type, id } = await helpers.resolveLocalId(object); const { type, id } = await helpers.resolveLocalId(object.id);
if (!['category', 'user'].includes(type)) { if (!['category', 'user'].includes(type)) {
throw new Error('[[error:activitypub.invalid-id]]'); throw new Error('[[error:activitypub.invalid-id]]');
} }
@@ -227,7 +227,7 @@ inbox.follow = async (req) => {
object: { object: {
type: 'Follow', type: 'Follow',
actor, actor,
object, object: object.id,
}, },
}); });
} }