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

APリファクタとLD-Signatureの検証に対応 (#6300)

Browse Source 
* DbResolver

* inbox types

* 認証順を変更

* User/Keyあたりをまとめる

* LD-Signatue

* Validate contexts url

* LD-Signature DocumentLoaderにProxyとTimeout
This commit is contained in:
MeiMei
2020-05-09 08:21:42 +09:00
committed by GitHub
parent 234294d564
commit 070f1f3c6e
20 changed files with 1052 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/remote/activitypub/kernel/block/index.ts
View File

@@ -1,32 +1,22 @@
import config from '../../../../config';
import { IBlock, getApId } from '../../type';
import { IBlock } from '../../type';
import block from '../../../../services/blocking/create';
import { apLogger } from '../../logger';
import { Users } from '../../../../models';
import { IRemoteUser } from '../../../../models/entities/user';
import DbResolver from '../../db-resolver';
const logger = apLogger;
export default async (actor: IRemoteUser, activity: IBlock): Promise<string> => {
// ※ activity.objectにブロック対象があり、それは存在するローカルユーザーのはず
export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
const id = getApId(activity.object);
const uri = getApId(activity);
logger.info(`Block: ${uri}`);
if (!id.startsWith(config.url + '/')) {
return;
}
const blockee = await Users.findOne(id.split('/').pop());
const dbResolver = new DbResolver();
const blockee = await dbResolver.getUserFromApId(activity.object);
if (blockee == null) {
throw new Error('blockee not found');
return `skip: blockee not found`;
}
if (blockee.host != null) {
throw new Error('ブロックしようとしているユーザーはローカルユーザーではありません');
return `skip: ブロックしようとしているユーザーはローカルユーザーではありません`;
}
block(actor, blockee);
await block(actor, blockee);
return `ok`;
};