7f743dc981
Squashed commit of the following:
commit 4862fd8467d529c54d0aa3e6abff15a574459a8b
Author: Shun Sakai <sorairolake@protonmail.ch>
Date: Wed Oct 23 20:44:30 2024 +0900
chore(backend): Update `argon2` package
commit a52eff5deaee39c0a70c83da49ca58d0eab8d513
Author: NoriDev <m1nthing2322@gmail.com>
Date: Mon Oct 7 18:11:34 2024 +0900
Revert "tweak 0dc322b6 (1673beta/cherrypick#88)"
This reverts commit ab6a5d0c3dbe7146de19d72d08658b1c011fe30a.
commit be51daec8a916a2668ea5794e067bde06499e1a4
Author: Mar0xy <marie@kaifa.ch>
Date: Wed Sep 27 21:46:56 2023 +0200
upd: rehash misskey passwords with argon2 on login
commit 67b124b7e6e8f1b1d1738ea9a123ab0500876d58
Author: Mar0xy <marie@kaifa.ch>
Date: Fri Sep 22 00:21:57 2023 +0200
upd: swap bcrypt to argon2
111 lines
2.7 KiB
TypeScript
111 lines
2.7 KiB
TypeScript
/*
|
|
* SPDX-FileCopyrightText: syuilo and misskey-project
|
|
* SPDX-License-Identifier: AGPL-3.0-only
|
|
*/
|
|
|
|
import * as argon2 from 'argon2';
|
|
import * as OTPAuth from 'otpauth';
|
|
import * as QRCode from 'qrcode';
|
|
import { Inject, Injectable } from '@nestjs/common';
|
|
import type { UserProfilesRepository } from '@/models/_.js';
|
|
import { Endpoint } from '@/server/api/endpoint-base.js';
|
|
import { DI } from '@/di-symbols.js';
|
|
import type { Config } from '@/config.js';
|
|
import { ApiError } from '@/server/api/error.js';
|
|
import { UserAuthService } from '@/core/UserAuthService.js';
|
|
|
|
export const meta = {
|
|
requireCredential: true,
|
|
|
|
secure: true,
|
|
|
|
errors: {
|
|
incorrectPassword: {
|
|
message: 'Incorrect password.',
|
|
code: 'INCORRECT_PASSWORD',
|
|
id: '78d6c839-20c9-4c66-b90a-fc0542168b48',
|
|
},
|
|
},
|
|
|
|
res: {
|
|
type: 'object',
|
|
nullable: false,
|
|
optional: false,
|
|
properties: {
|
|
qr: { type: 'string' },
|
|
url: { type: 'string' },
|
|
secret: { type: 'string' },
|
|
label: { type: 'string' },
|
|
issuer: { type: 'string' },
|
|
},
|
|
},
|
|
} as const;
|
|
|
|
export const paramDef = {
|
|
type: 'object',
|
|
properties: {
|
|
password: { type: 'string' },
|
|
token: { type: 'string', nullable: true },
|
|
},
|
|
required: ['password'],
|
|
} as const;
|
|
|
|
@Injectable()
|
|
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
|
|
constructor(
|
|
@Inject(DI.config)
|
|
private config: Config,
|
|
|
|
@Inject(DI.userProfilesRepository)
|
|
private userProfilesRepository: UserProfilesRepository,
|
|
|
|
private userAuthService: UserAuthService,
|
|
) {
|
|
super(meta, paramDef, async (ps, me) => {
|
|
const token = ps.token;
|
|
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: me.id });
|
|
|
|
if (profile.twoFactorEnabled) {
|
|
if (token == null) {
|
|
throw new Error('authentication failed');
|
|
}
|
|
|
|
try {
|
|
await this.userAuthService.twoFactorAuthenticate(profile, token);
|
|
} catch (e) {
|
|
throw new Error('authentication failed');
|
|
}
|
|
}
|
|
|
|
const passwordMatched = await argon2.verify(profile.password ?? '', ps.password);
|
|
if (!passwordMatched) {
|
|
throw new ApiError(meta.errors.incorrectPassword);
|
|
}
|
|
|
|
// Generate user's secret key
|
|
const secret = new OTPAuth.Secret();
|
|
|
|
await this.userProfilesRepository.update(me.id, {
|
|
twoFactorTempSecret: secret.base32,
|
|
});
|
|
|
|
// Get the data URL of the authenticator URL
|
|
const totp = new OTPAuth.TOTP({
|
|
secret,
|
|
digits: 6,
|
|
label: me.username,
|
|
issuer: this.config.host,
|
|
});
|
|
const url = totp.toString();
|
|
const qr = await QRCode.toDataURL(url);
|
|
|
|
return {
|
|
qr,
|
|
url,
|
|
secret: secret.base32,
|
|
label: me.username,
|
|
issuer: this.config.host,
|
|
};
|
|
});
|
|
}
|
|
}
|