From 258a17cb64dc1ac75b82d7a9b41aef42f1cc9c41 Mon Sep 17 00:00:00 2001
From: riku6460 <17585784+riku6460@users.noreply.github.com>
Date: Fri, 9 Feb 2024 20:54:13 +0900
Subject: [PATCH] =?UTF-8?q?verifymail.io=20=E3=81=AE=E3=83=AC=E3=82=B9?=
 =?UTF-8?q?=E3=83=9D=E3=83=B3=E3=82=B9=E3=82=92=E3=82=AD=E3=83=A3=E3=83=83?=
 =?UTF-8?q?=E3=82=B7=E3=83=A5=E3=81=99=E3=82=8B=20(MisskeyIO#424)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/EmailService.ts | 30 ++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts
index 823ee94927..4e7a055430 100644
--- a/packages/backend/src/core/EmailService.ts
+++ b/packages/backend/src/core/EmailService.ts
@@ -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: {