5f88d56d96
* 1. ed25519キーペアを発行・Personとして公開鍵を送受信 * validate additionalPublicKeys * getAuthUserFromApIdはmainを選ぶ * ✌️ * fix * signatureAlgorithm * set publicKeyCache lifetime * refresh * httpMessageSignatureAcceptable * ED25519_SIGNED_ALGORITHM * ED25519_PUBLIC_KEY_SIGNATURE_ALGORITHM * remove sign additionalPublicKeys signature requirements * httpMessageSignaturesSupported * httpMessageSignaturesImplementationLevel * httpMessageSignaturesImplementationLevel: '01' * perf(federation): Use hint for getAuthUserFromApId (#13470) * Hint for getAuthUserFromApId * とどのつまりこれでいいのか? * use @misskey-dev/node-http-message-signatures * fix * signedPost, signedGet * ap-request.tsを復活させる * remove digest prerender * fix test? * fix test * add httpMessageSignaturesImplementationLevel to FederationInstance * ManyToOne * fetchPersonWithRenewal * exactKey * ✌️ * use const * use gen-key-pair fn. from '@misskey-dev/node-http-message-signatures' * update node-http-message-signatures * fix * @misskey-dev/node-http-message-signatures@0.0.0-alpha.11 * getAuthUserFromApIdでupdatePersonの頻度を増やす * cacheRaw.date * use requiredInputs https://github.com/misskey-dev/misskey/pull/13464#discussion_r1509964359 * update @misskey-dev/node-http-message-signatures * clean up * err msg * fix(backend): fetchInstanceMetadataのLockが永遠に解除されない問題を修正 Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com> * fix httpMessageSignaturesImplementationLevel validation * fix test * fix * comment * comment * improve test * fix * use Promise.all in genRSAAndEd25519KeyPair * refreshAndprepareEd25519KeyPair * refreshAndfindKey * commetn * refactor public keys add * digestプリレンダを復活させる RFC実装時にどうするか考える * fix, async * fix * !== true * use save * Deliver update person when new key generated (not tested) https://github.com/misskey-dev/misskey/pull/13464#issuecomment-1977049061 * 循環参照で落ちるのを解消? * fix? * Revert "fix?" This reverts commit 0082f6f8e8c5d5febd14933ba9a1ac643f70ca92. * a * logger * log * change logger * 秘密鍵の変更は、フラグではなく鍵を引き回すようにする * addAllKnowingSharedInboxRecipe * nanka meccha kaeta * delivre * キャッシュ有効チェックはロック取得前に行う * @misskey-dev/node-http-message-signatures@0.0.3 * PrivateKeyPem * getLocalUserPrivateKey * fix test * if * fix ap-request * update node-http-message-signatures * fix type error * update package * fix type * update package * retry no key * @misskey-dev/node-http-message-signatures@0.0.8 * fix type error * log keyid * logger * db-resolver * JSON.stringify * HTTP Signatureがなかったり使えなかったりしそうな場合にLD Signatureを活用するように * inbox-delayed use actor if no signature * ユーザーとキーの同一性チェックはhostの一致にする * log signature parse err * save array * とりあえずtryで囲っておく * fetchPersonWithRenewalでエラーが起きたら古いデータを返す * use transactionalEntityManager * fix spdx * @misskey-dev/node-http-message-signatures@0.0.10 * add comment * fix * publicKeyに配列が入ってもいいようにする https://github.com/misskey-dev/misskey/pull/13950 * define additionalPublicKeys * fix * merge fix * refreshAndprepareEd25519KeyPair → refreshAndPrepareEd25519KeyPair * remove gen-key-pair.ts * defaultMaxListeners = 512 * Revert "defaultMaxListeners = 512" This reverts commit f2c412c18057a9300540794ccbe4dfbf6d259ed6. * genRSAAndEd25519KeyPairではキーを直列に生成する? * maxConcurrency: 8 * maxConcurrency: 16 * maxConcurrency: 8 * Revert "genRSAAndEd25519KeyPairではキーを直列に生成する?" This reverts commit d0aada55c1ed5aa98f18731ec82f3ac5eb5a6c16. * maxWorkers: '90%' * Revert "maxWorkers: '90%'" This reverts commit 9e0a93f110456320d6485a871f014f7cdab29b33. * e2e/timelines.tsで個々のテストに対するtimeoutを削除, maxConcurrency: 32 * better error handling of this.userPublickeysRepository.delete * better comment * set result to keypairEntityCache * deliverJobConcurrency: 16, deliverJobPerSec: 1024, inboxJobConcurrency: 4 * inboxJobPerSec: 64 * delete request.headers['host']; * fix * // node-fetch will generate this for us. if we keep 'Host', it won't change with redirects! * move delete host * modify comment * modify comment * fix correct → collect * refreshAndfindKey → refreshAndFindKey * modify comment * modify attachLdSignature * getApId, InboxProcessorService * TODO * [skip ci] add CHANGELOG --------- Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com> Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
140 lines
4.2 KiB
TypeScript
140 lines
4.2 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import bcrypt from 'bcryptjs';
|
|
import { DataSource, IsNull } from 'typeorm';
|
|
import { DI } from '@/di-symbols.js';
|
|
import type { UsedUsernamesRepository, UsersRepository } from '@/models/_.js';
|
|
import { MiUser } from '@/models/User.js';
|
|
import { MiUserProfile } from '@/models/UserProfile.js';
|
|
import { IdService } from '@/core/IdService.js';
|
|
import { MiUserKeypair } from '@/models/UserKeypair.js';
|
|
import { MiUsedUsername } from '@/models/UsedUsername.js';
|
|
import generateUserToken from '@/misc/generate-native-user-token.js';
|
|
import { UserEntityService } from '@/core/entities/UserEntityService.js';
|
|
import { InstanceActorService } from '@/core/InstanceActorService.js';
|
|
import { bindThis } from '@/decorators.js';
|
|
import UsersChart from '@/core/chart/charts/users.js';
|
|
import { UtilityService } from '@/core/UtilityService.js';
|
|
import { MetaService } from '@/core/MetaService.js';
|
|
import { genRSAAndEd25519KeyPair } from '@/misc/gen-key-pair.js';
|
|
|
|
@Injectable()
|
|
export class SignupService {
|
|
constructor(
|
|
@Inject(DI.db)
|
|
private db: DataSource,
|
|
|
|
@Inject(DI.usersRepository)
|
|
private usersRepository: UsersRepository,
|
|
|
|
@Inject(DI.usedUsernamesRepository)
|
|
private usedUsernamesRepository: UsedUsernamesRepository,
|
|
|
|
private utilityService: UtilityService,
|
|
private userEntityService: UserEntityService,
|
|
private idService: IdService,
|
|
private metaService: MetaService,
|
|
private instanceActorService: InstanceActorService,
|
|
private usersChart: UsersChart,
|
|
) {
|
|
}
|
|
|
|
@bindThis
|
|
public async signup(opts: {
|
|
username: MiUser['username'];
|
|
password?: string | null;
|
|
passwordHash?: MiUserProfile['password'] | null;
|
|
host?: string | null;
|
|
ignorePreservedUsernames?: boolean;
|
|
}) {
|
|
const { username, password, passwordHash, host } = opts;
|
|
let hash = passwordHash;
|
|
|
|
// Validate username
|
|
if (!this.userEntityService.validateLocalUsername(username)) {
|
|
throw new Error('INVALID_USERNAME');
|
|
}
|
|
|
|
if (password != null && passwordHash == null) {
|
|
// Validate password
|
|
if (!this.userEntityService.validatePassword(password)) {
|
|
throw new Error('INVALID_PASSWORD');
|
|
}
|
|
|
|
// Generate hash of password
|
|
const salt = await bcrypt.genSalt(8);
|
|
hash = await bcrypt.hash(password, salt);
|
|
}
|
|
|
|
// Generate secret
|
|
const secret = generateUserToken();
|
|
|
|
// Check username duplication
|
|
if (await this.usersRepository.exists({ where: { usernameLower: username.toLowerCase(), host: IsNull() } })) {
|
|
throw new Error('DUPLICATED_USERNAME');
|
|
}
|
|
|
|
// Check deleted username duplication
|
|
if (await this.usedUsernamesRepository.exists({ where: { username: username.toLowerCase() } })) {
|
|
throw new Error('USED_USERNAME');
|
|
}
|
|
|
|
const isTheFirstUser = !await this.instanceActorService.realLocalUsersPresent();
|
|
|
|
if (!opts.ignorePreservedUsernames && !isTheFirstUser) {
|
|
const instance = await this.metaService.fetch(true);
|
|
const isPreserved = instance.preservedUsernames.map(x => x.toLowerCase()).includes(username.toLowerCase());
|
|
if (isPreserved) {
|
|
throw new Error('USED_USERNAME');
|
|
}
|
|
}
|
|
|
|
const keyPair = await genRSAAndEd25519KeyPair();
|
|
|
|
let account!: MiUser;
|
|
|
|
// Start transaction
|
|
await this.db.transaction(async transactionalEntityManager => {
|
|
const exist = await transactionalEntityManager.findOneBy(MiUser, {
|
|
usernameLower: username.toLowerCase(),
|
|
host: IsNull(),
|
|
});
|
|
|
|
if (exist) throw new Error(' the username is already used');
|
|
|
|
account = await transactionalEntityManager.save(new MiUser({
|
|
id: this.idService.gen(),
|
|
username: username,
|
|
usernameLower: username.toLowerCase(),
|
|
host: this.utilityService.toPunyNullable(host),
|
|
token: secret,
|
|
isRoot: isTheFirstUser,
|
|
}));
|
|
|
|
await transactionalEntityManager.save(new MiUserKeypair({
|
|
userId: account.id,
|
|
...keyPair,
|
|
}));
|
|
|
|
await transactionalEntityManager.save(new MiUserProfile({
|
|
userId: account.id,
|
|
autoAcceptFollowed: true,
|
|
password: hash,
|
|
}));
|
|
|
|
await transactionalEntityManager.save(new MiUsedUsername({
|
|
createdAt: new Date(),
|
|
username: username.toLowerCase(),
|
|
}));
|
|
});
|
|
|
|
this.usersChart.update(account, true);
|
|
|
|
return { account, secret };
|
|
}
|
|
}
|
|
|