Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 1052 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/remote/activitypub/kernel/undo/block.ts
View file

@ -1,33 +1,20 @@
import config from '../../../../config';
import { IBlock } from '../../type';
import unblock from '../../../../services/blocking/delete';
import { apLogger } from '../../logger';
import { IRemoteUser } from '../../../../models/entities/user';
import { Users } from '../../../../models';
import DbResolver from '../../db-resolver';
const logger = apLogger;
export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
const id = typeof activity.object === 'string' ? activity.object : activity.object.id;
if (id == null) throw new Error('missing id');
const uri = activity.id || activity;
logger.info(`UnBlock: ${uri}`);
if (!id.startsWith(config.url + '/')) {
return;
}
const blockee = await Users.findOne(id.split('/').pop());
export default async (actor: IRemoteUser, activity: IBlock): Promise<string> => {
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: ブロック解除しようとしているユーザーはローカルユーザーではありません`;
}
unblock(actor, blockee);
await unblock(actor, blockee);
return `ok`;
};

24
src/remote/activitypub/kernel/undo/follow.ts
View file

@ -1,26 +1,20 @@
import config from '../../../../config';
import unfollow from '../../../../services/following/delete';
import cancelRequest from '../../../../services/following/requests/cancel';
import { IFollow } from '../../type';
import { IRemoteUser } from '../../../../models/entities/user';
import { Users, FollowRequests, Followings } from '../../../../models';
import { FollowRequests, Followings } from '../../../../models';
import DbResolver from '../../db-resolver';
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
const id = typeof activity.object === 'string' ? activity.object : activity.object.id;
if (id == null) throw new Error('missing id');
if (!id.startsWith(config.url + '/')) {
return;
}
const followee = await Users.findOne(id.split('/').pop());
export default async (actor: IRemoteUser, activity: IFollow): Promise<string> => {
const dbResolver = new DbResolver();
const followee = await dbResolver.getUserFromApId(activity.object);
if (followee == null) {
throw new Error('followee not found');
return `skip: followee not found`;
}
if (followee.host != null) {
throw new Error('フォロー解除しようとしているユーザーはローカルユーザーではありません');
return `skip: フォロー解除しようとしているユーザーはローカルユーザーではありません`;
}
const req = await FollowRequests.findOne({
@ -35,9 +29,13 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
if (req) {
await cancelRequest(followee, actor);
return `ok: follow request canceled`;
}
if (following) {
await unfollow(actor, followee);
return `ok: unfollowed`;
}
return `skip: リクエストもフォローもされていない`;
};