Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

verifymail.io のレスポンスをキャッシュする (MisskeyIO#424)

Browse source
This commit is contained in:
riku6460 2024-02-09 20:54:13 +09:00 committed by GitHub
parent 253fc4591d
commit 258a17cb64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packages/backend/src/core/EmailService.ts
View file

@ -7,6 +7,7 @@ import { URLSearchParams } from 'node:url';
import * as nodemailer from 'nodemailer';
import { Inject, Injectable } from '@nestjs/common';
import { validate as validateEmail } from 'deep-email-validator';
import Redis from 'ioredis';
import { MetaService } from '@/core/MetaService.js';
import { UtilityService } from '@/core/UtilityService.js';
import { DI } from '@/di-symbols.js';
@ -16,15 +17,24 @@ import type { UserProfilesRepository } from '@/models/_.js';
import { LoggerService } from '@/core/LoggerService.js';
import { bindThis } from '@/decorators.js';
import { HttpRequestService } from '@/core/HttpRequestService.js';
import { RedisKVCache } from '@/misc/cache.js';
@Injectable()
export class EmailService {
private logger: Logger;
private verifymailResponseCache: RedisKVCache<{
valid: boolean,
reason?: string | null,
}>;
constructor(
@Inject(DI.config)
private config: Config,
@Inject(DI.redis)
private redisClient: Redis.Redis,
@Inject(DI.userProfilesRepository)
private userProfilesRepository: UserProfilesRepository,
@ -34,6 +44,16 @@ export class EmailService {
private httpRequestService: HttpRequestService,
) {
this.logger = this.loggerService.getLogger('email');
this.verifymailResponseCache = new RedisKVCache<{
valid: boolean,
reason?: string | null,
}>(this.redisClient, 'verifymailResponse', {
lifetime: 1000 * 60 * 60 * 24 * 7, // 7d
memoryCacheLifetime: 1000 * 60 * 60 * 24 * 7, // 7d
fetcher: (key) => this.verifyMail(key),
toRedisConverter: (value) => JSON.stringify(value),
fromRedisConverter: (value) => JSON.parse(value),
});
}
@bindThis
@ -190,7 +210,8 @@ export class EmailService {
});
if (validated.valid && meta.enableVerifymailApi && meta.verifymailAuthKey != null) {
validated = await this.verifyMail(emailAddress, meta.verifymailAuthKey);
const domain = emailAddress.split('@')[1];
validated = await this.verifymailResponseCache.fetch(domain);
}
if (validated.valid && meta.enableTruemailApi && meta.truemailInstance && meta.truemailAuthKey != null) {
@ -230,11 +251,14 @@ export class EmailService {
};
}
private async verifyMail(emailAddress: string, verifymailAuthKey: string): Promise<{
private async verifyMail(domain: string): Promise<{
valid: boolean;
reason: 'used' | 'format' | 'disposable' | 'mx' | 'smtp' | null;
}> {
const endpoint = 'https://verifymail.io/api/' + emailAddress + '?key=' + verifymailAuthKey;
const meta = await this.metaService.fetch();
if (meta.verifymailAuthKey == null) throw new Error('verifymailAuthKey is not set');
const endpoint = 'https://verifymail.io/api/' + domain + '?key=' + meta.verifymailAuthKey;
const res = await this.httpRequestService.send(endpoint, {
method: 'GET',
headers: {