@furongjun1999/dsh-memory 0.9.7 → 0.9.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +150 -662
- package/codebuddy/CODEBUDDY.md +333 -204
- package/docs/README.md +18 -0
- package/docs/discipline/harnesses.yaml +11 -3
- package/docs/discipline/templates/compact.txt.tmpl +20 -18
- package/docs/discipline/templates/full.md.tmpl +63 -61
- package/docs/discipline/templates/rules.mdc.tmpl +5 -3
- package/docs/discipline/templates/skill.md.tmpl +25 -23
- package/docs/discipline/templates/spec.txt.tmpl +1 -1
- package/docs/discipline/templates/zcode-user.md.tmpl +1 -1
- package/lib/hooks.js +1 -1
- package/lib/index.js +9 -3
- package/lib/init.js +19 -4
- package/lib/lib/hook_audit.js +26 -0
- package/md_cg/sustain.py +10 -1
- package/md_cg/test_heartbeat_ledger.py +563 -557
- package/md_cg/test_n184_keys_concurrent_provision.py +1 -1
- package/md_cg/test_read_scope_b27.py +2 -2
- package/md_cg/test_security_audit_v21.py +249 -249
- package/md_cg/test_sustain_bad_stamp.py +178 -0
- package/package.json +1 -1
- package/src/hooks.ts +932 -932
- package/src/index.ts +18 -12
- package/src/init.ts +16 -4
- package/src/lib/hook_audit.ts +302 -282
- package/zcode/AGENTS.md +333 -204
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""坏心跳戳的隔离性守卫(PR #576 回归)。
|
|
3
|
+
|
|
4
|
+
背景:`read_stamp` 的文档串承诺「不存在 / 损坏 → None」,但修前
|
|
5
|
+
`sustain.py:196` 的 `float(rec.get("ts") or 0)` 只挡住假值(None/0/"");
|
|
6
|
+
`ts` 为**合法 JSON 里的非法值**(如 "abc")时抛 ValueError 穿出函数。
|
|
7
|
+
而 `peers()`(:237)在循环里直接调 `read_stamp`、无 try ⇒ 一个坏戳让
|
|
8
|
+
**整个 peers() 失败**,同目录下所有健康节点的状态一并丢失。
|
|
9
|
+
|
|
10
|
+
断言面:
|
|
11
|
+
① 单个坏戳:`read_stamp` 返回 None(而不是抛异常)
|
|
12
|
+
② 单个坏戳:`peers()` 不抛异常
|
|
13
|
+
③ 混合目录:3 个健康戳 + 1 个坏戳 → peers() 返回 3 条,健康节点一个不少
|
|
14
|
+
④ 健康戳在坏戳之后仍被正确读出(遍历顺序不影响)
|
|
15
|
+
⑤ 坏戳不污染健康节点的 state 判定
|
|
16
|
+
⑥ 各类「损坏」形态一律返回 None:非法字符串 / 空列表 / 空字典 / 非 JSON / 非 dict
|
|
17
|
+
⑦ 合法形态必须继续可用(不多杀):正常戳 / 数字字符串 / null / 缺 ts 键
|
|
18
|
+
|
|
19
|
+
运行:python -m md_cg.test_sustain_bad_stamp
|
|
20
|
+
|
|
21
|
+
隔离性:全部操作在 tempfile.mkdtemp() 下,`peers(d)` / `read_stamp(name, d)`
|
|
22
|
+
显式传目录参数 ⇒ **不碰 aux_root()/sustain 的真实心跳数据**。
|
|
23
|
+
"""
|
|
24
|
+
from __future__ import annotations
|
|
25
|
+
|
|
26
|
+
import json
|
|
27
|
+
import os
|
|
28
|
+
import shutil
|
|
29
|
+
import tempfile
|
|
30
|
+
import time
|
|
31
|
+
|
|
32
|
+
from . import sustain
|
|
33
|
+
|
|
34
|
+
PASS = FAIL = 0
|
|
35
|
+
FAILS = []
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
def ok(cond, label):
|
|
39
|
+
global PASS, FAIL
|
|
40
|
+
if cond:
|
|
41
|
+
PASS += 1
|
|
42
|
+
else:
|
|
43
|
+
FAIL += 1
|
|
44
|
+
FAILS.append(label)
|
|
45
|
+
print(f" [FAIL] {label}")
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
def _write_stamp(d, name, payload):
|
|
49
|
+
"""直接落盘一个戳文件(绕过 write_stamp,才能造出各种损坏形态)。"""
|
|
50
|
+
path = os.path.join(d, f"heartbeat.{name}.stamp")
|
|
51
|
+
if isinstance(payload, str):
|
|
52
|
+
body = payload
|
|
53
|
+
else:
|
|
54
|
+
body = json.dumps(payload)
|
|
55
|
+
with open(path, "w", encoding="utf-8") as f:
|
|
56
|
+
f.write(body)
|
|
57
|
+
return path
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
def _good(name, age_s=10.0):
|
|
61
|
+
return {"v": 1, "name": name, "ts": time.time() - age_s, "pid": os.getpid()}
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
def main():
|
|
65
|
+
tmp = tempfile.mkdtemp(prefix="sustain_badstamp_")
|
|
66
|
+
try:
|
|
67
|
+
# ① 单个坏戳:read_stamp 返回 None 而不是抛异常
|
|
68
|
+
d1 = os.path.join(tmp, "one_bad")
|
|
69
|
+
os.makedirs(d1)
|
|
70
|
+
_write_stamp(d1, "bad", '{"ts": "abc", "name": "bad"}')
|
|
71
|
+
try:
|
|
72
|
+
rec = sustain.read_stamp("bad", d1)
|
|
73
|
+
ok(rec is None, "① 坏戳 read_stamp 返回 None(未抛异常)")
|
|
74
|
+
except Exception as e: # noqa: BLE001
|
|
75
|
+
ok(False, f"① 坏戳 read_stamp 返回 None —— 却抛了 {type(e).__name__}: {e}")
|
|
76
|
+
|
|
77
|
+
# ② 单个坏戳:peers() 不抛
|
|
78
|
+
try:
|
|
79
|
+
got = sustain.peers(d1)
|
|
80
|
+
ok(got == [], "② 目录里只有坏戳时 peers() 返回空列表")
|
|
81
|
+
except Exception as e: # noqa: BLE001
|
|
82
|
+
ok(False, f"② 目录里只有坏戳时 peers() 未抛 —— 却抛了 {type(e).__name__}: {e}")
|
|
83
|
+
|
|
84
|
+
# ③ 混合目录:3 健康 + 1 坏 → 3 条
|
|
85
|
+
d2 = os.path.join(tmp, "mixed")
|
|
86
|
+
os.makedirs(d2)
|
|
87
|
+
for n in ("a", "b", "c"):
|
|
88
|
+
_write_stamp(d2, n, _good(n))
|
|
89
|
+
_write_stamp(d2, "bad", '{"ts": "abc", "name": "bad"}')
|
|
90
|
+
try:
|
|
91
|
+
got = sustain.peers(d2)
|
|
92
|
+
names = sorted(r.get("name", "") for r in got)
|
|
93
|
+
ok(len(got) == 3, f"③ 混合目录 peers() 返回 3 条(实际 {len(got)})")
|
|
94
|
+
ok(names == ["a", "b", "c"], f"③ 健康节点 a/b/c 一个不少(实际 {names})")
|
|
95
|
+
except Exception as e: # noqa: BLE001
|
|
96
|
+
ok(False, f"③ 混合目录 peers() 未抛 —— 却抛了 {type(e).__name__}: {e}")
|
|
97
|
+
|
|
98
|
+
# ④ 坏戳排在前面也不影响后面健康戳(遍历顺序无关)
|
|
99
|
+
d3 = os.path.join(tmp, "bad_first")
|
|
100
|
+
os.makedirs(d3)
|
|
101
|
+
_write_stamp(d3, "aaa", '{"ts": "abc"}') # 排序靠前
|
|
102
|
+
_write_stamp(d3, "zzz", _good("zzz"))
|
|
103
|
+
try:
|
|
104
|
+
got = sustain.peers(d3)
|
|
105
|
+
ok(len(got) == 1 and got[0].get("name") == "zzz",
|
|
106
|
+
"④ 坏戳排序靠前时,其后的健康戳仍被读出")
|
|
107
|
+
except Exception as e: # noqa: BLE001
|
|
108
|
+
ok(False, f"④ 顺序无关性 —— 抛了 {type(e).__name__}: {e}")
|
|
109
|
+
|
|
110
|
+
# ⑤ 坏戳不污染健康节点的 state 判定
|
|
111
|
+
d4 = os.path.join(tmp, "state")
|
|
112
|
+
os.makedirs(d4)
|
|
113
|
+
_write_stamp(d4, "fresh", _good("fresh", 5))
|
|
114
|
+
_write_stamp(d4, "stale", _good("stale", 10 ** 6))
|
|
115
|
+
_write_stamp(d4, "bad", '{"ts": "abc"}')
|
|
116
|
+
try:
|
|
117
|
+
got = {r.get("name"): r.get("state") for r in sustain.peers(d4)}
|
|
118
|
+
ok(got.get("fresh") == "ok", f"⑤ 新鲜戳 state=ok(实际 {got.get('fresh')})")
|
|
119
|
+
ok(got.get("stale") == "dead", f"⑤ 陈旧戳 state=dead(实际 {got.get('stale')})")
|
|
120
|
+
ok("bad" not in got, "⑤ 坏戳不出现在结果里")
|
|
121
|
+
except Exception as e: # noqa: BLE001
|
|
122
|
+
ok(False, f"⑤ state 判定 —— 抛了 {type(e).__name__}: {e}")
|
|
123
|
+
|
|
124
|
+
# ⑥ 各种损坏形态一律 None
|
|
125
|
+
#
|
|
126
|
+
# 注意(我第一版写错过这里):`ts: []` 与 `ts: {}` 在
|
|
127
|
+
# `float(rec.get("ts") or 0)` 里被 `or` **短路成 0**(空列表/空字典是假值),
|
|
128
|
+
# 所以它们从来就不抛异常、也不返回 None —— 修前修后都返回「age≈now」。
|
|
129
|
+
# 这是既有行为,不属于本 PR 的修复面,不能拿来当「坏戳」断言。
|
|
130
|
+
d5 = os.path.join(tmp, "shapes")
|
|
131
|
+
os.makedirs(d5)
|
|
132
|
+
bad_shapes = [
|
|
133
|
+
('{"ts": "abc"}', "ts 非法字符串"),
|
|
134
|
+
("not json at all", "非 JSON"),
|
|
135
|
+
("[1, 2, 3]", "JSON 但不是 dict"),
|
|
136
|
+
]
|
|
137
|
+
for i, (body, why) in enumerate(bad_shapes):
|
|
138
|
+
_write_stamp(d5, f"s{i}", body)
|
|
139
|
+
try:
|
|
140
|
+
rec = sustain.read_stamp(f"s{i}", d5)
|
|
141
|
+
ok(rec is None, f"⑥ {why} → None")
|
|
142
|
+
except Exception as e: # noqa: BLE001
|
|
143
|
+
ok(False, f"⑥ {why} → None —— 抛了 {type(e).__name__}: {e}")
|
|
144
|
+
|
|
145
|
+
# ⑦ 合法形态必须继续可用(不多杀)
|
|
146
|
+
d6 = os.path.join(tmp, "good_shapes")
|
|
147
|
+
os.makedirs(d6)
|
|
148
|
+
good_shapes = [
|
|
149
|
+
(json.dumps({"ts": time.time() - 5}), "正常戳"),
|
|
150
|
+
(json.dumps({"ts": str(time.time() - 5)}), "ts 是数字字符串"),
|
|
151
|
+
(json.dumps({"ts": None}), "ts 为 null(按 0 处理)"),
|
|
152
|
+
(json.dumps({"name": "x"}), "缺 ts 键(按 0 处理)"),
|
|
153
|
+
]
|
|
154
|
+
for i, (body, why) in enumerate(good_shapes):
|
|
155
|
+
_write_stamp(d6, f"g{i}", body)
|
|
156
|
+
try:
|
|
157
|
+
rec = sustain.read_stamp(f"g{i}", d6)
|
|
158
|
+
ok(rec is not None and "age" in rec,
|
|
159
|
+
f"⑦ {why} → 仍返回含 age 的记录")
|
|
160
|
+
except Exception as e: # noqa: BLE001
|
|
161
|
+
ok(False, f"⑦ {why} → 抛了 {type(e).__name__}: {e}")
|
|
162
|
+
|
|
163
|
+
# ⑧ 隔离性自证:本测试全程没有写过真实心跳目录
|
|
164
|
+
real = os.environ.get("MDCG_SUSTAIN_DIR") or ""
|
|
165
|
+
ok(tmp not in (real or ""), "⑧ 测试目录与真实 sust 目录无交集")
|
|
166
|
+
|
|
167
|
+
finally:
|
|
168
|
+
shutil.rmtree(tmp, ignore_errors=True)
|
|
169
|
+
|
|
170
|
+
print(f"\nbad_stamp: {PASS} passed, {FAIL} failed")
|
|
171
|
+
if FAILS:
|
|
172
|
+
for f in FAILS:
|
|
173
|
+
print(f" - {f}")
|
|
174
|
+
raise SystemExit(1 if FAIL else 0)
|
|
175
|
+
|
|
176
|
+
|
|
177
|
+
if __name__ == "__main__":
|
|
178
|
+
main()
|
package/package.json
CHANGED