From 1772af9583806cbebc21b4d200a29b9834168421 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat, 10 Jul 2021 23:14:57 +0900 Subject: AP Actorの修正 (#7573) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * AP Actorの修正 * Add ActivityPub test * Fix person * Test * ap test * Revert "Test" This reverts commit 3c493eff4e89f94fd33f25189ba3bc96ef4366b3. * Test comment * fix * fix * Update inbox * indent * nl * indent * TODO * Fix inbox * Update test --- src/remote/activitypub/models/person.ts | 103 +++++++++++++------------------- 1 file changed, 43 insertions(+), 60 deletions(-) (limited to 'src/remote/activitypub/models') diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index 1062fe2995..829b4878f8 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -1,10 +1,11 @@ import { URL } from 'url'; import * as promiseLimit from 'promise-limit'; +import $, { Context } from 'cafy'; import config from '@/config'; import Resolver from '../resolver'; import { resolveImage } from './image'; -import { isCollectionOrOrderedCollection, isCollection, IPerson, getApId, getOneApHrefNullable, IObject, isPropertyValue, IApPropertyValue, getApType } from '../type'; +import { isCollectionOrOrderedCollection, isCollection, IActor, getApId, getOneApHrefNullable, IObject, isPropertyValue, IApPropertyValue, getApType, isActor } from '../type'; import { fromHtml } from '../../../mfm/from-html'; import { htmlToMfm } from '../misc/html-to-mfm'; import { resolveNote, extractEmojis } from './note'; @@ -23,7 +24,6 @@ import { UserPublickey } from '../../../models/entities/user-publickey'; import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error'; import { toPuny } from '@/misc/convert-host'; import { UserProfile } from '../../../models/entities/user-profile'; -import { validActor } from '../../../remote/activitypub/type'; import { getConnection } from 'typeorm'; import { toArray } from '../../../prelude/array'; import { fetchInstanceMetadata } from '../../../services/fetch-instance-metadata'; @@ -32,58 +32,49 @@ import { normalizeForSearch } from '@/misc/normalize-for-search'; const logger = apLogger; /** - * Validate Person object - * @param x Fetched person object + * Validate and convert to actor object + * @param x Fetched object * @param uri Fetch target URI */ -function validatePerson(x: any, uri: string) { +function validateActor(x: IObject, uri: string): IActor { const expectHost = toPuny(new URL(uri).hostname); if (x == null) { - return new Error('invalid person: object is null'); + throw new Error('invalid Actor: object is null'); } - if (!validActor.includes(x.type)) { - return new Error(`invalid person: object is not a person or service '${x.type}'`); + if (!isActor(x)) { + throw new Error(`invalid Actor type '${x.type}'`); } - if (typeof x.preferredUsername !== 'string') { - return new Error('invalid person: preferredUsername is not a string'); - } - - if (typeof x.inbox !== 'string') { - return new Error('invalid person: inbox is not a string'); - } + const validate = (name: string, value: any, validater: Context) => { + const e = validater.test(value); + if (e) throw new Error(`invalid Actor: ${name} ${e.message}`); + }; - if (!Users.validateRemoteUsername.ok(x.preferredUsername)) { - return new Error('invalid person: invalid username'); - } - - if (x.name != null && x.name != '') { - if (!Users.validateName.ok(x.name)) { - return new Error('invalid person: invalid name'); - } - } + validate('id', x.id, $.str.min(1)); + validate('inbox', x.inbox, $.str.min(1)); + validate('preferredUsername', x.preferredUsername, $.str.min(1).max(128).match(/^\w([\w-.]*\w)?$/)); + validate('name', x.name, $.optional.nullable.str.max(128)); + validate('summary', x.summary, $.optional.nullable.str.max(2048)); - if (typeof x.id !== 'string') { - return new Error('invalid person: id is not a string'); - } - - const idHost = toPuny(new URL(x.id).hostname); + const idHost = toPuny(new URL(x.id!).hostname); if (idHost !== expectHost) { - return new Error('invalid person: id has different host'); + throw new Error('invalid Actor: id has different host'); } - if (typeof x.publicKey.id !== 'string') { - return new Error('invalid person: publicKey.id is not a string'); - } + if (x.publicKey) { + if (typeof x.publicKey.id !== 'string') { + throw new Error('invalid Actor: publicKey.id is not a string'); + } - const publicKeyIdHost = toPuny(new URL(x.publicKey.id).hostname); - if (publicKeyIdHost !== expectHost) { - return new Error('invalid person: publicKey.id has different host'); + const publicKeyIdHost = toPuny(new URL(x.publicKey.id).hostname); + if (publicKeyIdHost !== expectHost) { + throw new Error('invalid Actor: publicKey.id has different host'); + } } - return null; + return x; } /** @@ -121,13 +112,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise