Squashed commit of the following:

commit 8724c545a8af8f34565aa71620e66cbd71547f37 Author: DLmaster <DLmaster_361@163.com> Date: Fri Apr 11 18:08:28 2025 +0800 feat(core): 预接入mirrorc commit d57ebaa281ff7c418aa8f11fe8e8ba260d8dbeca Author: DLmaster <DLmaster_361@163.com> Date: Thu Apr 10 12:37:26 2025 +0800 chore(core): 基础配置相关内容重构 - 添加理智药设置选项 #34 - 输入对话框添加回车键确认能力 #35 - 用户列表UI改版升级 - 配置类取消单例限制 - 配置读取方式与界面渲染方法优化 commit 710542287d04719c8443b91acb227de1dccc20d0 Author: DLmaster <DLmaster_361@163.com> Date: Fri Mar 28 23:32:17 2025 +0800 chore(core): search相关结构重整 commit 8009c69236655e29119ce62ff53a0360abaed2af Merge: 648f42b 9f88f92 Author: DLmaster <DLmaster_361@163.com> Date: Mon Mar 24 15:31:40 2025 +0800 Merge branch 'dev' into user_list_dev
2025-04-11 18:57:10 +08:00
parent bded794647
commit 38a04fc4b2
21 changed files with 3759 additions and 3018 deletions
--- a/app/services/notification.py
+++ b/app/services/notification.py
@@ -53,7 +53,7 @@ class Notification(QWidget):
    def push_plyer(self, title, message, ticker, t):
        """推送系统通知"""

-        if Config.global_config.get(Config.global_config.notify_IfPushPlyer):
+        if Config.get(Config.notify_IfPushPlyer):

            notification.notify(
                title=title,
@@ -70,27 +70,21 @@ class Notification(QWidget):
    def send_mail(self, mode, title, content) -> None:
        """推送邮件通知"""

-        if Config.global_config.get(Config.global_config.notify_IfSendMail):
+        if Config.get(Config.notify_IfSendMail):

            if (
-                Config.global_config.get(Config.global_config.notify_SMTPServerAddress)
-                == ""
-                or Config.global_config.get(
-                    Config.global_config.notify_AuthorizationCode
-                )
-                == ""
+                Config.get(Config.notify_SMTPServerAddress) == ""
+                or Config.get(Config.notify_AuthorizationCode) == ""
                or not bool(
                    re.match(
                        r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$",
-                        Config.global_config.get(
-                            Config.global_config.notify_FromAddress
-                        ),
+                        Config.get(Config.notify_FromAddress),
                    )
                )
                or not bool(
                    re.match(
                        r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$",
-                        Config.global_config.get(Config.global_config.notify_ToAddress),
+                        Config.get(Config.notify_ToAddress),
                    )
                )
            ):
@@ -114,15 +108,13 @@ class Notification(QWidget):
                message["From"] = formataddr(
                    (
                        Header("AUTO_MAA通知服务", "utf-8").encode(),
-                        Config.global_config.get(
-                            Config.global_config.notify_FromAddress
-                        ),
+                        Config.get(Config.notify_FromAddress),
                    )
                )  # 发件人显示的名字
                message["To"] = formataddr(
                    (
                        Header("AUTO_MAA用户", "utf-8").encode(),
-                        Config.global_config.get(Config.global_config.notify_ToAddress),
+                        Config.get(Config.notify_ToAddress),
                    )
                )  # 收件人显示的名字
                message["Subject"] = Header(title, "utf-8")
@@ -131,22 +123,16 @@ class Notification(QWidget):
                    message.attach(MIMEText(content, "html", "utf-8"))

                smtpObj = smtplib.SMTP_SSL(
-                    Config.global_config.get(
-                        Config.global_config.notify_SMTPServerAddress
-                    ),
+                    Config.get(Config.notify_SMTPServerAddress),
                    465,
                )
                smtpObj.login(
-                    Config.global_config.get(Config.global_config.notify_FromAddress),
-                    Crypto.win_decryptor(
-                        Config.global_config.get(
-                            Config.global_config.notify_AuthorizationCode
-                        )
-                    ),
+                    Config.get(Config.notify_FromAddress),
+                    Crypto.win_decryptor(Config.get(Config.notify_AuthorizationCode)),
                )
                smtpObj.sendmail(
-                    Config.global_config.get(Config.global_config.notify_FromAddress),
-                    Config.global_config.get(Config.global_config.notify_ToAddress),
+                    Config.get(Config.notify_FromAddress),
+                    Config.get(Config.notify_ToAddress),
                    message.as_string(),
                )
                smtpObj.quit()
@@ -158,12 +144,9 @@ class Notification(QWidget):
    def ServerChanPush(self, title, content):
        """使用Server酱推送通知"""

-        if Config.global_config.get(Config.global_config.notify_IfServerChan):
+        if Config.get(Config.notify_IfServerChan):

-            if (
-                Config.global_config.get(Config.global_config.notify_ServerChanKey)
-                == ""
-            ):
+            if Config.get(Config.notify_ServerChanKey) == "":
                logger.error("请正确设置Server酱的SendKey")
                self.push_info_bar.emit(
                    "error",
@@ -173,9 +156,7 @@ class Notification(QWidget):
                )
                return None
            else:
-                send_key = Config.global_config.get(
-                    Config.global_config.notify_ServerChanKey
-                )
+                send_key = Config.get(Config.notify_ServerChanKey)

            option = {}
            is_valid = lambda s: s == "" or (
@@ -186,16 +167,11 @@ class Notification(QWidget):
            允许空的Tag和Channel即不启用，但不允许例如a||b，|a|b，a|b|，||||
            """
            send_tag = "|".join(
-                _.strip()
-                for _ in Config.global_config.get(
-                    Config.global_config.notify_ServerChanTag
-                ).split("|")
+                _.strip() for _ in Config.get(Config.notify_ServerChanTag).split("|")
            )
            send_channel = "|".join(
                _.strip()
-                for _ in Config.global_config.get(
-                    Config.global_config.notify_ServerChanChannel
-                ).split("|")
+                for _ in Config.get(Config.notify_ServerChanChannel).split("|")
            )

            if is_valid(send_tag):
@@ -239,14 +215,9 @@ class Notification(QWidget):

    def CompanyWebHookBotPush(self, title, content):
        """使用企业微信群机器人推送通知"""
-        if Config.global_config.get(Config.global_config.notify_IfCompanyWebHookBot):
+        if Config.get(Config.notify_IfCompanyWebHookBot):

-            if (
-                Config.global_config.get(
-                    Config.global_config.notify_CompanyWebHookBotUrl
-                )
-                == ""
-            ):
+            if Config.get(Config.notify_CompanyWebHookBotUrl) == "":
                logger.error("请正确设置企业微信群机器人的WebHook地址")
                self.push_info_bar.emit(
                    "error",
@@ -259,9 +230,7 @@ class Notification(QWidget):
            content = f"{title}\n{content}"
            data = {"msgtype": "text", "text": {"content": content}}
            response = requests.post(
-                url=Config.global_config.get(
-                    Config.global_config.notify_CompanyWebHookBotUrl
-                ),
+                url=Config.get(Config.notify_CompanyWebHookBotUrl),
                json=data,
            )
            if response.json()["errcode"] == 0:
@@ -291,7 +260,7 @@ class Notification(QWidget):
        )

        # 发送邮件通知
-        if Config.global_config.get(Config.global_config.notify_IfSendMail):
+        if Config.get(Config.notify_IfSendMail):
            self.send_mail(
                "文本",
                "AUTO_MAA测试通知",
@@ -299,14 +268,14 @@ class Notification(QWidget):
            )

        # 发送Server酱通知
-        if Config.global_config.get(Config.global_config.notify_IfServerChan):
+        if Config.get(Config.notify_IfServerChan):
            self.ServerChanPush(
                "AUTO_MAA测试通知",
                "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容，说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！",
            )

        # 发送企业微信机器人通知
-        if Config.global_config.get(Config.global_config.notify_IfCompanyWebHookBot):
+        if Config.get(Config.notify_IfCompanyWebHookBot):
            self.CompanyWebHookBotPush(
                "AUTO_MAA测试通知",
                "这是 AUTO_MAA 外部通知测试信息。如果你看到了这段内容，说明 AUTO_MAA 的通知功能已经正确配置且可以正常工作！",
--- a/app/services/security.py
+++ b/app/services/security.py
@@ -26,7 +26,6 @@ v4.2
 """

 from loguru import logger
-import sqlite3
 import hashlib
 import random
 import secrets
@@ -85,9 +84,12 @@ class CryptoHandler:
        private_key_local = AES_key.encrypt(pad(private_key.exportKey(), 32))
        (Config.app_path / "data/key/private_key.bin").write_bytes(private_key_local)

-    def AUTO_encryptor(self, note: str) -> bytes:
+    def AUTO_encryptor(self, note: str) -> str:
        """使用AUTO_MAA的算法加密数据"""

+        if note == "":
+            return ""
+
        # 读取RSA公钥
        public_key_local = RSA.import_key(
            (Config.app_path / "data/key/public_key.pem").read_bytes()
@@ -95,11 +97,14 @@ class CryptoHandler:
        # 使用RSA公钥对数据进行加密
        cipher = PKCS1_OAEP.new(public_key_local)
        encrypted = cipher.encrypt(note.encode("utf-8"))
-        return encrypted
+        return base64.b64encode(encrypted).decode("utf-8")

-    def AUTO_decryptor(self, note: bytes, PASSWORD: str) -> str:
+    def AUTO_decryptor(self, note: str, PASSWORD: str) -> str:
        """使用AUTO_MAA的算法解密数据"""

+        if note == "":
+            return ""
+
        # 读入RSA私钥密文、盐与校验哈希值
        private_key_local = (
            (Config.app_path / "data/key/private_key.bin").read_bytes().strip()
@@ -133,63 +138,40 @@ class CryptoHandler:
            private_key = RSA.import_key(private_key_pem)
            # 使用RSA私钥解密数据
            decrypter = PKCS1_OAEP.new(private_key)
-            note = decrypter.decrypt(note)
-            return note.decode("utf-8")
+            note = decrypter.decrypt(base64.b64decode(note)).decode("utf-8")
+            return note

    def change_PASSWORD(self, PASSWORD_old: str, PASSWORD_new: str) -> None:
        """修改管理密钥"""

-        member_list = self.search_member()
-
-        for user_data in member_list:
-
-            # 读取用户数据
-            db = sqlite3.connect(user_data["Path"])
-            cur = db.cursor()
-            cur.execute("SELECT * FROM adminx WHERE True")
-            data = cur.fetchall()
+        for member in Config.member_dict.values():

            # 使用旧管理密钥解密
-            user_data["Password"] = []
-            for i in range(len(data)):
-                user_data["Password"].append(
-                    self.AUTO_decryptor(data[i][12], PASSWORD_old)
+            for user in member["UserData"].values():
+                user["Password"] = self.AUTO_decryptor(
+                    user["Config"].get(user["Config"].Info_Password), PASSWORD_old
                )
-            cur.close()
-            db.close()

        self.get_PASSWORD(PASSWORD_new)

-        for user_data in member_list:
-
-            # 读取用户数据
-            db = sqlite3.connect(user_data["Path"])
-            cur = db.cursor()
-            cur.execute("SELECT * FROM adminx WHERE True")
-            data = cur.fetchall()
+        for member in Config.member_dict.values():

            # 使用新管理密钥重新加密
-            for i in range(len(data)):
-                cur.execute(
-                    "UPDATE adminx SET password = ? WHERE mode = ? AND uid = ?",
-                    (
-                        self.AUTO_encryptor(user_data["Password"][i]),
-                        data[i][15],
-                        data[i][16],
-                    ),
+            for user in member["UserData"].values():
+                user["Config"].set(
+                    user["Config"].Info_Password, self.AUTO_encryptor(user["Password"])
                )
-                db.commit()
-                user_data["Password"][i] = None
-            del user_data["Password"]
-
-            cur.close()
-            db.close()
+                user["Password"] = None
+                del user["Password"]

    def win_encryptor(
        self, note: str, description: str = None, entropy: bytes = None
    ) -> str:
        """使用Windows DPAPI加密数据"""

+        if note == "":
+            return ""
+
        encrypted = win32crypt.CryptProtectData(
            note.encode("utf-8"), description, entropy, None, None, 0
        )
@@ -223,7 +205,7 @@ class CryptoHandler:
        """验证管理密钥"""

        return bool(
-            self.AUTO_decryptor(self.AUTO_encryptor(""), PASSWORD) != "管理密钥错误"
+            self.AUTO_decryptor(self.AUTO_encryptor("-"), PASSWORD) != "管理密钥错误"
        )


--- a/app/services/system.py
+++ b/app/services/system.py
@@ -54,7 +54,7 @@ class _SystemHandler:
    def set_Sleep(self) -> None:
        """同步系统休眠状态"""

-        if Config.global_config.get(Config.global_config.function_IfAllowSleep):
+        if Config.get(Config.function_IfAllowSleep):
            # 设置系统电源状态
            ctypes.windll.kernel32.SetThreadExecutionState(
                self.ES_CONTINUOUS | self.ES_SYSTEM_REQUIRED
@@ -66,10 +66,7 @@ class _SystemHandler:
    def set_SelfStart(self) -> None:
        """同步开机自启"""

-        if (
-            Config.global_config.get(Config.global_config.start_IfSelfStart)
-            and not self.is_startup()
-        ):
+        if Config.get(Config.start_IfSelfStart) and not self.is_startup():
            key = winreg.OpenKey(
                winreg.HKEY_CURRENT_USER,
                r"Software\Microsoft\Windows\CurrentVersion\Run",
@@ -78,10 +75,7 @@ class _SystemHandler:
            )
            winreg.SetValueEx(key, "AUTO_MAA", 0, winreg.REG_SZ, Config.app_path_sys)
            winreg.CloseKey(key)
-        elif (
-            not Config.global_config.get(Config.global_config.start_IfSelfStart)
-            and self.is_startup()
-        ):
+        elif not Config.get(Config.start_IfSelfStart) and self.is_startup():
            key = winreg.OpenKey(
                winreg.HKEY_CURRENT_USER,
                r"Software\Microsoft\Windows\CurrentVersion\Run",