diff --git a/deploy/ipass-agent.py b/deploy/ipass-agent.py index 6f2e027..ffdbc9b 100644 --- a/deploy/ipass-agent.py +++ b/deploy/ipass-agent.py @@ -83,7 +83,7 @@ from urllib.parse import urlparse, parse_qs # ------------------------------------------------------------------ 常量 SERVICE = "ipass-agent" -VERSION = "1.0.2" +VERSION = "1.0.3" DEFAULT_PORT = 18099 DEFAULT_IMAGE = ("crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com/" @@ -499,6 +499,19 @@ def backup_data(data_dir, job): return None +def check_backup(backup): + """备份 tar 的路径校验(不发 IO):限定在 ~/ipass/backup/ 下,防被拿来读任意文件。""" + if not backup: + raise RuntimeError("restore_backup 为空") + backup = os.path.abspath(os.path.expanduser(str(backup))) + allow_root = os.path.join(os.path.expanduser("~"), "ipass", "backup") + if not backup.startswith(allow_root + os.sep): + raise RuntimeError("拒绝恢复非备份目录下的文件:%s" % backup) + if not os.path.exists(backup): + raise RuntimeError("备份文件不存在:%s(数据未恢复!)" % backup) + return backup + + def restore_data(data_src, backup, job): """把数据目录(含 audit)恢复成备份 tar 时刻的内容。 @@ -821,6 +834,14 @@ def op_rollback(job, p): data_src = os.path.expanduser(str(p["data_dir"])) if not data_src: raise RuntimeError("受管容器没挂 %s,无处恢复" % CONTAINER_DATA) + # ⚠️ **停容器前**预检备份(路径合法 + 文件存在 + tar 可读): + # stop 是手工停止,restart policy 不会救回来——若停在「容器已停、备份却坏了」, + # 线上就一直空跑到人工介入,比不回滚还糟。 + check_backup(backup) + with tarfile.open(backup, "r:gz") as tf: # 提前解析一遍,坏包在这里就炸 + names = {m.name.split("/")[0] for m in tf.getmembers()[:50]} + if "data" not in names: + raise RuntimeError("备份里没有 data/ 成员,拒绝用它恢复:%s" % backup) # 先 stop 不 rm:worker 周期落盘会在恢复后又把(污染)统计写回 data; # 不删容器是留给 op_update 里的 inspect 复刻参数用(stop 后 rm 照常成功)。 jlog(job, "→ 停止容器(恢复数据前冻结写入)")