etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-11-27 00:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Receive Update activity

Browse source
This commit is contained in:
mei23 2018-09-01 17:53:38 +09:00
parent 15eaebe522
commit 3efffbcf22
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/queue/processors/http/process-inbox.ts
View file

@ -5,7 +5,7 @@ const httpSignature = require('http-signature');
import parseAcct from '../../../misc/acct/parse'; import parseAcct from '../../../misc/acct/parse';
import User, { IRemoteUser } from '../../../models/user'; import User, { IRemoteUser } from '../../../models/user';
import perform from '../../../remote/activitypub/perform'; import perform from '../../../remote/activitypub/perform';
import { resolvePerson } from '../../../remote/activitypub/models/person'; import { resolvePerson, updatePerson } from '../../../remote/activitypub/models/person';
import { toUnicode } from 'punycode'; import { toUnicode } from 'punycode';
import { URL } from 'url'; import { URL } from 'url';
@ -44,11 +44,6 @@ export default async (job: bq.Job, done: any): Promise<void> => {
} }
user = await User.findOne({ usernameLower: username, host: host.toLowerCase() }) as IRemoteUser; user = await User.findOne({ usernameLower: username, host: host.toLowerCase() }) as IRemoteUser;
// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する
if (user === null) {
user = await resolvePerson(activity.actor) as IRemoteUser;
}
} else { } else {
// アクティビティ内のホストの検証 // アクティビティ内のホストの検証
const host = toUnicode(new URL(signature.keyId).hostname.toLowerCase()); const host = toUnicode(new URL(signature.keyId).hostname.toLowerCase());
@ -64,11 +59,26 @@ export default async (job: bq.Job, done: any): Promise<void> => {
host: { $ne: null }, host: { $ne: null },
'publicKey.id': signature.keyId 'publicKey.id': signature.keyId
}) as IRemoteUser; }) as IRemoteUser;
}
// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する // Update activityの場合は、ここで署名検証/更新処理まで実施して終了
if (user === null) { if (activity.type === 'Update') {
user = await resolvePerson(activity.actor) as IRemoteUser; if (activity.object && activity.object.type === 'Person') {
if (user == null) {
console.warn('Update activity received, but user not registed.');
} else if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
console.warn('Update activity received, but signature verification failed.');
} else {
updatePerson(activity.actor, null, activity.object);
}
} }
done();
return;
}
// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する
if (user === null) {
user = await resolvePerson(activity.actor) as IRemoteUser;
} }
if (user === null) { if (user === null) {

8
src/remote/activitypub/models/person.ts
View file

@ -216,10 +216,12 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IU
/** /**
* Personの情報を更新します。 * Personの情報を更新します。
*
* Misskeyに対象のPersonが登録されていなければ無視します。 * Misskeyに対象のPersonが登録されていなければ無視します。
* @param uri URI of Person
* @param resolver Resolver
* @param hint Hint of Person object (この値が正当なPersonの場合、Remote resolveをせずに更新に利用します)
*/ */
export async function updatePerson(uri: string, resolver?: Resolver): Promise<void> { export async function updatePerson(uri: string, resolver?: Resolver, hint?: object): Promise<void> {
if (typeof uri !== 'string') throw 'uri is not string'; if (typeof uri !== 'string') throw 'uri is not string';
// URIがこのサーバーを指しているならスキップ // URIがこのサーバーを指しているならスキップ
@ -237,7 +239,7 @@ export async function updatePerson(uri: string, resolver?: Resolver): Promise<vo
if (resolver == null) resolver = new Resolver(); if (resolver == null) resolver = new Resolver();
const object = await resolver.resolve(uri) as any; const object = hint || await resolver.resolve(uri) as any;
const err = validatePerson(object, uri); const err = validatePerson(object, uri);