mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-14 02:55:39 +02:00
Code Releases Activity

fix(backend): 存在しないActorに対するDeleteアクティビティは無視するように (#17294)

Browse Source 
* fix(backend): 存在しないActorに対するDeleteアクティビティは無視するように

* Update Changelog

* fix

* Revert "fix"

This reverts commit 985feea326.

* fix?

* fix

* fix

* fix

* fix

* refactor: remove unused imports

* fix

* Update CHANGELOG.md [ci skip]
This commit is contained in:
かっこかり
2026-04-11 14:45:11 +09:00
committed by GitHub
parent 68e3476a16
commit 29cecd750f
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/backend/src/queue/processors/InboxProcessorService.ts
View File

@@ -13,7 +13,7 @@ import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataServic
import InstanceChart from '@/core/chart/charts/instance.js';
import ApRequestChart from '@/core/chart/charts/ap-request.js';
import FederationChart from '@/core/chart/charts/federation.js';
import { getApId } from '@/core/activitypub/type.js';
import { getApId, isActor, isDelete } from '@/core/activitypub/type.js';
import type { IActivity } from '@/core/activitypub/type.js';
import type { MiRemoteUser } from '@/models/User.js';
import type { MiUserPublickey } from '@/models/UserPublickey.js';
@@ -84,6 +84,23 @@ export class InboxProcessorService implements OnApplicationShutdown {
return `Old keyId is no longer supported. ${keyIdLower}`;
}
{
let userExistenceCheckApId: string | null = null;
// 存在しないActorに対するActorのDeleteアクティビティは無視する。
// actorとobjectが同じならばそれはActorに違いない
if (isDelete(activity) && typeof activity.object === 'object' && (isActor(activity.object) || getApId(activity.actor) === getApId(activity.object))) {
userExistenceCheckApId = getApId(activity.object);
}
if (userExistenceCheckApId != null) {
const user = await this.apDbResolverService.getUserFromApId(userExistenceCheckApId);
if (user == null) {
throw new Bull.UnrecoverableError(`skip: user not found for delete activity. ${getApId(userExistenceCheckApId)}`);
}
}
}
// HTTP-Signature keyIdを元にDBから取得
let authUser: {
user: MiRemoteUser;