Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-06 14:50:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: regression on remote deletes, received object is not always a simple id

Browse Source
This commit is contained in:
Julian Lam
2024-11-27 12:47:24 -05:00
parent 830aab66bb
commit d7fe355851
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/activitypub/inbox.js
View File

@@ -191,11 +191,22 @@ inbox.update = async (req) => {
inbox.delete = async (req) => { inbox.delete = async (req) => {
const { actor, object } = req.body; const { actor, object } = req.body;
if (typeof object !== 'string') {
const { id } = object;
if (!id) {
throw new Error('[[error:invalid-pid]]');
}
}
const pid = object.id || object;
let type = object.type || undefined;
// Deletes don't have their objects resolved automatically // Deletes don't have their objects resolved automatically
let method = 'purge'; let method = 'purge';
try { try {
const { type } = await activitypub.get('uid', 0, object); if (!type) {
({ type } = await activitypub.get('uid', 0, pid));
}
if (type === 'Tombstone') { if (type === 'Tombstone') {
method = 'delete'; method = 'delete';
} }
@@ -203,23 +214,24 @@ inbox.delete = async (req) => {
// probably 410/404 // probably 410/404
} }
// Origin checking // Deletions must be made by an actor of the same origin
const actorHostname = new URL(actor).hostname; const actorHostname = new URL(actor).hostname;
const objectHostname = new URL(object).hostname;
const objectHostname = new URL(pid).hostname;
if (actorHostname !== objectHostname) { if (actorHostname !== objectHostname) {
throw new Error('[[error:activitypub.origin-mismatch]]'); throw new Error('[[error:activitypub.origin-mismatch]]');
} }
const [isNote/* , isActor */] = await Promise.all([ const [isNote/* , isActor */] = await Promise.all([
posts.exists(object), posts.exists(pid),
// db.isSortedSetMember('usersRemote:lastCrawled', object.id), // db.isSortedSetMember('usersRemote:lastCrawled', object.id),
]); ]);
switch (true) { switch (true) {
case isNote: { case isNote: {
const uid = await posts.getPostField(object, 'uid'); const uid = await posts.getPostField(pid, 'uid');
await announce(object, req.body); await announce(pid, req.body);
await api.posts[method]({ uid }, { pid: object }); await api.posts[method]({ uid }, { pid });
break; break;
} }
@@ -229,7 +241,7 @@ inbox.delete = async (req) => {
// } // }
default: { default: {
activitypub.helpers.log(`[activitypub/inbox.delete] Object (${object}) does not exist locally. Doing nothing.`); activitypub.helpers.log(`[activitypub/inbox.delete] Object (${pid}) does not exist locally. Doing nothing.`);
break; break;
} }
} }