From a4dc4c19b8c818df7c9d6087d9fa19212c2ae6c2 Mon Sep 17 00:00:00 2001
From: luolongfei <luolongf@gmail.com>
Date: Mon, 10 Jan 2022 15:42:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=86=E7=A0=81=E8=A2=AB?=
 =?UTF-8?q?=E6=94=B9=E9=82=AE=E4=BB=B6=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 netflix.py        | 44 +++++++++++++-------------------------------
 utils/__init__.py |  0
 utils/version.py  | 10 ++++++++++
 3 files changed, 23 insertions(+), 31 deletions(-)
 create mode 100644 utils/__init__.py
 create mode 100644 utils/version.py

diff --git a/netflix.py b/netflix.py
index d382673..1d84dec 100644
--- a/netflix.py
+++ b/netflix.py
@@ -47,6 +47,7 @@
 from email.mime.multipart import MIMEMultipart
 from email.utils import formataddr
 from email import encoders
+from utils.version import __version__
 
 
 def catch_exception(origin_func):
@@ -77,8 +78,6 @@ def wrapper(*args, **kwargs):
 
 
 class Netflix(object):
-    VERSION = 'v0.5.3'
-
     # 超时秒数，包括隐式等待和显式等待
     TIMEOUT = 24
 
@@ -88,9 +87,16 @@ class Netflix(object):
     RESET_PASSWORD_URL = 'https://www.netflix.com/password'
     FORGOT_PASSWORD_URL = 'https://www.netflix.com/LoginHelp'
 
+    # 请求重置密码的邮件正则
     RESET_MAIL_REGEX = re.compile(r'accountaccess.*?URL_ACCOUNT_ACCESS', re.I)
+
+    # 提取完成密码重置的链接正则
     RESET_URL_REGEX = re.compile(r'https://www\.netflix\.com.*?URL_PASSWORD', re.I)
 
+    # 密码被重置邮件正则
+    PWD_HAS_BEEN_CHANGED_REGEX = re.compile(
+        r'https?://.*?netflix\.com/YourAccount\?lnktrk=EMP&g=[^&]+&lkid=URL_YOUR_ACCOUNT_2', re.I)
+
     # 奈飞强迫用户修改密码
     FORCE_CHANGE_PASSWORD_REGEX = re.compile(r'https?://www\.netflix\.com/LoginHelp.*?lkid=URL_LOGIN_HELP', re.I)
 
@@ -643,37 +649,13 @@ def parse_mail(data: bytes, onlySubject: bool = False) -> dict or str:
         return resp
 
     @staticmethod
-    def is_password_reset_result(subject: str) -> bool:
+    def is_password_reset_result(text: str) -> bool:
         """
         是否密码重置结果邮件
-        :param subject:
+        :param text:
         :return:
         """
-        return subject in (
-            '密碼已更改',
-            'Your password has been changed',
-            '您的密码已更改',
-            'パスワード更新のご案内',
-            '비밀번호 변경 알림',
-            'Sandi sudah diubah',
-            'Kata laluan anda telah ditukar',
-            'Din adgangskode er blevet &aelig_ndret',
-            'Ihr Passwort wurde ge&auml_ndert',
-            'Tu contrase&ntilde_a se ha cambiado',
-            'Mot de passe modifi&eacute_',
-            'Tvoja je lozinka promijenjena',
-            'La tua password &egrave_ stata modificata',
-            'A jelszavad m&oacute_dosult',
-            'Ditt l&ouml_senord har &auml_ndrats',
-            'Mật khẩu của bạn đ&atilde_ thay đổi',
-            'Parolanız değiştirildi',
-            'Vaše heslo bylo změněno',
-            'Ο κωδικός πρόσβασής σας άλλαξε',
-            'Ваш пароль изменен',
-            'הסיסמה שלך שונתה',
-            'لقد تمّ تغيير كلمة المرور الخاصة بك.',
-            'आपका पासवर्ड बदल दिया गया है',
-        )
+        return Netflix.PWD_HAS_BEEN_CHANGED_REGEX.search(text) is not None
 
     @staticmethod
     def is_password_reset_request(text: str):
@@ -799,7 +781,7 @@ def pwd_result_mail_listener(self, netflix_account_email: str):
         # 定义事件类型 0：未知 1：用户恶意修改密码 2：Netflix 强迫用户修改密码
         event_type = 0
 
-        if Netflix.is_password_reset_result(resp['subject']):  # 检测到有用户恶意修改密码
+        if Netflix.is_password_reset_result(resp['text']):  # 检测到有用户恶意修改密码
             logger.info('检测到有人修改了 Netflix 账户 {} 的密码', netflix_account_email)
 
             event_type = 1
@@ -1138,7 +1120,7 @@ def get_event_reason(event_type: int) -> str:
 
     @catch_exception
     def run(self):
-        logger.info('当前程序版本为 ' + Netflix.VERSION)
+        logger.info('当前程序版本为 ' + __version__)
         logger.info('开始监听密码被改邮件')
 
         # 监听密码被改邮件
diff --git a/utils/__init__.py b/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/utils/version.py b/utils/version.py
new file mode 100644
index 0000000..d4aa704
--- /dev/null
+++ b/utils/version.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@author luolongf <luolongf@gmail.com>
+@date 2022/1/7
+@time 10:02
+"""
+
+__version__ = 'v0.5.4'