sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve account by signature in inbox

Browse Source
This commit is contained in:
Akihiko Odaki
2018-04-02 18:36:47 +09:00
parent ce7efc4dbb
commit 69763ac32b
7 changed files with 72 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/remote/activitypub/resolve-person.ts
View File

@ -10,18 +10,14 @@ async function isCollection(collection) {
return ['Collection', 'OrderedCollection'].includes(collection.type);
}
export default async (value, usernameLower, hostLower, acctLower) => {
if (!validateUsername(usernameLower)) {
throw new Error();
}
export default async (value, verifier?: string) => {
const { resolver, object } = await new Resolver().resolveOne(value);
if (
object === null ||
object.type !== 'Person' ||
typeof object.preferredUsername !== 'string' ||
object.preferredUsername.toLowerCase() !== usernameLower ||
!validateUsername(object.preferredUsername) ||
!isValidName(object.name) ||
!isValidDescription(object.summary)
) {
@ -41,9 +37,11 @@ export default async (value, usernameLower, hostLower, acctLower) => {
resolved => isCollection(resolved.object) ? resolved.object : null,
() => null
),
webFinger(object.id, acctLower),
webFinger(object.id, verifier),
]);
const host = toUnicode(finger.subject.replace(/^.*?@/, ''));
const hostLower = host.replace(/[A-Z]+/, matched => matched.toLowerCase());
const summaryDOM = JSDOM.fragment(object.summary);
// Create user
@ -58,8 +56,8 @@ export default async (value, usernameLower, hostLower, acctLower) => {
postsCount: outbox ? outbox.totalItem || 0 : 0,
driveCapacity: 1024 * 1024 * 8, // 8MiB
username: object.preferredUsername,
usernameLower,
host: toUnicode(finger.subject.replace(/^.*?@/, '')),
usernameLower: object.preferredUsername.toLowerCase(),
host,
hostLower,
account: {
publicKey: {