FoundKeyGang/FoundKey
FoundKeyGang/FoundKey
7
19
Fork 22
Code Issues 37 Pull requests 4 Releases Activity

Drop deletes from actors that don't exist anymore #404

Closed
ignaloidas wants to merge 1 commit from ignaloidas:drop-extra-deletes into main
pull from: ignaloidas:drop-extra-deletes
merge into: FoundKeyGang:main
Conversation 4 Commits 1 Files changed 1 +9 -2
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/backend/src/queue/processors/inbox.ts
View file

@ -6,7 +6,7 @@ import { registerOrFetchInstanceDoc } from '@/services/register-or-fetch-instanc
import { Instances } from '@/models/index.js'; import { Instances } from '@/models/index.js';
import { apRequestChart, federationChart, instanceChart } from '@/services/chart/index.js'; import { apRequestChart, federationChart, instanceChart } from '@/services/chart/index.js';
import { extractPunyHost } from '@/misc/convert-host.js'; import { extractPunyHost } from '@/misc/convert-host.js';
import { getApId } from '@/remote/activitypub/type.js'; import { getApId, isDelete } from '@/remote/activitypub/type.js';
import { fetchInstanceMetadata } from '@/services/fetch-instance-metadata.js'; import { fetchInstanceMetadata } from '@/services/fetch-instance-metadata.js';
import { Resolver } from '@/remote/activitypub/resolver.js'; import { Resolver } from '@/remote/activitypub/resolver.js';
import { LdSignature } from '@/remote/activitypub/misc/ld-signature.js'; import { LdSignature } from '@/remote/activitypub/misc/ld-signature.js';
@ -28,7 +28,14 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
delete info['@context']; delete info['@context'];
logger.debug(JSON.stringify(info, null, 2)); logger.debug(JSON.stringify(info, null, 2));
//#endregion //#endregion
if (isDelete(activity)) {
try {
await resolver.resolve(getApId(activity.actor))
} catch (error) {
logger.info("Dropped deletion request from actor that no longer exists")
return 'ok';
}
}
const validated = await verifyHttpSignature(signature, resolver, getApId(activity.actor)); const validated = await verifyHttpSignature(signature, resolver, getApId(activity.actor));
let authUser = validated.authUser; let authUser = validated.authUser;