moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

Fix bug

Browse Source
This commit is contained in:
syuilo 2018-07-26 17:13:55 +09:00
parent 0f7fbacb17
commit dddd760efd
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/remote/activitypub/models/person.ts
View File

@ -14,6 +14,34 @@ import htmlToMFM from '../../../mfm/html-to-mfm';
const log = debug('misskey:activitypub');
function validatePerson(x: any) {
if (x == null) {
return new Error('invalid person: object is null');
}
if (x.type != 'Person' && x.type != 'Service') {
return new Error(`invalid person: object is not a person or service '${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');
}
if (!validateUsername(x.preferredUsername)) {
return new Error('invalid person: invalid username');
}
if (!isValidName(x.name == '' ? null : x.name)) {
return new Error('invalid person: invalid name');
}
return null;
}
/**
* Personをフェッチします。
*
@ -47,28 +75,10 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
const object = await resolver.resolve(value) as any;
if (object == null) {
throw new Error('invalid person: object is null');
}
const err = validatePerson(object);
if (object.type != 'Person' && object.type != 'Service') {
throw new Error(`invalid person: object is not a person or service '${object.type}'`);
}
if (typeof object.preferredUsername !== 'string') {
throw new Error('invalid person: preferredUsername is not a string');
}
if (typeof object.inbox !== 'string') {
throw new Error('invalid person: inbox is not a string');
}
if (!validateUsername(object.preferredUsername)) {
throw new Error('invalid person: invalid username');
}
if (!isValidName(object.name == '' ? null : object.name)) {
throw new Error('invalid person: invalid name');
if (err) {
throw err;
}
const person: IPerson = object;
@ -198,12 +208,10 @@ export async function updatePerson(value: string | IObject, resolver?: Resolver)
const object = await resolver.resolve(value) as any;
if (
object == null ||
object.type !== 'Person'
) {
log(`invalid person: ${JSON.stringify(object, null, 2)}`);
throw new Error('invalid person');
const err = validatePerson(object);
if (err) {
throw err;
}
const person: IPerson = object;