From 83db116c46e64ad6a9a479cbd00e96030821c1e9 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 3 Oct 2024 15:06:04 +0900
Subject: [PATCH] enhance(backend): notify new login (#14673)

* wip

* Update CHANGELOG.md

* wip

* fix

* Update index.d.ts

* Update SigninService.ts

* Update MkNotification.vue
---
 CHANGELOG.md                                  |   2 +-
 locales/index.d.ts                            |   8 +++++++
 locales/ja-JP.yml                             |   2 ++
 .../backend/assets/tabler-badges/login-2.png  | Bin 0 -> 3770 bytes
 packages/backend/src/models/Notification.ts   |   6 +++++-
 .../src/models/json-schema/notification.ts    |  10 +++++++++
 .../backend/src/server/api/SigninService.ts   |  20 +++++++++++++++---
 packages/backend/src/types.ts                 |   2 ++
 packages/frontend-shared/js/const.ts          |   1 +
 .../src/components/MkNotification.vue         |  13 ++++++++++--
 packages/misskey-js/src/autogen/types.ts      |  17 ++++++++++-----
 .../sw/src/scripts/create-notification.ts     |   6 ++++++
 packages/sw/src/types.ts                      |   3 ++-
 13 files changed, 77 insertions(+), 13 deletions(-)
 create mode 100644 packages/backend/assets/tabler-badges/login-2.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f0fd24c4..72c3b22d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - Enhance: フォロワーへのメッセージ欄のデザイン改良
 
 ### Server
--
+- Enhance: セキュリティ向上のため、ログイン時にメール通知を行うように
 
 
 ## 2024.9.0
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 29c93453f..0a9123f03 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -9285,6 +9285,10 @@ export interface Locale extends ILocale {
          * {x}のエクスポートが完了しました
          */
         "exportOfXCompleted": ParameterizedString<"x">;
+        /**
+         * ログインがありました
+         */
+        "login": string;
         "_types": {
             /**
              * すべて
@@ -9342,6 +9346,10 @@ export interface Locale extends ILocale {
              * エクスポートが完了した
              */
             "exportCompleted": string;
+            /**
+             * ログイン
+             */
+            "login": string;
             /**
              * 通知のテスト
              */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 678af6987..cfbe0dcc7 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2451,6 +2451,7 @@ _notification:
   followedBySomeUsers: "{n}人にフォローされました"
   flushNotification: "通知の履歴をリセットする"
   exportOfXCompleted: "{x}のエクスポートが完了しました"
+  login: "ログインがありました"
 
   _types:
     all: "すべて"
@@ -2467,6 +2468,7 @@ _notification:
     roleAssigned: "ロールが付与された"
     achievementEarned: "実績の獲得"
     exportCompleted: "エクスポートが完了した"
+    login: "ログイン"
     test: "通知のテスト"
     app: "連携アプリからの通知"
 
diff --git a/packages/backend/assets/tabler-badges/login-2.png b/packages/backend/assets/tabler-badges/login-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3ca8de3ddd0125ef523a249dd0ebd8d086c7566
GIT binary patch
literal 3770
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%0Dl
z?i$s@8hev|rX<g1#Y(=>{Lh--HruyQyV83Kwj;J>V;B#R_a$yR9-09M%woH|M5qLN
z7fM0NDGKLa1VqJzsguGTF97f^gP$s-6hncbvT#Y^8FLuW_e6E<haF>ETNUc_!L*J8
zibN^GMoHr(0JiWCzDjBK5YX)`5`u`ef&qeql8tF>3LFHty-GU>N3yLm5LYGPSJ*+c
w9TW2GunrKAFPz+OCtCysd9RQECn3?jgP*AhjJT}Dv6oR`WoC1(0)dVD7ZGyJrvLx|

literal 0
HcmV?d00001

diff --git a/packages/backend/src/models/Notification.ts b/packages/backend/src/models/Notification.ts
index c1d3d4213..b7f8e94d6 100644
--- a/packages/backend/src/models/Notification.ts
+++ b/packages/backend/src/models/Notification.ts
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
+import { userExportableEntities } from '@/types.js';
 import { MiUser } from './User.js';
 import { MiNote } from './Note.js';
 import { MiAccessToken } from './AccessToken.js';
 import { MiRole } from './Role.js';
 import { MiDriveFile } from './DriveFile.js';
-import { userExportableEntities } from '@/types.js';
 
 export type MiNotification = {
 	type: 'note';
@@ -86,6 +86,10 @@ export type MiNotification = {
 	createdAt: string;
 	exportedEntity: typeof userExportableEntities[number];
 	fileId: MiDriveFile['id'];
+} | {
+	type: 'login';
+	id: string;
+	createdAt: string;
 } | {
 	type: 'app';
 	id: string;
diff --git a/packages/backend/src/models/json-schema/notification.ts b/packages/backend/src/models/json-schema/notification.ts
index 264501049..cddaf4bc8 100644
--- a/packages/backend/src/models/json-schema/notification.ts
+++ b/packages/backend/src/models/json-schema/notification.ts
@@ -322,6 +322,16 @@ export const packedNotificationSchema = {
 				format: 'id',
 			},
 		},
+	}, {
+		type: 'object',
+		properties: {
+			...baseSchema.properties,
+			type: {
+				type: 'string',
+				optional: false, nullable: false,
+				enum: ['login'],
+			},
+		},
 	}, {
 		type: 'object',
 		properties: {
diff --git a/packages/backend/src/server/api/SigninService.ts b/packages/backend/src/server/api/SigninService.ts
index 70306c311..4b041f373 100644
--- a/packages/backend/src/server/api/SigninService.ts
+++ b/packages/backend/src/server/api/SigninService.ts
@@ -5,12 +5,14 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { DI } from '@/di-symbols.js';
-import type { SigninsRepository } from '@/models/_.js';
+import type { SigninsRepository, UserProfilesRepository } from '@/models/_.js';
 import { IdService } from '@/core/IdService.js';
 import type { MiLocalUser } from '@/models/User.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { SigninEntityService } from '@/core/entities/SigninEntityService.js';
 import { bindThis } from '@/decorators.js';
+import { EmailService } from '@/core/EmailService.js';
+import { NotificationService } from '@/core/NotificationService.js';
 import type { FastifyRequest, FastifyReply } from 'fastify';
 
 @Injectable()
@@ -19,7 +21,12 @@ export class SigninService {
 		@Inject(DI.signinsRepository)
 		private signinsRepository: SigninsRepository,
 
+		@Inject(DI.userProfilesRepository)
+		private userProfilesRepository: UserProfilesRepository,
+
 		private signinEntityService: SigninEntityService,
+		private emailService: EmailService,
+		private notificationService: NotificationService,
 		private idService: IdService,
 		private globalEventService: GlobalEventService,
 	) {
@@ -28,7 +35,8 @@ export class SigninService {
 	@bindThis
 	public signin(request: FastifyRequest, reply: FastifyReply, user: MiLocalUser) {
 		setImmediate(async () => {
-			// Append signin history
+			this.notificationService.createNotification(user.id, 'login', {});
+
 			const record = await this.signinsRepository.insertOne({
 				id: this.idService.gen(),
 				userId: user.id,
@@ -37,8 +45,14 @@ export class SigninService {
 				success: true,
 			});
 
-			// Publish signin event
 			this.globalEventService.publishMainStream(user.id, 'signin', await this.signinEntityService.pack(record));
+
+			const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
+			if (profile.email && profile.emailVerified) {
+				this.emailService.sendEmail(profile.email, 'New login / ログインがありました',
+					'There is a new login. If you do not recognize this login, update the security status of your account, including changing your password. / 新しいログインがありました。このログインに心当たりがない場合は、パスワードを変更するなど、アカウントのセキュリティ状態を更新してください。',
+					'There is a new login. If you do not recognize this login, update the security status of your account, including changing your password. / 新しいログインがありました。このログインに心当たりがない場合は、パスワードを変更するなど、アカウントのセキュリティ状態を更新してください。');
+			}
 		});
 
 		reply.code(200);
diff --git a/packages/backend/src/types.ts b/packages/backend/src/types.ts
index 5854c6b39..0389143da 100644
--- a/packages/backend/src/types.ts
+++ b/packages/backend/src/types.ts
@@ -17,6 +17,7 @@
  * roleAssigned - ロールが付与された
  * achievementEarned - 実績を獲得
  * exportCompleted - エクスポートが完了
+ * login - ログイン
  * app - アプリ通知
  * test - テスト通知(サーバー側)
  */
@@ -34,6 +35,7 @@ export const notificationTypes = [
 	'roleAssigned',
 	'achievementEarned',
 	'exportCompleted',
+	'login',
 	'app',
 	'test',
 ] as const;
diff --git a/packages/frontend-shared/js/const.ts b/packages/frontend-shared/js/const.ts
index aec4a4a58..4fe5cbb20 100644
--- a/packages/frontend-shared/js/const.ts
+++ b/packages/frontend-shared/js/const.ts
@@ -68,6 +68,7 @@ export const notificationTypes = [
 	'roleAssigned',
 	'achievementEarned',
 	'exportCompleted',
+	'login',
 	'test',
 	'app',
 ] as const;
diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue
index 12c2974de..b27d883b8 100644
--- a/packages/frontend/src/components/MkNotification.vue
+++ b/packages/frontend/src/components/MkNotification.vue
@@ -7,13 +7,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 <div :class="$style.root">
 	<div :class="$style.head">
 		<MkAvatar v-if="['pollEnded', 'note'].includes(notification.type) && 'note' in notification" :class="$style.icon" :user="notification.note.user" link preview/>
-		<MkAvatar v-else-if="['roleAssigned', 'achievementEarned'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
+		<MkAvatar v-else-if="['roleAssigned', 'achievementEarned', 'exportCompleted', 'login'].includes(notification.type)" :class="$style.icon" :user="$i" link preview/>
 		<div v-else-if="notification.type === 'reaction:grouped' && notification.note.reactionAcceptance === 'likeOnly'" :class="[$style.icon, $style.icon_reactionGroupHeart]"><i class="ti ti-heart" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'reaction:grouped'" :class="[$style.icon, $style.icon_reactionGroup]"><i class="ti ti-plus" style="line-height: 1;"></i></div>
 		<div v-else-if="notification.type === 'renote:grouped'" :class="[$style.icon, $style.icon_renoteGroup]"><i class="ti ti-repeat" style="line-height: 1;"></i></div>
 		<img v-else-if="notification.type === 'test'" :class="$style.icon" :src="infoImageUrl"/>
 		<MkAvatar v-else-if="'user' in notification" :class="$style.icon" :user="notification.user" link preview/>
-		<MkAvatar v-else-if="notification.type === 'exportCompleted'" :class="$style.icon" :user="$i" link preview/>
 		<img v-else-if="'icon' in notification && notification.icon != null" :class="[$style.icon, $style.icon_app]" :src="notification.icon" alt=""/>
 		<div
 			:class="[$style.subIcon, {
@@ -27,6 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				[$style.t_pollEnded]: notification.type === 'pollEnded',
 				[$style.t_achievementEarned]: notification.type === 'achievementEarned',
 				[$style.t_exportCompleted]: notification.type === 'exportCompleted',
+				[$style.t_login]: notification.type === 'login',
 				[$style.t_roleAssigned]: notification.type === 'roleAssigned' && notification.role.iconUrl == null,
 			}]"
 		>
@@ -40,6 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<i v-else-if="notification.type === 'pollEnded'" class="ti ti-chart-arrows"></i>
 			<i v-else-if="notification.type === 'achievementEarned'" class="ti ti-medal"></i>
 			<i v-else-if="notification.type === 'exportCompleted'" class="ti ti-archive"></i>
+			<i v-else-if="notification.type === 'login'" class="ti ti-login-2"></i>
 			<template v-else-if="notification.type === 'roleAssigned'">
 				<img v-if="notification.role.iconUrl" style="height: 1.3em; vertical-align: -22%;" :src="notification.role.iconUrl" alt=""/>
 				<i v-else class="ti ti-badges"></i>
@@ -59,6 +60,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<span v-else-if="notification.type === 'note'">{{ i18n.ts._notification.newNote }}: <MkUserName :user="notification.note.user"/></span>
 			<span v-else-if="notification.type === 'roleAssigned'">{{ i18n.ts._notification.roleAssigned }}</span>
 			<span v-else-if="notification.type === 'achievementEarned'">{{ i18n.ts._notification.achievementEarned }}</span>
+			<span v-else-if="notification.type === 'login'">{{ i18n.ts._notification.login }}</span>
 			<span v-else-if="notification.type === 'test'">{{ i18n.ts._notification.testNotification }}</span>
 			<span v-else-if="notification.type === 'exportCompleted'">{{ i18n.tsx._notification.exportOfXCompleted({ x: exportEntityName[notification.exportedEntity] }) }}</span>
 			<MkA v-else-if="notification.type === 'follow' || notification.type === 'mention' || notification.type === 'reply' || notification.type === 'renote' || notification.type === 'quote' || notification.type === 'reaction' || notification.type === 'receiveFollowRequest' || notification.type === 'followRequestAccepted'" v-user-preview="notification.user.id" :class="$style.headerName" :to="userPage(notification.user)"><MkUserName :user="notification.user"/></MkA>
@@ -225,6 +227,7 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
 	--eventReactionHeart: var(--love);
 	--eventReaction: #e99a0b;
 	--eventAchievement: #cb9a11;
+	--eventLogin: #007aff;
 	--eventOther: #88a6b7;
 }
 
@@ -346,6 +349,12 @@ function getActualReactedUsersCount(notification: Misskey.entities.Notification)
 	pointer-events: none;
 }
 
+.t_login {
+	padding: 3px;
+	background: var(--eventLogin);
+	pointer-events: none;
+}
+
 .tail {
 	flex: 1;
 	min-width: 0;
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 6aaeabec7..46fc2496d 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -4288,7 +4288,14 @@ export type components = {
       exportedEntity: 'antenna' | 'blocking' | 'clip' | 'customEmoji' | 'favorite' | 'following' | 'muting' | 'note' | 'userList';
       /** Format: id */
       fileId: string;
-    }) | ({
+    }) | {
+      /** Format: id */
+      id: string;
+      /** Format: date-time */
+      createdAt: string;
+      /** @enum {string} */
+      type: 'login';
+    } | ({
       /** Format: id */
       id: string;
       /** Format: date-time */
@@ -18550,8 +18557,8 @@ export type operations = {
           untilId?: string;
           /** @default true */
           markAsRead?: boolean;
-          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
-          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
+          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
+          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'app' | 'test' | 'pollVote' | 'groupInvited')[];
         };
       };
     };
@@ -18618,8 +18625,8 @@ export type operations = {
           untilId?: string;
           /** @default true */
           markAsRead?: boolean;
-          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
-          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
+          includeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
+          excludeTypes?: ('note' | 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'pollEnded' | 'receiveFollowRequest' | 'followRequestAccepted' | 'roleAssigned' | 'achievementEarned' | 'exportCompleted' | 'login' | 'app' | 'test' | 'reaction:grouped' | 'renote:grouped' | 'pollVote' | 'groupInvited')[];
         };
       };
     };
diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts
index 2b7dfd4f2..364328d4b 100644
--- a/packages/sw/src/scripts/create-notification.ts
+++ b/packages/sw/src/scripts/create-notification.ts
@@ -210,6 +210,12 @@ async function composeNotification(data: PushNotificationDataMap[keyof PushNotif
 						tag: `achievement:${data.body.achievement}`,
 					}];
 
+				case 'login':
+					return [i18n.ts._notification.login, {
+						badge: iconUrl('login-2'),
+						data,
+					}];
+
 				case 'exportCompleted': {
 					const entityName = {
 						antenna: i18n.ts.antennas,
diff --git a/packages/sw/src/types.ts b/packages/sw/src/types.ts
index fac3e707d..4f8277980 100644
--- a/packages/sw/src/types.ts
+++ b/packages/sw/src/types.ts
@@ -50,4 +50,5 @@ export type BadgeNames =
 	| 'quote'
 	| 'repeat'
 	| 'user-plus'
-	| 'users';
+	| 'users'
+	| 'login-2';