usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance: 招待コード使用時, メアド認証時に認証期限を確認するように

This commit is contained in:
yukineko 2023-11-02 19:08:35 +09:00
parent ceb6ccff51
commit f4972bb1ae
No known key found for this signature in database
GPG Key ID: E5BACB72109B7B90
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/backend/src/server/api/SignupApiService.ts
View File

@ -136,7 +136,20 @@ export class SignupApiService {
return; return;
} }
if (ticket.usedAt) { // メアド認証が有効かつ有効期限が0以外に設定されている場合
if (instance.emailRequiredForSignup && instance.emailVerificationExpiresIn !== 0) {
// メアド認証済みならエラー
if (ticket.usedBy) {
reply.code(400);
return;
}
// 認証しておらず、まだ有効期限内ならエラー
if (ticket.usedAt && ticket.usedAt.getTime() + (instance.emailVerificationExpiresIn * 1000 * 60) > Date.now()) {
reply.code(400);
return;
}
} else if (ticket.usedAt) {
reply.code(400); reply.code(400);
return; return;
} }
@ -222,8 +235,13 @@ export class SignupApiService {
const code = body['code']; const code = body['code'];
try { try {
const instance = await this.metaService.fetch(true);
const pendingUser = await this.userPendingsRepository.findOneByOrFail({ code }); const pendingUser = await this.userPendingsRepository.findOneByOrFail({ code });
if (instance.emailVerificationExpiresIn !== 0 && this.idService.parse(pendingUser.id).date.getTime() + (instance.emailVerificationExpiresIn * 1000 * 60) < Date.now()) {
throw new FastifyReplyError(400, 'EXPIRED');
}
const { account, secret } = await this.signupService.signup({ const { account, secret } = await this.signupService.signup({
username: pendingUser.username, username: pendingUser.username,
passwordHash: pendingUser.password, passwordHash: pendingUser.password,