授权模型切换为个人副本签发；share 脱敏共建；自更新通道

- 公众版不再共享 1000 次授权池：移除 data/.license.json，改置 data/.public_edition.json 标记，首次排盘本机签发个人副本（初始 20 次、不限期）；推送脱敏档案每盘 +10 次（同盘只计一次） - 新增 share/ 共建：结构化脱敏导出（share_export.py）+ 双远端推送（share_push.py）+ 隐私协议（share/README.md）；推送前必须展示脱敏包全文并获用户授权 - 新增自更新：VERSION + manifest.json（SHA256 清单）+ scripts/self_update.py（24h 缓存检查、先验后换、保留授权与档案）；排盘成功后 stderr 提示新版本 - SKILL.md 增「档案共建（share/）」「版本与自更新」两节； LICENSE.md 增第六条（档案权属与撤回） - 测试 100 项全绿
2026-10-09 21:24:25 +08:00
parent 5889d7a150
commit 26a83df3c4
20 changed files with 2760 additions and 22 deletions
@@ -0,0 +1,247 @@
+"""自更新：版本比较、24h 缓存、manifest 校验拦截、apply 同步与保留区、退出码。
+
+远端用本地临时目录伪造：VERSION / zipball 均以 file:// 地址经
+ZIPEC_VERSION_URLS / ZIPEC_ZIPBALL_URLS 注入，不碰真实网络。
+"""
+import hashlib
+import json
+import subprocess
+import sys
+import time
+import zipfile
+from pathlib import Path
+
+import pytest
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "scripts"))
+import self_update as su
+
+
+# ---- 造本地副本与伪造远端 ----
+
+def make_local(tmp_path, version="3.5.0"):
+    root = tmp_path / "local"
+    (root / "scripts").mkdir(parents=True)
+    (root / "data").mkdir()
+    (root / "VERSION").write_text(version + "\n", encoding="utf-8")
+    (root / "scripts" / "cast_chart.py").write_text("# old\n", encoding="utf-8")
+    (root / "data" / "cities.json").write_text("{}", encoding="utf-8")
+    (root / "stale_legacy.py").write_text("# to be removed\n", encoding="utf-8")
+    (root / "legacy").mkdir()
+    (root / "legacy" / "gone.py").write_text("# to be removed\n", encoding="utf-8")
+    # 保留区：更新后必须原样存活
+    (root / "data" / ".license.json").write_text('{"copy_id": "x"}', encoding="utf-8")
+    (root / "memory" / "archives").mkdir(parents=True)
+    (root / "memory" / "archives" / "keep.md").write_text("keep", encoding="utf-8")
+    (root / "share" / "pending").mkdir(parents=True)
+    (root / "share" / "pending" / "keep.md").write_text("keep", encoding="utf-8")
+    return root
+
+
+def make_remote(tmp_path, version="3.6.0", files=None, tamper=None):
+    """造远端 zipball（带一层顶层目录，模拟 GitHub codeload 结构）+ 远端 VERSION。
+
+    tamper=<相对路径>：先按原内容算清单哈希，再篡改该文件，用于触发校验拦截。
+    """
+    src = tmp_path / "zipcontent" / "ZiPingEightChar-main"
+    src.mkdir(parents=True)
+    all_files = {"VERSION": version + "\n", **(files or {})}
+    for rel, content in all_files.items():
+        p = src / rel
+        p.parent.mkdir(parents=True, exist_ok=True)
+        p.write_text(content, encoding="utf-8")
+    hashes = {
+        rel: hashlib.sha256((src / rel).read_bytes()).hexdigest()
+        for rel in all_files
+    }
+    (src / "manifest.json").write_text(
+        json.dumps({"version": version, "files": hashes}, indent=2) + "\n",
+        encoding="utf-8",
+    )
+    if tamper:
+        (src / tamper).write_text("# tampered\n", encoding="utf-8")
+    zip_path = tmp_path / "remote.zip"
+    with zipfile.ZipFile(zip_path, "w") as zf:
+        for f in sorted(src.parent.rglob("*")):
+            zf.write(f, f.relative_to(src.parent))
+    version_file = tmp_path / "REMOTE_VERSION"
+    version_file.write_text(version + "\n", encoding="utf-8")
+    return version_file, zip_path
+
+
+def point_at_remote(monkeypatch, version_file, zip_path=None):
+    monkeypatch.setenv("ZIPEC_VERSION_URLS", version_file.as_uri())
+    if zip_path is not None:
+        monkeypatch.setenv("ZIPEC_ZIPBALL_URLS", zip_path.as_uri())
+
+
+REMOTE_FILES = {
+    "scripts/cast_chart.py": "# new\n",
+    "scripts/new_feature.py": "# new file\n",
+    "data/cities.json": '{"new": 1}',
+}
+
+
+class TestVersionCompare:
+    def test_parse(self):
+        assert su.parse_version("3.5.0") == (3, 5, 0)
+        assert su.parse_version(" 3.10.1\n") == (3, 10, 1)
+        with pytest.raises(ValueError):
+            su.parse_version("3.x.0")
+
+    def test_newer_remote_marks_update(self, tmp_path, monkeypatch):
+        root = make_local(tmp_path)
+        vf, _ = make_remote(tmp_path)
+        point_at_remote(monkeypatch, vf)
+        assert su.cmd_check(root) == 0
+        cache = json.loads((root / "data" / ".update_check.json").read_text())
+        assert cache["remote_version"] == "3.6.0"
+        assert cache["update_available"] is True
+
+    def test_same_version_no_update(self, tmp_path, monkeypatch):
+        root = make_local(tmp_path)
+        vf, _ = make_remote(tmp_path, version="3.5.0")
+        point_at_remote(monkeypatch, vf)
+        assert su.cmd_check(root) == 0
+        cache = json.loads((root / "data" / ".update_check.json").read_text())
+        assert cache["update_available"] is False
+
+
+class TestCacheFreshness:
+    def test_fresh_cache_skips_network(self, tmp_path, monkeypatch, capsys):
+        root = make_local(tmp_path)
+        calls = []
+
+        def fake_fetch(url, timeout=3):
+            calls.append(url)
+            return "3.6.0"
+
+        monkeypatch.setattr(su, "_fetch_text", fake_fetch)
+        assert su.cmd_check(root) == 0
+        assert su.cmd_check(root) == 0
+        assert len(calls) == 1  # 24h 内第二次 --check 直接读缓存
+        assert "已检查过" in capsys.readouterr().out
+
+    def test_stale_cache_refetches(self, tmp_path, monkeypatch):
+        root = make_local(tmp_path)
+        calls = []
+        monkeypatch.setattr(
+            su, "_fetch_text",
+            lambda url, timeout=3: calls.append(url) or "3.6.0",
+        )
+        su.cmd_check(root)
+        p = root / "data" / ".update_check.json"
+        cache = json.loads(p.read_text())
+        cache["checked_at"] = time.time() - 25 * 3600  # 人为过期
+        p.write_text(json.dumps(cache), encoding="utf-8")
+        assert su.cmd_check(root) == 0
+        assert len(calls) == 2
+
+    def test_notify_reads_cache_only(self, tmp_path, capsys):
+        root = tmp_path / "local"
+        root.mkdir()
+        assert su.notify_message(root) is None  # 无缓存 → 静默
+        assert su.cmd_notify(root) == 0
+        assert capsys.readouterr().err == ""
+
+    def test_notify_prints_hint(self, tmp_path, capsys):
+        root = make_local(tmp_path)
+        (root / "data" / ".update_check.json").write_text(json.dumps({
+            "checked_at": time.time(), "local_version": "3.5.0",
+            "remote_version": "3.6.0", "update_available": True,
+        }), encoding="utf-8")
+        msg = su.notify_message(root)
+        assert "3.6.0" in msg and "--apply" in msg
+        assert su.cmd_notify(root) == 0
+        assert "3.6.0" in capsys.readouterr().err
+
+    def test_refresh_cache_failure_silent(self, tmp_path, monkeypatch):
+        root = make_local(tmp_path)
+        def boom(url, timeout=3):
+            raise OSError("network down")
+        monkeypatch.setattr(su, "_fetch_text", boom)
+        su.refresh_cache(root)  # 不抛
+        assert not (root / "data" / ".update_check.json").exists()
+
+
+class TestApply:
+    def test_success_syncs_and_preserves(self, tmp_path, monkeypatch, capsys):
+        root = make_local(tmp_path)
+        vf, zp = make_remote(tmp_path, files=REMOTE_FILES)
+        point_at_remote(monkeypatch, vf, zp)
+        assert su.cmd_apply(root) == 0
+        assert "更新完成" in capsys.readouterr().out
+        # 清单内文件被覆盖/新增
+        assert (root / "VERSION").read_text().strip() == "3.6.0"
+        assert (root / "scripts" / "cast_chart.py").read_text() == "# new\n"
+        assert (root / "scripts" / "new_feature.py").exists()
+        assert (root / "manifest.json").exists()
+        # 清单不含的本地多余文件被清理
+        assert not (root / "stale_legacy.py").exists()
+        assert not (root / "legacy").exists()  # 清空后的空目录一并移除
+        # 保留区原样存活
+        assert (root / "data" / ".license.json").read_text() == '{"copy_id": "x"}'
+        assert (root / "data" / ".update_check.json").exists()
+        assert (root / "memory" / "archives" / "keep.md").read_text() == "keep"
+        assert (root / "share" / "pending" / "keep.md").read_text() == "keep"
+
+    def test_tampered_file_aborts_untouched(self, tmp_path, monkeypatch, capsys):
+        root = make_local(tmp_path)
+        vf, zp = make_remote(tmp_path, files=REMOTE_FILES,
+                             tamper="scripts/cast_chart.py")
+        point_at_remote(monkeypatch, vf, zp)
+        assert su.cmd_apply(root) == 3
+        assert "不符" in capsys.readouterr().err
+        # 本地原样不动
+        assert (root / "VERSION").read_text().strip() == "3.5.0"
+        assert (root / "scripts" / "cast_chart.py").read_text() == "# old\n"
+        assert (root / "stale_legacy.py").exists()
+        assert not (root / "scripts" / "new_feature.py").exists()
+
+    def test_already_latest_exit_2(self, tmp_path, monkeypatch, capsys):
+        root = make_local(tmp_path)
+        vf, zp = make_remote(tmp_path, version="3.5.0")
+        point_at_remote(monkeypatch, vf, zp)
+        assert su.cmd_apply(root) == 2
+        assert "无需更新" in capsys.readouterr().out
+
+    def test_missing_local_version_exit_2(self, tmp_path):
+        root = tmp_path / "local"
+        root.mkdir()
+        assert su.cmd_apply(root) == 2
+
+    def test_remote_unreachable_exit_3(self, tmp_path, monkeypatch):
+        root = make_local(tmp_path)
+        monkeypatch.setenv("ZIPEC_VERSION_URLS", "file:///nonexistent/VERSION")
+        assert su.cmd_apply(root) == 3
+        assert su.cmd_check(root) == 3  # 无缓存且远端不可达
+        assert (root / "VERSION").read_text().strip() == "3.5.0"
+
+
+class TestCastChartIntegration:
+    def test_notice_on_stderr_stdout_clean(self):
+        """排盘成功后 stderr 出一行提示；stdout 命盘契约不受影响。"""
+        root = su.repo_root()
+        cache_path = root / "data" / ".update_check.json"
+        old_bytes = cache_path.read_bytes() if cache_path.exists() else None
+        cache_path.parent.mkdir(parents=True, exist_ok=True)
+        cache_path.write_text(json.dumps({
+            "checked_at": time.time(), "local_version": "3.5.0",
+            "remote_version": "9.9.9", "update_available": True,
+        }), encoding="utf-8")
+        try:
+            r = subprocess.run(
+                [sys.executable, str(root / "scripts" / "cast_chart.py"),
+                 "--name", "测试", "--gender", "男",
+                 "--birth", "1990-05-14 08:30", "--place", "四川省成都市"],
+                capture_output=True, text=True, timeout=60,
+            )
+            assert r.returncode == 0
+            assert r.stdout.startswith("# 命盘：测试")
+            assert "技能有新版本 9.9.9" in r.stderr
+            assert "--apply" in r.stderr
+        finally:
+            if old_bytes is None:
+                cache_path.unlink(missing_ok=True)
+            else:
+                cache_path.write_bytes(old_bytes)