From 4f91c6be758451063a3667a0dece24039f118e39 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Thu, 29 Oct 2026 19:15:38 +0800 Subject: [PATCH] test(apppush): verify persisted channels survive restart --- docs/mcp-api.md | 2 ++ tests/test_apppush_enrollment.py | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/docs/mcp-api.md b/docs/mcp-api.md index 2f2aa0e2d..b430ca4b1 100644 --- a/docs/mcp-api.md +++ b/docs/mcp-api.md @@ -94,6 +94,8 @@ Web 会话沿用当前用户；无渠道调用不携带收件人，插件回执 请求包含 `action`（`status/register/unregister/pair/test`）、随机 `installation` 和实例 `origin`。 `register` 另需 APNs `token/topic/environment`；`source` 可选，用于选择启用的 AppPush 渠道。 账号通知身份由后台注入，客户端不能指定其他用户。注销同时撤销该安装配对的主屏幕通知网页。 +前端仅在用户主动退出登录时请求 `unregister`；服务重启、认证失效及站点认证完成后的重新登录 +只清理登录会话，保留通知绑定。`pair` 返回的绑定码十分钟有效且只能使用一次，完成绑定后无需保留或重新生成。 AppPush 地址 `PUSH_SERVER_URL` 留空时使用 `MP_SERVER_HOST`；首次操作自动生成并先行持久保存256位实例凭据，再向中心幂等登记现有 `user_uid`。UID 只关联来源，不能据此获取、重置或认领已有凭据。内部 `AppPushCredentials` 按中心地址隔离，不进入通知渠道配置；中心只保存凭据摘要。已有 `PUSH_RELAY_KEY` 手工配置继续兼容。 `POST /api/v1/notification/app/instance` 仅容器超级管理员可调用，正文为 `{"action":"rotate","source":"已保存的渠道名称"}`。轮换保留设备，候选凭据先落库，响应丢失可在重启后接续；返回值不包含密钥。普通用户的 `/notification/app` 不接受该动作。 Apple/VAPID 私钥只放在中心 Server，不放入 App 或用户容器。 diff --git a/tests/test_apppush_enrollment.py b/tests/test_apppush_enrollment.py index f5829e6cd..352876afd 100644 --- a/tests/test_apppush_enrollment.py +++ b/tests/test_apppush_enrollment.py @@ -18,6 +18,7 @@ from app.db.models.systemconfig import SystemConfig from app.db.oper.systemconfig import SystemConfigOper from app.db.session import SessionFactory from app.modules.apppush import AppPushModule +from app.runtime.extensions.service import configure_service_config_reader from app.schemas.system import NotificationConf from app.schemas.types import SystemConfigKey @@ -38,23 +39,26 @@ def fresh_service() -> SystemConfigService: @pytest.fixture def configuration(monkeypatch): """ - 只替换本模块的配置入口，复用测试引导的临时 SQL，结束时还原本键。 + 使用临时 SQL 隔离渠道、凭据及配置读取端口，结束时还原原有状态。 """ service = fresh_service() - original = service.get(SystemConfigKey.AppPushCredentials) + original = {key: service.get(key) for key in (SystemConfigKey.AppPushCredentials, SystemConfigKey.Notifications)} service.set(SystemConfigKey.AppPushCredentials, {}) + previous_reader = configure_service_config_reader(service.get) monkeypatch.setattr("app.modules.apppush.get_configured_system_config", lambda: service) monkeypatch.setattr("app.modules.apppush.get_runtime_setting", lambda _key: SERVER) monkeypatch.setattr(MoviePilotServerHelper, "get_user_uid", lambda: UID) try: yield service finally: - service.set(SystemConfigKey.AppPushCredentials, original) + configure_service_config_reader(previous_reader) + for key, value in original.items(): + service.set(key, value) def test_registration_persists_before_network_and_reuses_key_after_restart(monkeypatch, configuration): """ - 先落库再登记，渠道和普通状态响应均不包含密钥，重启不产生第二个实例。 + 渠道及凭据真实落库，重启后恢复相同配置和设备列表，不产生第二个实例。 """ calls = [] @@ -82,13 +86,14 @@ def test_registration_persists_before_network_and_reuses_key_after_restart(monke assert options["json"] == {"user_uid": UID} payload = {"instance": "a" * 32, "registered": True} else: - payload = {"devices": []} + payload = {"devices": [{"id": "bound-web-device", "transport": "webpush"}]} return SimpleNamespace(status_code=200, json=lambda: payload) monkeypatch.setattr("app.adapters.external.server.RequestUtils", Transport) conf = NotificationConf(name="automatic", type="apppush", enabled=True, config={}) + configuration.set(SystemConfigKey.Notifications, [conf.model_dump()]) module = AppPushModule.__new__(AppPushModule) - monkeypatch.setattr(module, "get_configs", lambda: {"automatic": conf}) + module.init_module() result = module.channel_manage("AppPush", "status", owner="a" * 32) key = configuration.get(SystemConfigKey.AppPushCredentials)[SERVER]["key"] assert result["success"] is True and result["data"]["relay_url"] == SERVER + "/push/app/" @@ -96,9 +101,13 @@ def test_registration_persists_before_network_and_reuses_key_after_restart(monke assert key not in str(result) and key not in str(conf.model_dump()) restarted = fresh_service() monkeypatch.setattr("app.modules.apppush.get_configured_system_config", lambda: restarted) + configure_service_config_reader(restarted.get) second_module = AppPushModule.__new__(AppPushModule) - monkeypatch.setattr(second_module, "get_configs", lambda: {"automatic": conf}) - assert second_module.channel_manage("AppPush", "status", owner="a" * 32)["success"] is True + second_module.init_module() + assert second_module.get_configs()["automatic"].model_dump() == conf.model_dump() + restored = second_module.channel_manage("AppPush", "status", owner="a" * 32) + assert restored["success"] is True + assert restored["data"] == result["data"] assert sum(url.endswith('/instances') for _, url, _ in calls) == 1 assert {request_key for _, _, request_key in calls} == {key}