@furongjun1999/dsh-memory 0.9.6 → 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/data/policy.json +38 -38
- 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 +2 -2
- package/docs/discipline/templates/zcode-user.md.tmpl +1 -1
- package/dsh/cordis.yml.example +139 -139
- package/lib/hooks.d.ts +19 -0
- package/lib/hooks.js +30 -7
- package/lib/index.js +18 -3
- package/lib/init.js +19 -4
- package/lib/lib/hook_audit.js +64 -2
- package/lib/lib/prompt_safety.js +14 -3
- package/lib/tools.d.ts +7 -0
- package/lib/tools.js +22 -1
- package/md_cg/_guard_kit.py +121 -121
- package/md_cg/anchor.py +114 -114
- package/md_cg/audit.py +15 -2
- package/md_cg/chain.py +3 -2
- package/md_cg/config_registry_guard.py +487 -487
- package/md_cg/conformance.py +747 -747
- package/md_cg/consolidate.py +1793 -1793
- package/md_cg/crypto.py +794 -794
- package/md_cg/hyperedge.py +262 -262
- package/md_cg/interface_schema.py +146 -146
- package/md_cg/lifecycle.py +426 -426
- package/md_cg/mdcos.py +12 -8
- package/md_cg/predict.py +1103 -1103
- package/md_cg/protect.py +654 -654
- package/md_cg/provenance.py +606 -606
- package/md_cg/queue_health.py +130 -130
- package/md_cg/refine.py +613 -613
- package/md_cg/retrieve.py +128 -128
- package/md_cg/revise.py +140 -140
- package/md_cg/rollback.py +657 -657
- package/md_cg/rollback_cli.py +124 -124
- package/md_cg/rotate.py +346 -346
- package/md_cg/routing.py +490 -490
- package/md_cg/self_surface.py +50 -50
- package/md_cg/semantic/canonical.py +144 -144
- package/md_cg/semantic/zh_en_atoms.py +141 -141
- package/md_cg/sources.py +1091 -1091
- package/md_cg/stg.py +3 -2
- package/md_cg/sustain.py +10 -1
- package/md_cg/test_audit_rotate_parity.py +279 -279
- package/md_cg/test_autonomy_modes.py +2013 -2013
- package/md_cg/test_cn_recall_grams.py +206 -206
- package/md_cg/test_code_kind_forbidden.py +101 -0
- package/md_cg/test_condaccept.py +156 -156
- package/md_cg/test_condgate.py +141 -141
- package/md_cg/test_heartbeat_ledger.py +9 -3
- package/md_cg/test_i50e_readside_protection.py +658 -658
- package/md_cg/test_issue111_gate_order.py +76 -76
- package/md_cg/test_issue111_scoring_contract.py +86 -86
- package/md_cg/test_issue121_calibration_bounds.py +293 -293
- package/md_cg/test_issue145_sleep_no_silent_rollback.py +167 -167
- package/md_cg/test_issue147_pack_id_escape.py +378 -378
- package/md_cg/test_issue148_merge_downgrade_leak.py +192 -192
- package/md_cg/test_issue149_accel_default_face.py +248 -248
- package/md_cg/test_issue150_empty_query_terms.py +328 -328
- package/md_cg/test_issue151_153_157_write_cache_index.py +151 -151
- package/md_cg/test_issue152_sealed_postings.py +309 -309
- package/md_cg/test_issue153b_index_generation_invalidation.py +142 -142
- package/md_cg/test_issue157b_index_remainder.py +344 -344
- package/md_cg/test_issue189_conclusion_bidirectional.py +223 -223
- package/md_cg/test_issue191_import_trust.py +382 -382
- package/md_cg/test_issue193_write_scope.py +378 -378
- package/md_cg/test_issue212_writeface_gaps.py +349 -349
- package/md_cg/test_issue214_reject_sensitivity.py +266 -266
- package/md_cg/test_issue215_condition_source_gap.py +272 -272
- package/md_cg/test_issue216_clash_routes.py +214 -214
- package/md_cg/test_issue217_slot_routes.py +248 -248
- package/md_cg/test_issue218_postcondition_value_blind.py +222 -222
- package/md_cg/test_issue258_pack_sensitivity.py +468 -468
- package/md_cg/test_issue265_coldverify_multiproc.py +438 -438
- package/md_cg/test_issue274_read_node_id_none.py +341 -341
- package/md_cg/test_issue275_layer_param.py +250 -250
- package/md_cg/test_issue277_node_id_traversal.py +384 -384
- package/md_cg/test_issue278_neg_separated_tension.py +271 -271
- package/md_cg/test_issue278_neg_window.py +294 -294
- package/md_cg/test_issue278_negative_layering.py +83 -83
- package/md_cg/test_issue284_skip_not_pass.py +291 -291
- package/md_cg/test_issue294_flywheel_sensitivity.py +573 -573
- package/md_cg/test_issue301_baseline_corpus_gate.py +245 -245
- package/md_cg/test_issue303_design_boundaries.py +262 -262
- package/md_cg/test_issue315_merge_branch_sensitivity.py +383 -383
- package/md_cg/test_issue319_tenant_unregistered_bypass.py +256 -256
- package/md_cg/test_issue321_mcp_deep_json.py +304 -304
- package/md_cg/test_issue322_node_write_lock.py +727 -727
- package/md_cg/test_issue324_write_size_fields.py +214 -214
- package/md_cg/test_issue325_audit_poison.py +229 -229
- package/md_cg/test_issue326_ingest_auto_whitelist.py +331 -331
- package/md_cg/test_issue326_key_perms.py +355 -355
- package/md_cg/test_issue326_twin_parser_parity.py +323 -323
- package/md_cg/test_issue326_vm_call_frame.py +569 -569
- package/md_cg/test_issue345_writelimit_effective_sens.py +233 -233
- package/md_cg/test_issue346_overwrite_sensitivity_gate.py +424 -424
- package/md_cg/test_issue348_insight_verify_op.py +199 -199
- package/md_cg/test_issue348_merge_rmw_lock.py +345 -345
- package/md_cg/test_issue350_casefold_collision.py +235 -235
- package/md_cg/test_issue351_ingest_root_fallback.py +201 -201
- package/md_cg/test_issue352_imgaudit.py +418 -418
- package/md_cg/test_issue352_pathsjson.py +537 -537
- package/md_cg/test_issue352_refindex.py +412 -412
- package/md_cg/test_issue352_rollback.py +604 -604
- package/md_cg/test_issue354_p2_writelimit_toctou.py +327 -327
- package/md_cg/test_issue354_rust_index_containment.py +571 -571
- package/md_cg/test_issue354_rust_wal_containment.py +606 -606
- package/md_cg/test_issue358_truncation_observable.py +247 -247
- package/md_cg/test_issue360_tidy_private_excerpt.py +195 -195
- package/md_cg/test_issue361_blindspot_not_silent_drop.py +494 -494
- package/md_cg/test_issue362_neg_condition.py +468 -468
- package/md_cg/test_issue363_lexical_idf.py +275 -275
- package/md_cg/test_issue370_readcache_assembly.py +488 -488
- package/md_cg/test_issue376_heartbeat_failed.py +293 -293
- package/md_cg/test_issue377_layer_protect_stamp.py +324 -324
- package/md_cg/test_issue378_protected_floor.py +310 -310
- package/md_cg/test_issue383_state_event_write_gate.py +462 -462
- package/md_cg/test_issue397_sens_eff_wiring.py +435 -435
- package/md_cg/test_issue398_toolface_op_parity.py +511 -511
- package/md_cg/test_issue399_hive_json_shape.py +317 -317
- package/md_cg/test_issue401_wisdom_codegen.py +295 -295
- package/md_cg/test_issue404_heal_receipt.py +389 -389
- package/md_cg/test_issue409_compact_index_completeness.py +509 -509
- package/md_cg/test_issue410_verify_demote_write.py +366 -366
- package/md_cg/test_issue411_scrub_idempotence.py +575 -575
- package/md_cg/test_issue412_discipline_producer_parity.py +311 -311
- package/md_cg/test_issue413_preimage_failclosed.py +239 -239
- package/md_cg/test_issue413_preimage_twin.py +339 -339
- package/md_cg/test_issue415_deps_gate_probe.py +357 -357
- package/md_cg/test_issue416_entry_key_subset.py +525 -525
- package/md_cg/test_issue417_twophase_merge_landed.py +423 -423
- package/md_cg/test_issue425_ingest_library_path.py +331 -331
- package/md_cg/test_issue426c_enqueue_not_silent.py +346 -346
- package/md_cg/test_issue426e_restore_overwrite_live.py +310 -310
- package/md_cg/test_issue426f_paths_gbk_failclosed.py +301 -301
- package/md_cg/test_issue427_serve_status_shape.py +191 -191
- package/md_cg/test_issue431_432_468_protect_single_point.py +322 -322
- package/md_cg/test_issue433_outlook_threshold_single_point.py +278 -278
- package/md_cg/test_issue434_435_float_gate.py +90 -90
- package/md_cg/test_issue439_sibling_sensitivity_inherit.py +448 -448
- package/md_cg/test_issue43_default_policy.py +874 -874
- package/md_cg/test_issue444_scrub_evidence_plaintext.py +281 -281
- package/md_cg/test_issue445_metacognition_ledger_gate.py +454 -454
- package/md_cg/test_issue446_453_403_verified_evidence.py +382 -382
- package/md_cg/test_issue450_sensitivity_fallback_reason.py +51 -51
- package/md_cg/test_issue450_writegate_unknown_sens.py +203 -203
- package/md_cg/test_issue451_audit_actor.py +313 -313
- package/md_cg/test_issue452_ingest_root_sensitivity.py +299 -299
- package/md_cg/test_issue463_ghost_prune_guard.py +259 -259
- package/md_cg/test_issue466_basis_registry.py +469 -469
- package/md_cg/test_issue467_identity_sensitivity_parity.py +360 -360
- package/md_cg/test_issue469_scrub_override_passthrough.py +126 -126
- package/md_cg/test_issue470_wal_event_durable.py +427 -427
- package/md_cg/test_issue471_identity_readable.py +136 -136
- package/md_cg/test_issue472_audit_chain.py +90 -90
- package/md_cg/test_issue472_prune_ledger.py +105 -105
- package/md_cg/test_issue472_rollback_degraded.py +81 -81
- package/md_cg/test_issue491_compose_sandbox.py +460 -460
- package/md_cg/test_issue498_merge_trace_stale_index.py +280 -280
- package/md_cg/test_issue511_scoreboard_bad_files.py +256 -256
- package/md_cg/test_issue521_rotate_lock_suffix.py +110 -110
- package/md_cg/test_issue524_orphan_noise_no_demote.py +88 -88
- package/md_cg/test_issue525_read_null_semantics.py +52 -52
- package/md_cg/test_issue547_append_jsonl_whitelist.py +114 -114
- package/md_cg/test_issue547_audit_durable.py +96 -96
- package/md_cg/test_issue557_r2_write_entries_size_gate.py +83 -83
- package/md_cg/test_issue559_refine_prefix.py +69 -69
- package/md_cg/test_issue562_retired_faces.py +150 -0
- package/md_cg/test_issue71_queue_backlog.py +376 -376
- package/md_cg/test_issue72_coldverify_controlled_drain.py +420 -420
- package/md_cg/test_issue82_credential_rules.py +271 -271
- package/md_cg/test_issue91_verifier_sandbox.py +314 -314
- package/md_cg/test_issue93_remember_redaction.py +282 -282
- package/md_cg/test_logref.py +1141 -1141
- package/md_cg/test_md_access_parity.py +330 -330
- package/md_cg/test_md_cg_no_hive_dep.py +139 -139
- package/md_cg/test_mutation_residue.py +119 -119
- package/md_cg/test_mutation_rollback.py +835 -835
- package/md_cg/test_n123_derive_expiry_chain.py +210 -210
- package/md_cg/test_n184_keys_concurrent_provision.py +1 -1
- package/md_cg/test_n209_verify_write_face_gates.py +466 -466
- package/md_cg/test_n62_tenant_bind_failclosed.py +200 -200
- package/md_cg/test_neg_tail_honesty.py +733 -733
- package/md_cg/test_p21_tokens.py +294 -294
- package/md_cg/test_p27_docindex.py +792 -792
- package/md_cg/test_p28_refcheck.py +1053 -1053
- package/md_cg/test_p2_six_elements.py +476 -476
- package/md_cg/test_p33_ccg_wiring.py +300 -300
- package/md_cg/test_p3_legacy_closure.py +438 -438
- package/md_cg/test_p40_refine_worklist.py +244 -244
- package/md_cg/test_p4_freshness.py +781 -781
- package/md_cg/test_p9c_dedup_hints.py +288 -288
- package/md_cg/test_policy_required_ccg.py +444 -444
- package/md_cg/test_read_scope_b27.py +2 -2
- package/md_cg/test_retr_s5.py +312 -312
- package/md_cg/test_s1_ast_judge.py +109 -109
- package/md_cg/test_security_audit_v21.py +249 -249
- package/md_cg/test_state_event_op.py +521 -521
- package/md_cg/test_stgidx_index_parity.py +1024 -1024
- package/md_cg/test_sustain_bad_stamp.py +178 -0
- package/md_cg/test_sustain_bounded.py +652 -652
- package/md_cg/test_trust_edge_reachability.py +405 -405
- package/md_cg/test_w7_redlines.py +659 -659
- package/md_cg/test_write_return_shape.py +919 -919
- package/md_cg/test_writepipe.py +228 -228
- package/md_cg/trust.py +1114 -1114
- package/md_cg/twophase.py +303 -303
- package/md_cg/whitebox.py +536 -536
- package/md_cg/whitebox_kb/wisdom/compose_engine.py +1634 -1634
- package/md_cg/whitebox_kb/wisdom/core/condition_vm.py +318 -318
- package/md_cg/whitebox_kb/wisdom/core/parser.py +1082 -1082
- package/md_cg/whitebox_kb/wisdom/md_access.py +490 -490
- package/md_cg/whitebox_kb/wisdom/migrate_wisdom.py +497 -497
- package/md_cg/whitebox_kb/wisdom/mini_python.py +995 -995
- package/md_cg/whitebox_kb/wisdom/net_units.py +2900 -2900
- package/md_cg/whitebox_kb/wisdom/semantic_translate.py +4060 -4060
- package/md_cg/writepipe.py +1337 -1337
- package/package.json +3 -2
- package/scripts/workspace_index.py +328 -0
- package/src/hooks.ts +932 -908
- package/src/index.ts +21 -6
- package/src/init.ts +16 -4
- package/src/lib/hook_audit.ts +48 -2
- package/src/lib/mdcg_client.ts +469 -469
- package/src/lib/prompt_safety.ts +17 -3
- package/src/tools.ts +23 -1
- package/zcode/AGENTS.md +333 -204
|
@@ -1,727 +1,727 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
# 功能名:#322 同一 node_id 并发写的跨进程串行化(writepipe 写链 + MdCGOS.add/_move_layer 库层)
|
|
3
|
-
# 生效条件:python -X utf8 -m md_cg.test_issue322_node_write_lock [--mutate];
|
|
4
|
-
# 被测面=md_cg/writepipe.py 的 WritePipeline.execute、md_cg/mdcos.py 的 MdCGOS.add、
|
|
5
|
-
# MdCGSecure.add、MdCGOS._move_layer、md_cg/fsutil.py 的 node_write_lock
|
|
6
|
-
# 子功能:A1=writepipe 并发同 id(3 进程 × 2 轮)不丢正文且至多一个 committed;
|
|
7
|
-
# A2=writepipe anchor/knowledge 同 id 并发不得两份并存;A3=**库层** cg.add 直接并发
|
|
8
|
-
# anchor/knowledge 同 id 不得两份并存(钉 add 自己的锁,不靠 writepipe);
|
|
9
|
-
# A4=**_move_layer 与 add 并发同 id**(搬迁的读旧位置→写新层→删旧文件 vs 覆写)——
|
|
10
|
-
# 已应答的 add 新值不得被搬迁写下的旧正文顶掉;A5=**密级继承的读改写**
|
|
11
|
-
# (A 显式声明 internal 覆写 / B 未声明应继承当前密级)——盘面不得被陈旧索引降级回
|
|
12
|
-
# public;K1=串行覆写仍真生效(锁不是空操作);
|
|
13
|
-
# E1/E2=结构锚(走 FileLock + strict、不用进程内锁);E3/E4/E5/E5b/E6=各落点在锁块内
|
|
14
|
-
# (E5b=密级继承读前先做跨进程代际探活:互斥 ≠ 读到新值)
|
|
15
|
-
# 执行:每轮新建隔离库;写者各自独立进程自旋对齐后并发写同一 id;读盘面同 id 文件集合
|
|
16
|
-
# 验证方式:全部 PASS 即通过(rc=0);--mutate 走镜像树定点变异,红项集合须恰为预期
|
|
17
|
-
# 不适用条件:① 不测吞吐/锁开销(那是性能面,不是本缺陷);② 不覆盖 Windows 之外的
|
|
18
|
-
# OS 锁实现差异(FileLock 自身的语义由既有守卫负责);③ 不判「不同 node_id 是否并行」
|
|
19
|
-
# (按 id 分锁的设计意图,不是本缺陷的验收面);④ 不覆盖**直接构造 `MdCG`**(父类)
|
|
20
|
-
# 的搬迁路径——锁的覆盖点在 `MdCGOS`(子类覆盖),`md_cg/mdcg.py` 不在本单元写面
|
|
21
|
-
"""#322 守卫:同 id 并发写必须被同一把**跨进程**锁串行化。
|
|
22
|
-
|
|
23
|
-
病象(修前,探针 .tmp/u06/probe_322.py 实测):
|
|
24
|
-
· 普通腿 6/6 轮:4 个写者全部回执 committed:true,盘面只有 1 份正文,
|
|
25
|
-
其余 3 份**已应答却从 root 里消失**(静默丢正文);
|
|
26
|
-
· anchor 腿 6/6 轮:anchor 与 knowledge 各写同 id,盘面**两份并存**
|
|
27
|
-
(anchor\\x.md + knowledge/orphan\\x.md),保护闸在两侧都看不到对方
|
|
28
|
-
⇒ 保护被绕过。
|
|
29
|
-
· 搬迁腿(`.tmp/u06/probe_move_add.py`)3/3 轮:`_move_layer` 读到旧位置后
|
|
30
|
-
慢写新层,并发的 add 已应答的新正文被搬迁写下的旧正文顶掉。
|
|
31
|
-
· 密级继承腿(`.tmp/u06/probe_secure_add.py`):无锁 6/6 轮、只加 add 锁仍 3/6 轮
|
|
32
|
-
——B 按**陈旧内存索引**继承密级,把他进程刚落盘的 internal 静默降级回 public。
|
|
33
|
-
修法(单点):fsutil.node_write_lock(OS 级 FileLock + 同线程重入计数),
|
|
34
|
-
writepipe.execute 整条链 + MdCGOS.add / MdCGSecure.add / MdCGOS._move_layer
|
|
35
|
-
各持同一把(同线程重入不互锁);密级继承读之前另做一次
|
|
36
|
-
`_maybe_reload_index` 代际探活(锁保证互斥,探活保证读到新值)。
|
|
37
|
-
"""
|
|
38
|
-
import os
|
|
39
|
-
import shutil
|
|
40
|
-
import subprocess
|
|
41
|
-
import sys
|
|
42
|
-
import tempfile
|
|
43
|
-
|
|
44
|
-
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
45
|
-
|
|
46
|
-
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
47
|
-
if _REPO not in sys.path:
|
|
48
|
-
sys.path.insert(0, _REPO)
|
|
49
|
-
|
|
50
|
-
PASSED, FAILS = [], []
|
|
51
|
-
|
|
52
|
-
CCG = ("# 功能名:并发写守卫夹具\n"
|
|
53
|
-
"# 生效条件:多进程同 id 同 root 并发写\n"
|
|
54
|
-
"# 子功能:无\n"
|
|
55
|
-
"# 执行:无\n"
|
|
56
|
-
"# 验证方式:无\n"
|
|
57
|
-
"# 不适用条件:无\n"
|
|
58
|
-
"%s\n")
|
|
59
|
-
|
|
60
|
-
_W_WRITEPIPE = r'''
|
|
61
|
-
import json, sys, time
|
|
62
|
-
sys.path.insert(0, sys.argv[1])
|
|
63
|
-
from md_cg.mdcos import MdCGOS
|
|
64
|
-
from md_cg.writepipe import default_pipeline
|
|
65
|
-
root, nid, layer, body, t0 = sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], float(sys.argv[6])
|
|
66
|
-
cg = MdCGOS(root)
|
|
67
|
-
while time.time() < t0:
|
|
68
|
-
pass
|
|
69
|
-
try:
|
|
70
|
-
r = default_pipeline().execute(cg, {"node_id": nid, "content": body,
|
|
71
|
-
"layer": layer, "content_kind": "text"})
|
|
72
|
-
out = {"ok": r.get("ok"), "committed": r.get("committed"),
|
|
73
|
-
"error": r.get("error")}
|
|
74
|
-
except Exception as exc:
|
|
75
|
-
out = {"ok": False, "committed": False,
|
|
76
|
-
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
77
|
-
try:
|
|
78
|
-
cg.close()
|
|
79
|
-
except Exception:
|
|
80
|
-
pass
|
|
81
|
-
print(json.dumps(out, ensure_ascii=False))
|
|
82
|
-
'''
|
|
83
|
-
|
|
84
|
-
_W_ADD = r'''
|
|
85
|
-
import json, sys, time
|
|
86
|
-
sys.path.insert(0, sys.argv[1])
|
|
87
|
-
from md_cg.mdcos import MdCGOS
|
|
88
|
-
root, nid, layer, body, t0 = sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], float(sys.argv[6])
|
|
89
|
-
cg = MdCGOS(root)
|
|
90
|
-
while time.time() < t0:
|
|
91
|
-
pass
|
|
92
|
-
try:
|
|
93
|
-
cg.add(nid, body, layer=layer)
|
|
94
|
-
out = {"ok": True, "committed": True, "error": None}
|
|
95
|
-
except Exception as exc:
|
|
96
|
-
out = {"ok": False, "committed": False,
|
|
97
|
-
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
98
|
-
try:
|
|
99
|
-
cg.close()
|
|
100
|
-
except Exception:
|
|
101
|
-
pass
|
|
102
|
-
print(json.dumps(out, ensure_ascii=False))
|
|
103
|
-
'''
|
|
104
|
-
|
|
105
|
-
#: 搬迁腿:把基类 `_write_node` 包一层 sleep 0.5s(只拉长「读到旧位置 → 写新层 →
|
|
106
|
-
#: 删旧文件」的窗口,不改任何判据),再对同一 id 调 `_move_layer`。
|
|
107
|
-
_W_MOVE = r'''
|
|
108
|
-
import json, sys, time
|
|
109
|
-
sys.path.insert(0, sys.argv[1])
|
|
110
|
-
from md_cg.mdcos import MdCGOS
|
|
111
|
-
from md_cg.mdcg import MdCG
|
|
112
|
-
root, nid, t0 = sys.argv[2], sys.argv[3], float(sys.argv[4])
|
|
113
|
-
_o = MdCG._write_node
|
|
114
|
-
def _slow(self, *a, **k):
|
|
115
|
-
time.sleep(0.5)
|
|
116
|
-
return _o(self, *a, **k)
|
|
117
|
-
MdCG._write_node = _slow
|
|
118
|
-
cg = MdCGOS(root)
|
|
119
|
-
while time.time() < t0:
|
|
120
|
-
pass
|
|
121
|
-
try:
|
|
122
|
-
r = cg._move_layer(nid, "contextual", reason="i322-guard")
|
|
123
|
-
out = {"ok": True, "committed": True,
|
|
124
|
-
"error": None, "to": (r or {}).get("to")}
|
|
125
|
-
except Exception as exc:
|
|
126
|
-
out = {"ok": False, "committed": False,
|
|
127
|
-
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
128
|
-
try:
|
|
129
|
-
cg.close()
|
|
130
|
-
except Exception:
|
|
131
|
-
pass
|
|
132
|
-
print(json.dumps(out, ensure_ascii=False))
|
|
133
|
-
'''
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
def _check(n, c, d=''):
|
|
137
|
-
if c:
|
|
138
|
-
print(' PASS ' + n)
|
|
139
|
-
PASSED.append(n)
|
|
140
|
-
else:
|
|
141
|
-
print(' FAIL ' + n + ' ' + str(d)[:200])
|
|
142
|
-
FAILS.append(n)
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
def _env(t):
|
|
146
|
-
env = {k: v for k, v in os.environ.items()
|
|
147
|
-
if not k.startswith(("MDCG_", "PYTHON"))}
|
|
148
|
-
for k, d in (("HOME", "home"), ("MDCG_STATE_ROOT", "state"),
|
|
149
|
-
("MDCG_AUX_ROOT", "auxstore"), ("MDCG_DATA_ROOT", "data"),
|
|
150
|
-
("MDCG_EXPORT_ROOT", "export")):
|
|
151
|
-
env[k] = os.path.join(t, d)
|
|
152
|
-
os.makedirs(env[k])
|
|
153
|
-
env.update(MDCG_SUSTAIN="0", MDCG_SLEEP="0", PYTHONUTF8="1",
|
|
154
|
-
PYTHONPATH=_REPO)
|
|
155
|
-
return env
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
def _race(root, env, worker, writers):
|
|
159
|
-
t0 = __import__("time").time() + 1.5
|
|
160
|
-
ps = [subprocess.Popen([sys.executable, "-X", "utf8", "-c", worker, _REPO,
|
|
161
|
-
root, nid, layer, body, str(t0)], env=env,
|
|
162
|
-
cwd=env["HOME"], stdout=subprocess.PIPE,
|
|
163
|
-
stderr=subprocess.PIPE, text=True,
|
|
164
|
-
encoding="utf-8", errors="replace")
|
|
165
|
-
for nid, layer, body in writers]
|
|
166
|
-
res = []
|
|
167
|
-
for p in ps:
|
|
168
|
-
o, e = p.communicate(timeout=180)
|
|
169
|
-
try:
|
|
170
|
-
res.append(__import__("json").loads(o.strip().splitlines()[-1]))
|
|
171
|
-
except Exception:
|
|
172
|
-
res.append({"ok": False, "committed": False,
|
|
173
|
-
"error": "ERR " + e.strip()[-120:]})
|
|
174
|
-
return res
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
def _same_id_files(root, nid):
|
|
178
|
-
out = []
|
|
179
|
-
for dirpath, _d, files in os.walk(root):
|
|
180
|
-
for fn in files:
|
|
181
|
-
if fn == nid + ".md":
|
|
182
|
-
out.append(os.path.relpath(os.path.join(dirpath, fn), root))
|
|
183
|
-
return sorted(out)
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
def _one_round(worker, writers, tag):
|
|
187
|
-
t = tempfile.mkdtemp(prefix="i322_" + tag + "_")
|
|
188
|
-
env = _env(t)
|
|
189
|
-
root = os.path.join(t, "root")
|
|
190
|
-
res = _race(root, env, worker, writers)
|
|
191
|
-
files = _same_id_files(root, writers[0][0])
|
|
192
|
-
return res, files, root
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
def _body_of(root, nid):
|
|
196
|
-
"""从盘面读回该 id 节点的正文(唯一一份时)。"""
|
|
197
|
-
for dirpath, _d, files in os.walk(root):
|
|
198
|
-
if nid + ".md" in files:
|
|
199
|
-
with open(os.path.join(dirpath, nid + ".md"),
|
|
200
|
-
encoding="utf-8") as f:
|
|
201
|
-
return f.read()
|
|
202
|
-
return ""
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
#: A4 的 add 腿:在 `_write_node` 里睡 0.4s(< 搬迁腿的 0.5s)——把「add 正在落盘」
|
|
206
|
-
#: 精确放进「搬迁已读完旧位置、还没删旧文件」的窗口。**只拉长窗口,不改判据**。
|
|
207
|
-
_W_ADD_SLOW = r'''
|
|
208
|
-
import json, sys, time
|
|
209
|
-
sys.path.insert(0, sys.argv[1])
|
|
210
|
-
from md_cg.mdcos import MdCGOS
|
|
211
|
-
from md_cg.mdcg import MdCG
|
|
212
|
-
root, nid, layer, body, t0 = sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], float(sys.argv[6])
|
|
213
|
-
_o = MdCG._write_node
|
|
214
|
-
def _slow(self, *a, **k):
|
|
215
|
-
time.sleep(0.4)
|
|
216
|
-
return _o(self, *a, **k)
|
|
217
|
-
MdCG._write_node = _slow
|
|
218
|
-
cg = MdCGOS(root)
|
|
219
|
-
while time.time() < t0:
|
|
220
|
-
pass
|
|
221
|
-
try:
|
|
222
|
-
cg.add(nid, body, layer=layer)
|
|
223
|
-
out = {"ok": True, "committed": True, "error": None}
|
|
224
|
-
except Exception as exc:
|
|
225
|
-
out = {"ok": False, "committed": False,
|
|
226
|
-
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
227
|
-
try:
|
|
228
|
-
cg.close()
|
|
229
|
-
except Exception:
|
|
230
|
-
pass
|
|
231
|
-
print(json.dumps(out, ensure_ascii=False))
|
|
232
|
-
'''
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
#: A5 的 worker:带 principal 的写(密级继承面)。`delay` 非 0 时在
|
|
236
|
-
#: `_write_sensitivity` **解析完旧密级之后**睡一会儿——这正是「读到旧值 → 据此落盘」
|
|
237
|
-
#: 的窗口(只拉长窗口,不改判据)。
|
|
238
|
-
_W_SECURE = r'''
|
|
239
|
-
import json, sys, time
|
|
240
|
-
sys.path.insert(0, sys.argv[1])
|
|
241
|
-
from md_cg.mdcos import MdCGSecure
|
|
242
|
-
from md_cg.security import Principal
|
|
243
|
-
from md_cg.tokens import role_spec
|
|
244
|
-
root, nid, body, sens, delay, t0 = (sys.argv[2], sys.argv[3], sys.argv[4],
|
|
245
|
-
sys.argv[5], float(sys.argv[6]),
|
|
246
|
-
float(sys.argv[7]))
|
|
247
|
-
sp = role_spec("designer")
|
|
248
|
-
cg = MdCGSecure(root, principal=Principal(
|
|
249
|
-
actor="designer", clearance="secret", can_write=True, can_admin=True,
|
|
250
|
-
role="designer", layers_allow=sp["layers_allow"],
|
|
251
|
-
ops_allow=sp["ops_allow"]))
|
|
252
|
-
if delay:
|
|
253
|
-
_o = cg._write_sensitivity
|
|
254
|
-
def _slow(node_id, declared):
|
|
255
|
-
s = _o(node_id, declared)
|
|
256
|
-
time.sleep(delay)
|
|
257
|
-
return s
|
|
258
|
-
cg._write_sensitivity = _slow
|
|
259
|
-
while time.time() < t0:
|
|
260
|
-
pass
|
|
261
|
-
try:
|
|
262
|
-
cg.add(nid, body, layer="knowledge", sensitivity=(sens or None))
|
|
263
|
-
out = {"ok": True, "committed": True, "error": None}
|
|
264
|
-
except Exception as exc:
|
|
265
|
-
out = {"ok": False, "committed": False,
|
|
266
|
-
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
267
|
-
try:
|
|
268
|
-
cg.close()
|
|
269
|
-
except Exception:
|
|
270
|
-
pass
|
|
271
|
-
print(json.dumps(out, ensure_ascii=False))
|
|
272
|
-
'''
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
def _sens_on_disk(root, nid):
|
|
276
|
-
"""盘面 frontmatter 里的 sensitivity 字面量(取不到返回 None)。"""
|
|
277
|
-
import re
|
|
278
|
-
for dirpath, _d, files in os.walk(root):
|
|
279
|
-
if nid + ".md" in files:
|
|
280
|
-
with open(os.path.join(dirpath, nid + ".md"),
|
|
281
|
-
encoding="utf-8") as f:
|
|
282
|
-
m = re.search(r"^sensitivity:\s*\"?([A-Za-z]+)\"?",
|
|
283
|
-
f.read(), re.M)
|
|
284
|
-
return m.group(1) if m else None
|
|
285
|
-
return None
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
def _bodies_of(root, nid):
|
|
289
|
-
"""盘面上所有同 id 文件的正文(同 id 可能并存于多层——那本身就是缺陷,
|
|
290
|
-
故 A4 判「新值是否在**任意一份**里」,而不是只看先遍历到的那份)。"""
|
|
291
|
-
out = []
|
|
292
|
-
for dirpath, _d, files in os.walk(root):
|
|
293
|
-
if nid + ".md" in files:
|
|
294
|
-
with open(os.path.join(dirpath, nid + ".md"),
|
|
295
|
-
encoding="utf-8") as f:
|
|
296
|
-
out.append(f.read())
|
|
297
|
-
return out
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
def group_a1():
|
|
301
|
-
print('== A1:writepipe 并发同 id(3 进程 × 2 轮)==')
|
|
302
|
-
bad_files = 0
|
|
303
|
-
multi = 0
|
|
304
|
-
lost = 0
|
|
305
|
-
for rd in range(2):
|
|
306
|
-
nid = "race_same"
|
|
307
|
-
writers = [(nid, "knowledge", CCG % ("BODY-%04d" % i))
|
|
308
|
-
for i in range(3)]
|
|
309
|
-
res, files, root = _one_round(_W_WRITEPIPE, writers, "a1")
|
|
310
|
-
committed = [i for i, r in enumerate(res) if r.get("committed")]
|
|
311
|
-
text = _body_of(root, nid)
|
|
312
|
-
hit = [i for i in committed if "BODY-%04d" % i in text]
|
|
313
|
-
bad_files += int(len(files) != 1)
|
|
314
|
-
multi += int(len(committed) > 1)
|
|
315
|
-
lost += len(committed) - len(hit)
|
|
316
|
-
print(" round %d: committed=%s files=%s 命中=%s"
|
|
317
|
-
% (rd, committed, files, hit))
|
|
318
|
-
_check('A1a 盘面同 id 文件恒为 1 份(不并存)', bad_files == 0, bad_files)
|
|
319
|
-
_check('A1b 并发下至多一个写者回执 committed(其余入审核队列/被拒)',
|
|
320
|
-
multi == 0, multi)
|
|
321
|
-
_check('A1c 已回执 committed 的正文 100% 在盘面(丢失 0)', lost == 0, lost)
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
def group_a2():
|
|
325
|
-
print('== A2:writepipe anchor/knowledge 同 id 并发(2 轮)==')
|
|
326
|
-
coex = 0
|
|
327
|
-
for rd in range(2):
|
|
328
|
-
nid = "race_anchor"
|
|
329
|
-
res, files, _root = _one_round(
|
|
330
|
-
_W_WRITEPIPE,
|
|
331
|
-
[(nid, "anchor", CCG % "ANCHOR-BODY"),
|
|
332
|
-
(nid, "knowledge", CCG % "KNOW-BODY")], "a2")
|
|
333
|
-
coex += int(len(files) > 1)
|
|
334
|
-
print(" round %d: files=%s res=%s"
|
|
335
|
-
% (rd, files, [(r.get("committed"),
|
|
336
|
-
str(r.get("error") or "")[:40]) for r in res]))
|
|
337
|
-
_check('A2 同 id 的 anchor 与 knowledge 两份文件不得并存', coex == 0, coex)
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
def group_a3():
|
|
341
|
-
print('== A3:库层 cg.add 直接并发 anchor/knowledge 同 id(2 轮)==')
|
|
342
|
-
coex = 0
|
|
343
|
-
for rd in range(2):
|
|
344
|
-
nid = "race_add_anchor"
|
|
345
|
-
res, files, _root = _one_round(
|
|
346
|
-
_W_ADD,
|
|
347
|
-
[(nid, "anchor", CCG % "ANCHOR-BODY"),
|
|
348
|
-
(nid, "knowledge", CCG % "KNOW-BODY")], "a3")
|
|
349
|
-
coex += int(len(files) > 1)
|
|
350
|
-
print(" round %d: files=%s res=%s"
|
|
351
|
-
% (rd, files, [(r.get("committed"),
|
|
352
|
-
str(r.get("error") or "")[:40]) for r in res]))
|
|
353
|
-
_check('A3 库层 add 并发同 id 也不得两份并存(add 自己的锁在位)',
|
|
354
|
-
coex == 0, coex)
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
def group_a4():
|
|
358
|
-
print('== A4:_move_layer 与 add 并发同 id(搬迁读改写 vs 覆写,2 轮)==')
|
|
359
|
-
import json as _json
|
|
360
|
-
import time as _time
|
|
361
|
-
lost = 0
|
|
362
|
-
for rd in range(2):
|
|
363
|
-
t = tempfile.mkdtemp(prefix="i322_a4_")
|
|
364
|
-
env = _env(t)
|
|
365
|
-
root = os.path.join(t, "root")
|
|
366
|
-
nid = "race_move"
|
|
367
|
-
old = dict(os.environ)
|
|
368
|
-
try:
|
|
369
|
-
os.environ.update({k: v for k, v in env.items()
|
|
370
|
-
if k.startswith(("MDCG_", "HOME"))})
|
|
371
|
-
from md_cg.mdcos import MdCGOS
|
|
372
|
-
_cg = MdCGOS(root)
|
|
373
|
-
_cg.add(nid, CCG % "OLD-BODY", layer="knowledge")
|
|
374
|
-
_cg.close()
|
|
375
|
-
finally:
|
|
376
|
-
os.environ.clear()
|
|
377
|
-
os.environ.update(old)
|
|
378
|
-
t0 = _time.time() + 1.5
|
|
379
|
-
ps = []
|
|
380
|
-
for worker, extra in ((_W_MOVE, [nid, str(t0)]),
|
|
381
|
-
(_W_ADD_SLOW, [nid, "knowledge",
|
|
382
|
-
CCG % "NEW-BODY", str(t0)])):
|
|
383
|
-
ps.append(subprocess.Popen(
|
|
384
|
-
[sys.executable, "-X", "utf8", "-c", worker, _REPO,
|
|
385
|
-
root] + extra, env=env, cwd=env["HOME"],
|
|
386
|
-
stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True,
|
|
387
|
-
encoding="utf-8", errors="replace"))
|
|
388
|
-
res = []
|
|
389
|
-
for p in ps:
|
|
390
|
-
o, e = p.communicate(timeout=180)
|
|
391
|
-
try:
|
|
392
|
-
res.append(_json.loads(o.strip().splitlines()[-1]))
|
|
393
|
-
except Exception:
|
|
394
|
-
res.append({"ok": False, "error": "ERR " + e.strip()[-120:]})
|
|
395
|
-
bodies = _bodies_of(root, nid)
|
|
396
|
-
hit = any("NEW-BODY" in t for t in bodies)
|
|
397
|
-
lost += int(not hit)
|
|
398
|
-
print(" round %d: 新值在盘=%s files=%s res=%s"
|
|
399
|
-
% (rd, hit, _same_id_files(root, nid),
|
|
400
|
-
[(r.get("committed"), str(r.get("error") or "")[:36])
|
|
401
|
-
for r in res]))
|
|
402
|
-
_check('A4 搬迁与 add 并发时,已应答 add 的新正文不得被搬迁的旧正文顶掉',
|
|
403
|
-
lost == 0, lost)
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
def group_a5():
|
|
407
|
-
print('== A5:MdCGSecure.add 密级继承的读改写(声明 vs 未声明,2 轮)==')
|
|
408
|
-
import json as _json
|
|
409
|
-
import time as _time
|
|
410
|
-
downgraded = 0
|
|
411
|
-
for rd in range(2):
|
|
412
|
-
t = tempfile.mkdtemp(prefix="i322_a5_")
|
|
413
|
-
env = _env(t)
|
|
414
|
-
root = os.path.join(t, "root")
|
|
415
|
-
nid = "race_sens"
|
|
416
|
-
old = dict(os.environ)
|
|
417
|
-
try:
|
|
418
|
-
os.environ.update({k: v for k, v in env.items()
|
|
419
|
-
if k.startswith(("MDCG_", "HOME"))})
|
|
420
|
-
from md_cg.mdcos import MdCGSecure
|
|
421
|
-
from md_cg.security import Principal
|
|
422
|
-
from md_cg.tokens import role_spec
|
|
423
|
-
sp = role_spec("designer")
|
|
424
|
-
_cg = MdCGSecure(root, principal=Principal(
|
|
425
|
-
actor="designer", clearance="secret", can_write=True,
|
|
426
|
-
can_admin=True, role="designer",
|
|
427
|
-
layers_allow=sp["layers_allow"],
|
|
428
|
-
ops_allow=sp["ops_allow"]))
|
|
429
|
-
_cg.add(nid, CCG % "SEED", layer="knowledge",
|
|
430
|
-
sensitivity="public")
|
|
431
|
-
_cg.close()
|
|
432
|
-
finally:
|
|
433
|
-
os.environ.clear()
|
|
434
|
-
os.environ.update(old)
|
|
435
|
-
t0 = _time.time() + 1.5
|
|
436
|
-
ps = [
|
|
437
|
-
# A:显式声明 internal,快写
|
|
438
|
-
subprocess.Popen([sys.executable, "-X", "utf8", "-c", _W_SECURE,
|
|
439
|
-
_REPO, root, nid, CCG % "A-INTERNAL",
|
|
440
|
-
"internal", "0", str(t0)],
|
|
441
|
-
env=env, cwd=env["HOME"],
|
|
442
|
-
stdout=subprocess.PIPE,
|
|
443
|
-
stderr=subprocess.PIPE, text=True,
|
|
444
|
-
encoding="utf-8", errors="replace"),
|
|
445
|
-
# B:未声明(应继承**当前**密级),读到旧值后睡 0.5s 再落盘
|
|
446
|
-
subprocess.Popen([sys.executable, "-X", "utf8", "-c", _W_SECURE,
|
|
447
|
-
_REPO, root, nid, CCG % "B-INHERIT",
|
|
448
|
-
"", "0.5", str(t0)],
|
|
449
|
-
env=env, cwd=env["HOME"],
|
|
450
|
-
stdout=subprocess.PIPE,
|
|
451
|
-
stderr=subprocess.PIPE, text=True,
|
|
452
|
-
encoding="utf-8", errors="replace"),
|
|
453
|
-
]
|
|
454
|
-
res = []
|
|
455
|
-
for p in ps:
|
|
456
|
-
o, e = p.communicate(timeout=180)
|
|
457
|
-
try:
|
|
458
|
-
res.append(_json.loads(o.strip().splitlines()[-1]))
|
|
459
|
-
except Exception:
|
|
460
|
-
res.append({"ok": False, "error": "ERR " + e.strip()[-120:]})
|
|
461
|
-
final = _sens_on_disk(root, nid)
|
|
462
|
-
bad = final != "internal"
|
|
463
|
-
downgraded += int(bad)
|
|
464
|
-
print(" round %d: 盘面密级=%s 降级=%s res=%s"
|
|
465
|
-
% (rd, final, bad,
|
|
466
|
-
[(r.get("ok"), str(r.get("error") or "")[:36])
|
|
467
|
-
for r in res]))
|
|
468
|
-
_check('A5 未声明的同 id 写必须继承他进程刚落盘的密级'
|
|
469
|
-
'(不得按陈旧索引把 internal 静默降级回 public)',
|
|
470
|
-
downgraded == 0, downgraded)
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
def group_k1():
|
|
474
|
-
print('== K1:串行覆写仍真生效(锁不是空操作/不会永久占锁)==')
|
|
475
|
-
t = tempfile.mkdtemp(prefix="i322_k1_")
|
|
476
|
-
env = _env(t)
|
|
477
|
-
root = os.path.join(t, "root")
|
|
478
|
-
old = dict(os.environ)
|
|
479
|
-
try:
|
|
480
|
-
os.environ.update({k: v for k, v in env.items()
|
|
481
|
-
if k.startswith(("MDCG_", "HOME"))})
|
|
482
|
-
from md_cg.mdcos import MdCGOS
|
|
483
|
-
cg = MdCGOS(root)
|
|
484
|
-
nid = "serial_node"
|
|
485
|
-
cg.add(nid, CCG % "SERIAL-V1", layer="knowledge")
|
|
486
|
-
cg.add(nid, CCG % "SERIAL-V2", layer="knowledge") # 同 id 串行覆写
|
|
487
|
-
got = cg.get(nid) or {}
|
|
488
|
-
cg.close()
|
|
489
|
-
finally:
|
|
490
|
-
os.environ.clear()
|
|
491
|
-
os.environ.update(old)
|
|
492
|
-
text = got.get("content") or ""
|
|
493
|
-
_check('K1 串行第二次覆写真落盘(正文为 V2,且锁未卡死/未误吞)',
|
|
494
|
-
"SERIAL-V2" in text, text[-80:])
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
def _src(rel):
|
|
498
|
-
with open(os.path.join(_REPO, rel), encoding="utf-8") as f:
|
|
499
|
-
return f.read()
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
def _method_src(cls, name):
|
|
503
|
-
"""取运行中方法的源码(与既有守卫 test_session_attribution_consistency:555
|
|
504
|
-
同手法:`inspect.getsource` + `textwrap.dedent`)。用它而不是整文件 grep,
|
|
505
|
-
是因为 `node_write_lock(self, node_id)` 现在在 MdCGOS.add 与 MdCGSecure.add
|
|
506
|
-
各出现一次——整文件计数判不出「哪一层漏了」。"""
|
|
507
|
-
import inspect
|
|
508
|
-
import textwrap
|
|
509
|
-
return textwrap.dedent(inspect.getsource(getattr(cls, name)))
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
def group_e():
|
|
513
|
-
print('== E 组:结构锚(fail-closed)==')
|
|
514
|
-
from md_cg.mdcos import MdCGOS, MdCGSecure
|
|
515
|
-
fs = _src("md_cg/fsutil.py")
|
|
516
|
-
wp = _src("md_cg/writepipe.py")
|
|
517
|
-
mo = _src("md_cg/mdcos.py")
|
|
518
|
-
_add_src = _method_src(MdCGOS, "add")
|
|
519
|
-
_sec_add_src = _method_src(MdCGSecure, "add")
|
|
520
|
-
_move_src = _method_src(MdCGOS, "_move_layer")
|
|
521
|
-
_ws_src = _method_src(MdCGSecure, "_write_sensitivity")
|
|
522
|
-
_check('E1 node_write_lock 走 FileLock 且 strict=True(不得无锁放行)',
|
|
523
|
-
"def node_write_lock" in fs and "strict=True" in fs
|
|
524
|
-
and "FileLock(" in fs)
|
|
525
|
-
_seg = fs.split("def node_write_lock")[1].split("def merge_rmw_lock")[0]
|
|
526
|
-
_check('E2 不得用进程内锁冒充(node_write_lock 内无 threading.Lock;'
|
|
527
|
-
'重入记账只允许 threading.local)',
|
|
528
|
-
"threading.Lock(" not in _seg and "threading.RLock(" not in _seg,
|
|
529
|
-
_seg[:200])
|
|
530
|
-
_check('E3 writepipe.execute 在 node_write_lock 内跑整条链',
|
|
531
|
-
"with node_write_lock(cg, _nid):" in wp
|
|
532
|
-
and "return self._run_chain(ctx, a)" in wp)
|
|
533
|
-
_check('E4 MdCGOS.add 在 node_write_lock 内落盘(落盘段在锁块内,'
|
|
534
|
-
'不得只把加锁写在函数外/抽成子函数)',
|
|
535
|
-
"with node_write_lock(self, node_id):" in _add_src
|
|
536
|
-
and 'self._audit("add"' in _add_src.split(
|
|
537
|
-
"with node_write_lock(self, node_id):", 1)[1]
|
|
538
|
-
and "def _add_locked" not in mo)
|
|
539
|
-
_check('E5 MdCGSecure.add 的密级继承读改写也在同一把锁内'
|
|
540
|
-
'(_write_sensitivity 读旧值 → 据此落盘,锁在 super 之前)',
|
|
541
|
-
"with node_write_lock(self, node_id):" in _sec_add_src
|
|
542
|
-
and "self._write_sensitivity(node_id, sensitivity)" in
|
|
543
|
-
_sec_add_src.split("with node_write_lock(self, node_id):", 1)[1])
|
|
544
|
-
_check('E5b 密级继承读之前先做跨进程代际探活(_maybe_reload_index)'
|
|
545
|
-
'——锁只保证互斥,不保证读到他进程已落盘的新密级',
|
|
546
|
-
"_maybe_reload_index" in _ws_src
|
|
547
|
-
and _ws_src.index("_maybe_reload_index")
|
|
548
|
-
< _ws_src.index("subgraph.node_sensitivity("))
|
|
549
|
-
_check('E6 MdCGOS._move_layer 在 node_write_lock 内转调父类'
|
|
550
|
-
'(搬迁=同 id 读改写,不经 add,必须单独覆盖)',
|
|
551
|
-
"with node_write_lock(self, node_id):" in _move_src
|
|
552
|
-
and "super()._move_layer(" in
|
|
553
|
-
_move_src.split("with node_write_lock(self, node_id):", 1)[1])
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
def main():
|
|
557
|
-
print('== #322 守卫 ==')
|
|
558
|
-
# 锚点自检(fail-closed):修复的关键字面量不在源码里 ⇒ 对应 E 项红 + 整体 rc=1。
|
|
559
|
-
# 不用 exit 2 提前返回:变异自证要求「撤哪一处就红哪一条」,提前退出会让
|
|
560
|
-
# 红项集合为空、判别力无从体现。
|
|
561
|
-
fs = _src("md_cg/fsutil.py")
|
|
562
|
-
wp = _src("md_cg/writepipe.py")
|
|
563
|
-
from md_cg.mdcos import MdCGOS
|
|
564
|
-
_mo_add = _method_src(MdCGOS, "add")
|
|
565
|
-
_check('E0a fsutil.node_write_lock 在位(锚点自检)',
|
|
566
|
-
"def node_write_lock" in fs)
|
|
567
|
-
_check('E0b writepipe 调用 node_write_lock 的锚点在位(锚点自检)',
|
|
568
|
-
"with node_write_lock(cg, _nid):" in wp)
|
|
569
|
-
# 锚点取 **MdCGOS.add 自己的源码**而非整文件:同一条 `with node_write_lock(
|
|
570
|
-
# self, node_id):` 现在在 MdCGOS.add 与 MdCGSecure.add 各出现一次,整文件
|
|
571
|
-
# 计数会让「撤掉 MdCGOS.add 那把锁」时本项仍绿(变异腿实测 M2 漏红)。
|
|
572
|
-
_check('E0c mdcos.add 调用 node_write_lock 的锚点在位(锚点自检)',
|
|
573
|
-
"with node_write_lock(self, node_id):" in _mo_add)
|
|
574
|
-
try:
|
|
575
|
-
group_a1()
|
|
576
|
-
group_a2()
|
|
577
|
-
group_a3()
|
|
578
|
-
group_a4()
|
|
579
|
-
group_a5()
|
|
580
|
-
group_k1()
|
|
581
|
-
except Exception as e:
|
|
582
|
-
import traceback
|
|
583
|
-
traceback.print_exc()
|
|
584
|
-
_check('A/K 组内异常(fail-closed)', False, str(e)[:150])
|
|
585
|
-
group_e()
|
|
586
|
-
print('=' * 62)
|
|
587
|
-
print('#322 守卫:%d 通过,%d 失败' % (len(PASSED), len(FAILS)))
|
|
588
|
-
for f in FAILS:
|
|
589
|
-
print(' 红项:' + f)
|
|
590
|
-
return 0 if not FAILS else 1
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
def _mirror():
|
|
594
|
-
"""镜像树:md_cg 包 + data/policy.json(包内默认策略按包根解析,
|
|
595
|
-
缺它则写链在镜像里 policy_unavailable ⇒ 并发腿全被短路,变异判别力假绿)。"""
|
|
596
|
-
d = tempfile.mkdtemp(prefix="i322_mirror_")
|
|
597
|
-
shutil.copytree(os.path.join(_REPO, "md_cg"),
|
|
598
|
-
os.path.join(d, "md_cg"),
|
|
599
|
-
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
600
|
-
# 仓根一级模块(`md_cg/mcp_server.py` 顶部 `from utf8_boot import ensure_utf8`
|
|
601
|
-
# 等)必须一并镜像,否则副本里写链 import 即失败、并发腿全空跑(假红/假绿)。
|
|
602
|
-
for fn in os.listdir(_REPO):
|
|
603
|
-
if fn.endswith(".py") and os.path.isfile(os.path.join(_REPO, fn)):
|
|
604
|
-
shutil.copy2(os.path.join(_REPO, fn), os.path.join(d, fn))
|
|
605
|
-
src_pol = os.path.join(_REPO, "data", "policy.json")
|
|
606
|
-
if os.path.exists(src_pol):
|
|
607
|
-
os.makedirs(os.path.join(d, "data"), exist_ok=True)
|
|
608
|
-
shutil.copy2(src_pol, os.path.join(d, "data", "policy.json"))
|
|
609
|
-
return d
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
def _run_in(tree):
|
|
613
|
-
p = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
614
|
-
"md_cg.test_issue322_node_write_lock"],
|
|
615
|
-
cwd=tree, capture_output=True, text=True,
|
|
616
|
-
encoding="utf-8", errors="replace",
|
|
617
|
-
timeout=1800,
|
|
618
|
-
env=dict({k: v for k, v in os.environ.items()
|
|
619
|
-
if not k.startswith("PYTHON")},
|
|
620
|
-
PYTHONPATH=tree, PYTHONUTF8="1"))
|
|
621
|
-
reds = [ln.strip().split(" ", 1)[0].replace("FAIL ", "")
|
|
622
|
-
for ln in p.stdout.splitlines() if ln.strip().startswith("FAIL ")]
|
|
623
|
-
return p.returncode, reds, p.stdout + p.stderr
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
_MUTATIONS = [
|
|
627
|
-
("M1 撤 writepipe 整链锁", [("md_cg/writepipe.py",
|
|
628
|
-
" with node_write_lock(cg, _nid):\n"
|
|
629
|
-
" return self._run_chain(ctx, a)",
|
|
630
|
-
" return self._run_chain(ctx, a)")],
|
|
631
|
-
# 撤链锁:add 级锁仍在 ⇒ 盘面不会两份并存(A1a/A2 仍绿,如实),
|
|
632
|
-
# 但「判存在 → 定档 → 落盘」的整段不再互斥 ⇒ 两个写者都 committed(A1b)、
|
|
633
|
-
# 输的那份正文从 root 消失(A1c)——正是 #322 的症状。
|
|
634
|
-
("A1b", "A1c", "E0b", "E3")),
|
|
635
|
-
# M2/M3 用 `if True:` 顶替 `with`(保留缩进/作用域,只把锁去掉):
|
|
636
|
-
# 行为腿(A3)与结构锚同时可判,且不依赖字符串再缩进。
|
|
637
|
-
("M2 撤 MdCGOS.add 锁", [("md_cg/mdcos.py",
|
|
638
|
-
" with node_write_lock(self, node_id):\n"
|
|
639
|
-
" # #151",
|
|
640
|
-
" if True: # MUT\n"
|
|
641
|
-
" # #151")],
|
|
642
|
-
("A3", "E0c", "E4")),
|
|
643
|
-
("M3 撤 MdCGSecure.add 的密级继承锁", [("md_cg/mdcos.py",
|
|
644
|
-
" with node_write_lock(self, "
|
|
645
|
-
"node_id):\n"
|
|
646
|
-
" sens = self."
|
|
647
|
-
"_write_sensitivity(",
|
|
648
|
-
" if True: # MUT\n"
|
|
649
|
-
" sens = self."
|
|
650
|
-
"_write_sensitivity(")],
|
|
651
|
-
("E5",)),
|
|
652
|
-
# M3b:只撤「读前代际探活」——锁与结构锚都还在,只有**行为腿 A5** 能判它
|
|
653
|
-
# (这正是复核意见 5 指出的残留窗口:互斥 ≠ 读到新值)。
|
|
654
|
-
("M3b 撤密级继承的跨进程代际探活", [("md_cg/mdcos.py",
|
|
655
|
-
" _probe = getattr(self, "
|
|
656
|
-
"\"_maybe_reload_index\", None)\n"
|
|
657
|
-
" if callable(_probe):\n"
|
|
658
|
-
" _probe()\n",
|
|
659
|
-
" _probe = None\n")],
|
|
660
|
-
("A5",)),
|
|
661
|
-
("M4 撤 MdCGOS._move_layer 的搬迁锁", [("md_cg/mdcos.py",
|
|
662
|
-
" with node_write_lock(self, "
|
|
663
|
-
"node_id):\n"
|
|
664
|
-
" return super()."
|
|
665
|
-
"_move_layer(",
|
|
666
|
-
" if True: # MUT\n"
|
|
667
|
-
" return super()."
|
|
668
|
-
"_move_layer(")],
|
|
669
|
-
("A4", "E6")),
|
|
670
|
-
]
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
def _mutate():
|
|
674
|
-
print('!! 定点变异自证:把锁撤掉,守卫必须转红')
|
|
675
|
-
tree = _mirror()
|
|
676
|
-
try:
|
|
677
|
-
rc, reds, out = _run_in(tree)
|
|
678
|
-
print(' 未变异镜像基线:rc=%d 红项=%d(须 rc=0/0 红)' % (rc, len(reds)))
|
|
679
|
-
if rc != 0 or reds:
|
|
680
|
-
print(chr(10).join(out.splitlines()[-25:]))
|
|
681
|
-
bad = []
|
|
682
|
-
for desc, edits, exp in _MUTATIONS:
|
|
683
|
-
backups = []
|
|
684
|
-
miss = []
|
|
685
|
-
for rel, oldp, newp in edits:
|
|
686
|
-
p = os.path.join(tree, rel)
|
|
687
|
-
with open(p, encoding="utf-8", newline="") as f:
|
|
688
|
-
t = f.read()
|
|
689
|
-
if t.count(oldp) != 1:
|
|
690
|
-
miss.append("%s 命中 %d 次" % (rel, t.count(oldp)))
|
|
691
|
-
continue
|
|
692
|
-
backups.append((p, t))
|
|
693
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
694
|
-
f.write(t.replace(oldp, newp, 1))
|
|
695
|
-
if miss:
|
|
696
|
-
bad.append("%s —— %s" % (desc, ";".join(miss)))
|
|
697
|
-
print(' ANCHOR-MISS ' + desc)
|
|
698
|
-
for p, t in backups:
|
|
699
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
700
|
-
f.write(t)
|
|
701
|
-
continue
|
|
702
|
-
rc2, reds2, out2 = _run_in(tree)
|
|
703
|
-
for p, t in backups:
|
|
704
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
705
|
-
f.write(t)
|
|
706
|
-
hit = sorted({e for r in reds2 for e in exp if r.startswith(e + " ")
|
|
707
|
-
or r.startswith(e)})
|
|
708
|
-
if rc2 != 0 and hit == sorted(exp):
|
|
709
|
-
print(' OK %s 红项=%s' % (desc, reds2))
|
|
710
|
-
else:
|
|
711
|
-
bad.append(desc)
|
|
712
|
-
print(' MISMATCH %s rc=%d 红项=%s' % (desc, rc2, reds2))
|
|
713
|
-
print(chr(10).join(out2.splitlines()[-20:]))
|
|
714
|
-
print('定点变异自证:%s(%d 条不合格)'
|
|
715
|
-
% ('PASS' if not bad else 'FAIL', len(bad)))
|
|
716
|
-
for b in bad:
|
|
717
|
-
print(' 不合格:' + b)
|
|
718
|
-
_check('变异自证全过', not bad, bad)
|
|
719
|
-
finally:
|
|
720
|
-
shutil.rmtree(tree, ignore_errors=True)
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
if __name__ == '__main__':
|
|
724
|
-
if '--mutate' in sys.argv:
|
|
725
|
-
_mutate()
|
|
726
|
-
sys.exit(0 if not FAILS else 1)
|
|
727
|
-
sys.exit(main())
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
# 功能名:#322 同一 node_id 并发写的跨进程串行化(writepipe 写链 + MdCGOS.add/_move_layer 库层)
|
|
3
|
+
# 生效条件:python -X utf8 -m md_cg.test_issue322_node_write_lock [--mutate];
|
|
4
|
+
# 被测面=md_cg/writepipe.py 的 WritePipeline.execute、md_cg/mdcos.py 的 MdCGOS.add、
|
|
5
|
+
# MdCGSecure.add、MdCGOS._move_layer、md_cg/fsutil.py 的 node_write_lock
|
|
6
|
+
# 子功能:A1=writepipe 并发同 id(3 进程 × 2 轮)不丢正文且至多一个 committed;
|
|
7
|
+
# A2=writepipe anchor/knowledge 同 id 并发不得两份并存;A3=**库层** cg.add 直接并发
|
|
8
|
+
# anchor/knowledge 同 id 不得两份并存(钉 add 自己的锁,不靠 writepipe);
|
|
9
|
+
# A4=**_move_layer 与 add 并发同 id**(搬迁的读旧位置→写新层→删旧文件 vs 覆写)——
|
|
10
|
+
# 已应答的 add 新值不得被搬迁写下的旧正文顶掉;A5=**密级继承的读改写**
|
|
11
|
+
# (A 显式声明 internal 覆写 / B 未声明应继承当前密级)——盘面不得被陈旧索引降级回
|
|
12
|
+
# public;K1=串行覆写仍真生效(锁不是空操作);
|
|
13
|
+
# E1/E2=结构锚(走 FileLock + strict、不用进程内锁);E3/E4/E5/E5b/E6=各落点在锁块内
|
|
14
|
+
# (E5b=密级继承读前先做跨进程代际探活:互斥 ≠ 读到新值)
|
|
15
|
+
# 执行:每轮新建隔离库;写者各自独立进程自旋对齐后并发写同一 id;读盘面同 id 文件集合
|
|
16
|
+
# 验证方式:全部 PASS 即通过(rc=0);--mutate 走镜像树定点变异,红项集合须恰为预期
|
|
17
|
+
# 不适用条件:① 不测吞吐/锁开销(那是性能面,不是本缺陷);② 不覆盖 Windows 之外的
|
|
18
|
+
# OS 锁实现差异(FileLock 自身的语义由既有守卫负责);③ 不判「不同 node_id 是否并行」
|
|
19
|
+
# (按 id 分锁的设计意图,不是本缺陷的验收面);④ 不覆盖**直接构造 `MdCG`**(父类)
|
|
20
|
+
# 的搬迁路径——锁的覆盖点在 `MdCGOS`(子类覆盖),`md_cg/mdcg.py` 不在本单元写面
|
|
21
|
+
"""#322 守卫:同 id 并发写必须被同一把**跨进程**锁串行化。
|
|
22
|
+
|
|
23
|
+
病象(修前,探针 .tmp/u06/probe_322.py 实测):
|
|
24
|
+
· 普通腿 6/6 轮:4 个写者全部回执 committed:true,盘面只有 1 份正文,
|
|
25
|
+
其余 3 份**已应答却从 root 里消失**(静默丢正文);
|
|
26
|
+
· anchor 腿 6/6 轮:anchor 与 knowledge 各写同 id,盘面**两份并存**
|
|
27
|
+
(anchor\\x.md + knowledge/orphan\\x.md),保护闸在两侧都看不到对方
|
|
28
|
+
⇒ 保护被绕过。
|
|
29
|
+
· 搬迁腿(`.tmp/u06/probe_move_add.py`)3/3 轮:`_move_layer` 读到旧位置后
|
|
30
|
+
慢写新层,并发的 add 已应答的新正文被搬迁写下的旧正文顶掉。
|
|
31
|
+
· 密级继承腿(`.tmp/u06/probe_secure_add.py`):无锁 6/6 轮、只加 add 锁仍 3/6 轮
|
|
32
|
+
——B 按**陈旧内存索引**继承密级,把他进程刚落盘的 internal 静默降级回 public。
|
|
33
|
+
修法(单点):fsutil.node_write_lock(OS 级 FileLock + 同线程重入计数),
|
|
34
|
+
writepipe.execute 整条链 + MdCGOS.add / MdCGSecure.add / MdCGOS._move_layer
|
|
35
|
+
各持同一把(同线程重入不互锁);密级继承读之前另做一次
|
|
36
|
+
`_maybe_reload_index` 代际探活(锁保证互斥,探活保证读到新值)。
|
|
37
|
+
"""
|
|
38
|
+
import os
|
|
39
|
+
import shutil
|
|
40
|
+
import subprocess
|
|
41
|
+
import sys
|
|
42
|
+
import tempfile
|
|
43
|
+
|
|
44
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
45
|
+
|
|
46
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
47
|
+
if _REPO not in sys.path:
|
|
48
|
+
sys.path.insert(0, _REPO)
|
|
49
|
+
|
|
50
|
+
PASSED, FAILS = [], []
|
|
51
|
+
|
|
52
|
+
CCG = ("# 功能名:并发写守卫夹具\n"
|
|
53
|
+
"# 生效条件:多进程同 id 同 root 并发写\n"
|
|
54
|
+
"# 子功能:无\n"
|
|
55
|
+
"# 执行:无\n"
|
|
56
|
+
"# 验证方式:无\n"
|
|
57
|
+
"# 不适用条件:无\n"
|
|
58
|
+
"%s\n")
|
|
59
|
+
|
|
60
|
+
_W_WRITEPIPE = r'''
|
|
61
|
+
import json, sys, time
|
|
62
|
+
sys.path.insert(0, sys.argv[1])
|
|
63
|
+
from md_cg.mdcos import MdCGOS
|
|
64
|
+
from md_cg.writepipe import default_pipeline
|
|
65
|
+
root, nid, layer, body, t0 = sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], float(sys.argv[6])
|
|
66
|
+
cg = MdCGOS(root)
|
|
67
|
+
while time.time() < t0:
|
|
68
|
+
pass
|
|
69
|
+
try:
|
|
70
|
+
r = default_pipeline().execute(cg, {"node_id": nid, "content": body,
|
|
71
|
+
"layer": layer, "content_kind": "text"})
|
|
72
|
+
out = {"ok": r.get("ok"), "committed": r.get("committed"),
|
|
73
|
+
"error": r.get("error")}
|
|
74
|
+
except Exception as exc:
|
|
75
|
+
out = {"ok": False, "committed": False,
|
|
76
|
+
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
77
|
+
try:
|
|
78
|
+
cg.close()
|
|
79
|
+
except Exception:
|
|
80
|
+
pass
|
|
81
|
+
print(json.dumps(out, ensure_ascii=False))
|
|
82
|
+
'''
|
|
83
|
+
|
|
84
|
+
_W_ADD = r'''
|
|
85
|
+
import json, sys, time
|
|
86
|
+
sys.path.insert(0, sys.argv[1])
|
|
87
|
+
from md_cg.mdcos import MdCGOS
|
|
88
|
+
root, nid, layer, body, t0 = sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], float(sys.argv[6])
|
|
89
|
+
cg = MdCGOS(root)
|
|
90
|
+
while time.time() < t0:
|
|
91
|
+
pass
|
|
92
|
+
try:
|
|
93
|
+
cg.add(nid, body, layer=layer)
|
|
94
|
+
out = {"ok": True, "committed": True, "error": None}
|
|
95
|
+
except Exception as exc:
|
|
96
|
+
out = {"ok": False, "committed": False,
|
|
97
|
+
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
98
|
+
try:
|
|
99
|
+
cg.close()
|
|
100
|
+
except Exception:
|
|
101
|
+
pass
|
|
102
|
+
print(json.dumps(out, ensure_ascii=False))
|
|
103
|
+
'''
|
|
104
|
+
|
|
105
|
+
#: 搬迁腿:把基类 `_write_node` 包一层 sleep 0.5s(只拉长「读到旧位置 → 写新层 →
|
|
106
|
+
#: 删旧文件」的窗口,不改任何判据),再对同一 id 调 `_move_layer`。
|
|
107
|
+
_W_MOVE = r'''
|
|
108
|
+
import json, sys, time
|
|
109
|
+
sys.path.insert(0, sys.argv[1])
|
|
110
|
+
from md_cg.mdcos import MdCGOS
|
|
111
|
+
from md_cg.mdcg import MdCG
|
|
112
|
+
root, nid, t0 = sys.argv[2], sys.argv[3], float(sys.argv[4])
|
|
113
|
+
_o = MdCG._write_node
|
|
114
|
+
def _slow(self, *a, **k):
|
|
115
|
+
time.sleep(0.5)
|
|
116
|
+
return _o(self, *a, **k)
|
|
117
|
+
MdCG._write_node = _slow
|
|
118
|
+
cg = MdCGOS(root)
|
|
119
|
+
while time.time() < t0:
|
|
120
|
+
pass
|
|
121
|
+
try:
|
|
122
|
+
r = cg._move_layer(nid, "contextual", reason="i322-guard")
|
|
123
|
+
out = {"ok": True, "committed": True,
|
|
124
|
+
"error": None, "to": (r or {}).get("to")}
|
|
125
|
+
except Exception as exc:
|
|
126
|
+
out = {"ok": False, "committed": False,
|
|
127
|
+
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
128
|
+
try:
|
|
129
|
+
cg.close()
|
|
130
|
+
except Exception:
|
|
131
|
+
pass
|
|
132
|
+
print(json.dumps(out, ensure_ascii=False))
|
|
133
|
+
'''
|
|
134
|
+
|
|
135
|
+
|
|
136
|
+
def _check(n, c, d=''):
|
|
137
|
+
if c:
|
|
138
|
+
print(' PASS ' + n)
|
|
139
|
+
PASSED.append(n)
|
|
140
|
+
else:
|
|
141
|
+
print(' FAIL ' + n + ' ' + str(d)[:200])
|
|
142
|
+
FAILS.append(n)
|
|
143
|
+
|
|
144
|
+
|
|
145
|
+
def _env(t):
|
|
146
|
+
env = {k: v for k, v in os.environ.items()
|
|
147
|
+
if not k.startswith(("MDCG_", "PYTHON"))}
|
|
148
|
+
for k, d in (("HOME", "home"), ("MDCG_STATE_ROOT", "state"),
|
|
149
|
+
("MDCG_AUX_ROOT", "auxstore"), ("MDCG_DATA_ROOT", "data"),
|
|
150
|
+
("MDCG_EXPORT_ROOT", "export")):
|
|
151
|
+
env[k] = os.path.join(t, d)
|
|
152
|
+
os.makedirs(env[k])
|
|
153
|
+
env.update(MDCG_SUSTAIN="0", MDCG_SLEEP="0", PYTHONUTF8="1",
|
|
154
|
+
PYTHONPATH=_REPO)
|
|
155
|
+
return env
|
|
156
|
+
|
|
157
|
+
|
|
158
|
+
def _race(root, env, worker, writers):
|
|
159
|
+
t0 = __import__("time").time() + 1.5
|
|
160
|
+
ps = [subprocess.Popen([sys.executable, "-X", "utf8", "-c", worker, _REPO,
|
|
161
|
+
root, nid, layer, body, str(t0)], env=env,
|
|
162
|
+
cwd=env["HOME"], stdout=subprocess.PIPE,
|
|
163
|
+
stderr=subprocess.PIPE, text=True,
|
|
164
|
+
encoding="utf-8", errors="replace")
|
|
165
|
+
for nid, layer, body in writers]
|
|
166
|
+
res = []
|
|
167
|
+
for p in ps:
|
|
168
|
+
o, e = p.communicate(timeout=180)
|
|
169
|
+
try:
|
|
170
|
+
res.append(__import__("json").loads(o.strip().splitlines()[-1]))
|
|
171
|
+
except Exception:
|
|
172
|
+
res.append({"ok": False, "committed": False,
|
|
173
|
+
"error": "ERR " + e.strip()[-120:]})
|
|
174
|
+
return res
|
|
175
|
+
|
|
176
|
+
|
|
177
|
+
def _same_id_files(root, nid):
|
|
178
|
+
out = []
|
|
179
|
+
for dirpath, _d, files in os.walk(root):
|
|
180
|
+
for fn in files:
|
|
181
|
+
if fn == nid + ".md":
|
|
182
|
+
out.append(os.path.relpath(os.path.join(dirpath, fn), root))
|
|
183
|
+
return sorted(out)
|
|
184
|
+
|
|
185
|
+
|
|
186
|
+
def _one_round(worker, writers, tag):
|
|
187
|
+
t = tempfile.mkdtemp(prefix="i322_" + tag + "_")
|
|
188
|
+
env = _env(t)
|
|
189
|
+
root = os.path.join(t, "root")
|
|
190
|
+
res = _race(root, env, worker, writers)
|
|
191
|
+
files = _same_id_files(root, writers[0][0])
|
|
192
|
+
return res, files, root
|
|
193
|
+
|
|
194
|
+
|
|
195
|
+
def _body_of(root, nid):
|
|
196
|
+
"""从盘面读回该 id 节点的正文(唯一一份时)。"""
|
|
197
|
+
for dirpath, _d, files in os.walk(root):
|
|
198
|
+
if nid + ".md" in files:
|
|
199
|
+
with open(os.path.join(dirpath, nid + ".md"),
|
|
200
|
+
encoding="utf-8") as f:
|
|
201
|
+
return f.read()
|
|
202
|
+
return ""
|
|
203
|
+
|
|
204
|
+
|
|
205
|
+
#: A4 的 add 腿:在 `_write_node` 里睡 0.4s(< 搬迁腿的 0.5s)——把「add 正在落盘」
|
|
206
|
+
#: 精确放进「搬迁已读完旧位置、还没删旧文件」的窗口。**只拉长窗口,不改判据**。
|
|
207
|
+
_W_ADD_SLOW = r'''
|
|
208
|
+
import json, sys, time
|
|
209
|
+
sys.path.insert(0, sys.argv[1])
|
|
210
|
+
from md_cg.mdcos import MdCGOS
|
|
211
|
+
from md_cg.mdcg import MdCG
|
|
212
|
+
root, nid, layer, body, t0 = sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], float(sys.argv[6])
|
|
213
|
+
_o = MdCG._write_node
|
|
214
|
+
def _slow(self, *a, **k):
|
|
215
|
+
time.sleep(0.4)
|
|
216
|
+
return _o(self, *a, **k)
|
|
217
|
+
MdCG._write_node = _slow
|
|
218
|
+
cg = MdCGOS(root)
|
|
219
|
+
while time.time() < t0:
|
|
220
|
+
pass
|
|
221
|
+
try:
|
|
222
|
+
cg.add(nid, body, layer=layer)
|
|
223
|
+
out = {"ok": True, "committed": True, "error": None}
|
|
224
|
+
except Exception as exc:
|
|
225
|
+
out = {"ok": False, "committed": False,
|
|
226
|
+
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
227
|
+
try:
|
|
228
|
+
cg.close()
|
|
229
|
+
except Exception:
|
|
230
|
+
pass
|
|
231
|
+
print(json.dumps(out, ensure_ascii=False))
|
|
232
|
+
'''
|
|
233
|
+
|
|
234
|
+
|
|
235
|
+
#: A5 的 worker:带 principal 的写(密级继承面)。`delay` 非 0 时在
|
|
236
|
+
#: `_write_sensitivity` **解析完旧密级之后**睡一会儿——这正是「读到旧值 → 据此落盘」
|
|
237
|
+
#: 的窗口(只拉长窗口,不改判据)。
|
|
238
|
+
_W_SECURE = r'''
|
|
239
|
+
import json, sys, time
|
|
240
|
+
sys.path.insert(0, sys.argv[1])
|
|
241
|
+
from md_cg.mdcos import MdCGSecure
|
|
242
|
+
from md_cg.security import Principal
|
|
243
|
+
from md_cg.tokens import role_spec
|
|
244
|
+
root, nid, body, sens, delay, t0 = (sys.argv[2], sys.argv[3], sys.argv[4],
|
|
245
|
+
sys.argv[5], float(sys.argv[6]),
|
|
246
|
+
float(sys.argv[7]))
|
|
247
|
+
sp = role_spec("designer")
|
|
248
|
+
cg = MdCGSecure(root, principal=Principal(
|
|
249
|
+
actor="designer", clearance="secret", can_write=True, can_admin=True,
|
|
250
|
+
role="designer", layers_allow=sp["layers_allow"],
|
|
251
|
+
ops_allow=sp["ops_allow"]))
|
|
252
|
+
if delay:
|
|
253
|
+
_o = cg._write_sensitivity
|
|
254
|
+
def _slow(node_id, declared):
|
|
255
|
+
s = _o(node_id, declared)
|
|
256
|
+
time.sleep(delay)
|
|
257
|
+
return s
|
|
258
|
+
cg._write_sensitivity = _slow
|
|
259
|
+
while time.time() < t0:
|
|
260
|
+
pass
|
|
261
|
+
try:
|
|
262
|
+
cg.add(nid, body, layer="knowledge", sensitivity=(sens or None))
|
|
263
|
+
out = {"ok": True, "committed": True, "error": None}
|
|
264
|
+
except Exception as exc:
|
|
265
|
+
out = {"ok": False, "committed": False,
|
|
266
|
+
"error": type(exc).__name__ + ": " + str(exc)[:90]}
|
|
267
|
+
try:
|
|
268
|
+
cg.close()
|
|
269
|
+
except Exception:
|
|
270
|
+
pass
|
|
271
|
+
print(json.dumps(out, ensure_ascii=False))
|
|
272
|
+
'''
|
|
273
|
+
|
|
274
|
+
|
|
275
|
+
def _sens_on_disk(root, nid):
|
|
276
|
+
"""盘面 frontmatter 里的 sensitivity 字面量(取不到返回 None)。"""
|
|
277
|
+
import re
|
|
278
|
+
for dirpath, _d, files in os.walk(root):
|
|
279
|
+
if nid + ".md" in files:
|
|
280
|
+
with open(os.path.join(dirpath, nid + ".md"),
|
|
281
|
+
encoding="utf-8") as f:
|
|
282
|
+
m = re.search(r"^sensitivity:\s*\"?([A-Za-z]+)\"?",
|
|
283
|
+
f.read(), re.M)
|
|
284
|
+
return m.group(1) if m else None
|
|
285
|
+
return None
|
|
286
|
+
|
|
287
|
+
|
|
288
|
+
def _bodies_of(root, nid):
|
|
289
|
+
"""盘面上所有同 id 文件的正文(同 id 可能并存于多层——那本身就是缺陷,
|
|
290
|
+
故 A4 判「新值是否在**任意一份**里」,而不是只看先遍历到的那份)。"""
|
|
291
|
+
out = []
|
|
292
|
+
for dirpath, _d, files in os.walk(root):
|
|
293
|
+
if nid + ".md" in files:
|
|
294
|
+
with open(os.path.join(dirpath, nid + ".md"),
|
|
295
|
+
encoding="utf-8") as f:
|
|
296
|
+
out.append(f.read())
|
|
297
|
+
return out
|
|
298
|
+
|
|
299
|
+
|
|
300
|
+
def group_a1():
|
|
301
|
+
print('== A1:writepipe 并发同 id(3 进程 × 2 轮)==')
|
|
302
|
+
bad_files = 0
|
|
303
|
+
multi = 0
|
|
304
|
+
lost = 0
|
|
305
|
+
for rd in range(2):
|
|
306
|
+
nid = "race_same"
|
|
307
|
+
writers = [(nid, "knowledge", CCG % ("BODY-%04d" % i))
|
|
308
|
+
for i in range(3)]
|
|
309
|
+
res, files, root = _one_round(_W_WRITEPIPE, writers, "a1")
|
|
310
|
+
committed = [i for i, r in enumerate(res) if r.get("committed")]
|
|
311
|
+
text = _body_of(root, nid)
|
|
312
|
+
hit = [i for i in committed if "BODY-%04d" % i in text]
|
|
313
|
+
bad_files += int(len(files) != 1)
|
|
314
|
+
multi += int(len(committed) > 1)
|
|
315
|
+
lost += len(committed) - len(hit)
|
|
316
|
+
print(" round %d: committed=%s files=%s 命中=%s"
|
|
317
|
+
% (rd, committed, files, hit))
|
|
318
|
+
_check('A1a 盘面同 id 文件恒为 1 份(不并存)', bad_files == 0, bad_files)
|
|
319
|
+
_check('A1b 并发下至多一个写者回执 committed(其余入审核队列/被拒)',
|
|
320
|
+
multi == 0, multi)
|
|
321
|
+
_check('A1c 已回执 committed 的正文 100% 在盘面(丢失 0)', lost == 0, lost)
|
|
322
|
+
|
|
323
|
+
|
|
324
|
+
def group_a2():
|
|
325
|
+
print('== A2:writepipe anchor/knowledge 同 id 并发(2 轮)==')
|
|
326
|
+
coex = 0
|
|
327
|
+
for rd in range(2):
|
|
328
|
+
nid = "race_anchor"
|
|
329
|
+
res, files, _root = _one_round(
|
|
330
|
+
_W_WRITEPIPE,
|
|
331
|
+
[(nid, "anchor", CCG % "ANCHOR-BODY"),
|
|
332
|
+
(nid, "knowledge", CCG % "KNOW-BODY")], "a2")
|
|
333
|
+
coex += int(len(files) > 1)
|
|
334
|
+
print(" round %d: files=%s res=%s"
|
|
335
|
+
% (rd, files, [(r.get("committed"),
|
|
336
|
+
str(r.get("error") or "")[:40]) for r in res]))
|
|
337
|
+
_check('A2 同 id 的 anchor 与 knowledge 两份文件不得并存', coex == 0, coex)
|
|
338
|
+
|
|
339
|
+
|
|
340
|
+
def group_a3():
|
|
341
|
+
print('== A3:库层 cg.add 直接并发 anchor/knowledge 同 id(2 轮)==')
|
|
342
|
+
coex = 0
|
|
343
|
+
for rd in range(2):
|
|
344
|
+
nid = "race_add_anchor"
|
|
345
|
+
res, files, _root = _one_round(
|
|
346
|
+
_W_ADD,
|
|
347
|
+
[(nid, "anchor", CCG % "ANCHOR-BODY"),
|
|
348
|
+
(nid, "knowledge", CCG % "KNOW-BODY")], "a3")
|
|
349
|
+
coex += int(len(files) > 1)
|
|
350
|
+
print(" round %d: files=%s res=%s"
|
|
351
|
+
% (rd, files, [(r.get("committed"),
|
|
352
|
+
str(r.get("error") or "")[:40]) for r in res]))
|
|
353
|
+
_check('A3 库层 add 并发同 id 也不得两份并存(add 自己的锁在位)',
|
|
354
|
+
coex == 0, coex)
|
|
355
|
+
|
|
356
|
+
|
|
357
|
+
def group_a4():
|
|
358
|
+
print('== A4:_move_layer 与 add 并发同 id(搬迁读改写 vs 覆写,2 轮)==')
|
|
359
|
+
import json as _json
|
|
360
|
+
import time as _time
|
|
361
|
+
lost = 0
|
|
362
|
+
for rd in range(2):
|
|
363
|
+
t = tempfile.mkdtemp(prefix="i322_a4_")
|
|
364
|
+
env = _env(t)
|
|
365
|
+
root = os.path.join(t, "root")
|
|
366
|
+
nid = "race_move"
|
|
367
|
+
old = dict(os.environ)
|
|
368
|
+
try:
|
|
369
|
+
os.environ.update({k: v for k, v in env.items()
|
|
370
|
+
if k.startswith(("MDCG_", "HOME"))})
|
|
371
|
+
from md_cg.mdcos import MdCGOS
|
|
372
|
+
_cg = MdCGOS(root)
|
|
373
|
+
_cg.add(nid, CCG % "OLD-BODY", layer="knowledge")
|
|
374
|
+
_cg.close()
|
|
375
|
+
finally:
|
|
376
|
+
os.environ.clear()
|
|
377
|
+
os.environ.update(old)
|
|
378
|
+
t0 = _time.time() + 1.5
|
|
379
|
+
ps = []
|
|
380
|
+
for worker, extra in ((_W_MOVE, [nid, str(t0)]),
|
|
381
|
+
(_W_ADD_SLOW, [nid, "knowledge",
|
|
382
|
+
CCG % "NEW-BODY", str(t0)])):
|
|
383
|
+
ps.append(subprocess.Popen(
|
|
384
|
+
[sys.executable, "-X", "utf8", "-c", worker, _REPO,
|
|
385
|
+
root] + extra, env=env, cwd=env["HOME"],
|
|
386
|
+
stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True,
|
|
387
|
+
encoding="utf-8", errors="replace"))
|
|
388
|
+
res = []
|
|
389
|
+
for p in ps:
|
|
390
|
+
o, e = p.communicate(timeout=180)
|
|
391
|
+
try:
|
|
392
|
+
res.append(_json.loads(o.strip().splitlines()[-1]))
|
|
393
|
+
except Exception:
|
|
394
|
+
res.append({"ok": False, "error": "ERR " + e.strip()[-120:]})
|
|
395
|
+
bodies = _bodies_of(root, nid)
|
|
396
|
+
hit = any("NEW-BODY" in t for t in bodies)
|
|
397
|
+
lost += int(not hit)
|
|
398
|
+
print(" round %d: 新值在盘=%s files=%s res=%s"
|
|
399
|
+
% (rd, hit, _same_id_files(root, nid),
|
|
400
|
+
[(r.get("committed"), str(r.get("error") or "")[:36])
|
|
401
|
+
for r in res]))
|
|
402
|
+
_check('A4 搬迁与 add 并发时,已应答 add 的新正文不得被搬迁的旧正文顶掉',
|
|
403
|
+
lost == 0, lost)
|
|
404
|
+
|
|
405
|
+
|
|
406
|
+
def group_a5():
|
|
407
|
+
print('== A5:MdCGSecure.add 密级继承的读改写(声明 vs 未声明,2 轮)==')
|
|
408
|
+
import json as _json
|
|
409
|
+
import time as _time
|
|
410
|
+
downgraded = 0
|
|
411
|
+
for rd in range(2):
|
|
412
|
+
t = tempfile.mkdtemp(prefix="i322_a5_")
|
|
413
|
+
env = _env(t)
|
|
414
|
+
root = os.path.join(t, "root")
|
|
415
|
+
nid = "race_sens"
|
|
416
|
+
old = dict(os.environ)
|
|
417
|
+
try:
|
|
418
|
+
os.environ.update({k: v for k, v in env.items()
|
|
419
|
+
if k.startswith(("MDCG_", "HOME"))})
|
|
420
|
+
from md_cg.mdcos import MdCGSecure
|
|
421
|
+
from md_cg.security import Principal
|
|
422
|
+
from md_cg.tokens import role_spec
|
|
423
|
+
sp = role_spec("designer")
|
|
424
|
+
_cg = MdCGSecure(root, principal=Principal(
|
|
425
|
+
actor="designer", clearance="secret", can_write=True,
|
|
426
|
+
can_admin=True, role="designer",
|
|
427
|
+
layers_allow=sp["layers_allow"],
|
|
428
|
+
ops_allow=sp["ops_allow"]))
|
|
429
|
+
_cg.add(nid, CCG % "SEED", layer="knowledge",
|
|
430
|
+
sensitivity="public")
|
|
431
|
+
_cg.close()
|
|
432
|
+
finally:
|
|
433
|
+
os.environ.clear()
|
|
434
|
+
os.environ.update(old)
|
|
435
|
+
t0 = _time.time() + 1.5
|
|
436
|
+
ps = [
|
|
437
|
+
# A:显式声明 internal,快写
|
|
438
|
+
subprocess.Popen([sys.executable, "-X", "utf8", "-c", _W_SECURE,
|
|
439
|
+
_REPO, root, nid, CCG % "A-INTERNAL",
|
|
440
|
+
"internal", "0", str(t0)],
|
|
441
|
+
env=env, cwd=env["HOME"],
|
|
442
|
+
stdout=subprocess.PIPE,
|
|
443
|
+
stderr=subprocess.PIPE, text=True,
|
|
444
|
+
encoding="utf-8", errors="replace"),
|
|
445
|
+
# B:未声明(应继承**当前**密级),读到旧值后睡 0.5s 再落盘
|
|
446
|
+
subprocess.Popen([sys.executable, "-X", "utf8", "-c", _W_SECURE,
|
|
447
|
+
_REPO, root, nid, CCG % "B-INHERIT",
|
|
448
|
+
"", "0.5", str(t0)],
|
|
449
|
+
env=env, cwd=env["HOME"],
|
|
450
|
+
stdout=subprocess.PIPE,
|
|
451
|
+
stderr=subprocess.PIPE, text=True,
|
|
452
|
+
encoding="utf-8", errors="replace"),
|
|
453
|
+
]
|
|
454
|
+
res = []
|
|
455
|
+
for p in ps:
|
|
456
|
+
o, e = p.communicate(timeout=180)
|
|
457
|
+
try:
|
|
458
|
+
res.append(_json.loads(o.strip().splitlines()[-1]))
|
|
459
|
+
except Exception:
|
|
460
|
+
res.append({"ok": False, "error": "ERR " + e.strip()[-120:]})
|
|
461
|
+
final = _sens_on_disk(root, nid)
|
|
462
|
+
bad = final != "internal"
|
|
463
|
+
downgraded += int(bad)
|
|
464
|
+
print(" round %d: 盘面密级=%s 降级=%s res=%s"
|
|
465
|
+
% (rd, final, bad,
|
|
466
|
+
[(r.get("ok"), str(r.get("error") or "")[:36])
|
|
467
|
+
for r in res]))
|
|
468
|
+
_check('A5 未声明的同 id 写必须继承他进程刚落盘的密级'
|
|
469
|
+
'(不得按陈旧索引把 internal 静默降级回 public)',
|
|
470
|
+
downgraded == 0, downgraded)
|
|
471
|
+
|
|
472
|
+
|
|
473
|
+
def group_k1():
|
|
474
|
+
print('== K1:串行覆写仍真生效(锁不是空操作/不会永久占锁)==')
|
|
475
|
+
t = tempfile.mkdtemp(prefix="i322_k1_")
|
|
476
|
+
env = _env(t)
|
|
477
|
+
root = os.path.join(t, "root")
|
|
478
|
+
old = dict(os.environ)
|
|
479
|
+
try:
|
|
480
|
+
os.environ.update({k: v for k, v in env.items()
|
|
481
|
+
if k.startswith(("MDCG_", "HOME"))})
|
|
482
|
+
from md_cg.mdcos import MdCGOS
|
|
483
|
+
cg = MdCGOS(root)
|
|
484
|
+
nid = "serial_node"
|
|
485
|
+
cg.add(nid, CCG % "SERIAL-V1", layer="knowledge")
|
|
486
|
+
cg.add(nid, CCG % "SERIAL-V2", layer="knowledge") # 同 id 串行覆写
|
|
487
|
+
got = cg.get(nid) or {}
|
|
488
|
+
cg.close()
|
|
489
|
+
finally:
|
|
490
|
+
os.environ.clear()
|
|
491
|
+
os.environ.update(old)
|
|
492
|
+
text = got.get("content") or ""
|
|
493
|
+
_check('K1 串行第二次覆写真落盘(正文为 V2,且锁未卡死/未误吞)',
|
|
494
|
+
"SERIAL-V2" in text, text[-80:])
|
|
495
|
+
|
|
496
|
+
|
|
497
|
+
def _src(rel):
|
|
498
|
+
with open(os.path.join(_REPO, rel), encoding="utf-8") as f:
|
|
499
|
+
return f.read()
|
|
500
|
+
|
|
501
|
+
|
|
502
|
+
def _method_src(cls, name):
|
|
503
|
+
"""取运行中方法的源码(与既有守卫 test_session_attribution_consistency:555
|
|
504
|
+
同手法:`inspect.getsource` + `textwrap.dedent`)。用它而不是整文件 grep,
|
|
505
|
+
是因为 `node_write_lock(self, node_id)` 现在在 MdCGOS.add 与 MdCGSecure.add
|
|
506
|
+
各出现一次——整文件计数判不出「哪一层漏了」。"""
|
|
507
|
+
import inspect
|
|
508
|
+
import textwrap
|
|
509
|
+
return textwrap.dedent(inspect.getsource(getattr(cls, name)))
|
|
510
|
+
|
|
511
|
+
|
|
512
|
+
def group_e():
|
|
513
|
+
print('== E 组:结构锚(fail-closed)==')
|
|
514
|
+
from md_cg.mdcos import MdCGOS, MdCGSecure
|
|
515
|
+
fs = _src("md_cg/fsutil.py")
|
|
516
|
+
wp = _src("md_cg/writepipe.py")
|
|
517
|
+
mo = _src("md_cg/mdcos.py")
|
|
518
|
+
_add_src = _method_src(MdCGOS, "add")
|
|
519
|
+
_sec_add_src = _method_src(MdCGSecure, "add")
|
|
520
|
+
_move_src = _method_src(MdCGOS, "_move_layer")
|
|
521
|
+
_ws_src = _method_src(MdCGSecure, "_write_sensitivity")
|
|
522
|
+
_check('E1 node_write_lock 走 FileLock 且 strict=True(不得无锁放行)',
|
|
523
|
+
"def node_write_lock" in fs and "strict=True" in fs
|
|
524
|
+
and "FileLock(" in fs)
|
|
525
|
+
_seg = fs.split("def node_write_lock")[1].split("def merge_rmw_lock")[0]
|
|
526
|
+
_check('E2 不得用进程内锁冒充(node_write_lock 内无 threading.Lock;'
|
|
527
|
+
'重入记账只允许 threading.local)',
|
|
528
|
+
"threading.Lock(" not in _seg and "threading.RLock(" not in _seg,
|
|
529
|
+
_seg[:200])
|
|
530
|
+
_check('E3 writepipe.execute 在 node_write_lock 内跑整条链',
|
|
531
|
+
"with node_write_lock(cg, _nid):" in wp
|
|
532
|
+
and "return self._run_chain(ctx, a)" in wp)
|
|
533
|
+
_check('E4 MdCGOS.add 在 node_write_lock 内落盘(落盘段在锁块内,'
|
|
534
|
+
'不得只把加锁写在函数外/抽成子函数)',
|
|
535
|
+
"with node_write_lock(self, node_id):" in _add_src
|
|
536
|
+
and 'self._audit("add"' in _add_src.split(
|
|
537
|
+
"with node_write_lock(self, node_id):", 1)[1]
|
|
538
|
+
and "def _add_locked" not in mo)
|
|
539
|
+
_check('E5 MdCGSecure.add 的密级继承读改写也在同一把锁内'
|
|
540
|
+
'(_write_sensitivity 读旧值 → 据此落盘,锁在 super 之前)',
|
|
541
|
+
"with node_write_lock(self, node_id):" in _sec_add_src
|
|
542
|
+
and "self._write_sensitivity(node_id, sensitivity)" in
|
|
543
|
+
_sec_add_src.split("with node_write_lock(self, node_id):", 1)[1])
|
|
544
|
+
_check('E5b 密级继承读之前先做跨进程代际探活(_maybe_reload_index)'
|
|
545
|
+
'——锁只保证互斥,不保证读到他进程已落盘的新密级',
|
|
546
|
+
"_maybe_reload_index" in _ws_src
|
|
547
|
+
and _ws_src.index("_maybe_reload_index")
|
|
548
|
+
< _ws_src.index("subgraph.node_sensitivity("))
|
|
549
|
+
_check('E6 MdCGOS._move_layer 在 node_write_lock 内转调父类'
|
|
550
|
+
'(搬迁=同 id 读改写,不经 add,必须单独覆盖)',
|
|
551
|
+
"with node_write_lock(self, node_id):" in _move_src
|
|
552
|
+
and "super()._move_layer(" in
|
|
553
|
+
_move_src.split("with node_write_lock(self, node_id):", 1)[1])
|
|
554
|
+
|
|
555
|
+
|
|
556
|
+
def main():
|
|
557
|
+
print('== #322 守卫 ==')
|
|
558
|
+
# 锚点自检(fail-closed):修复的关键字面量不在源码里 ⇒ 对应 E 项红 + 整体 rc=1。
|
|
559
|
+
# 不用 exit 2 提前返回:变异自证要求「撤哪一处就红哪一条」,提前退出会让
|
|
560
|
+
# 红项集合为空、判别力无从体现。
|
|
561
|
+
fs = _src("md_cg/fsutil.py")
|
|
562
|
+
wp = _src("md_cg/writepipe.py")
|
|
563
|
+
from md_cg.mdcos import MdCGOS
|
|
564
|
+
_mo_add = _method_src(MdCGOS, "add")
|
|
565
|
+
_check('E0a fsutil.node_write_lock 在位(锚点自检)',
|
|
566
|
+
"def node_write_lock" in fs)
|
|
567
|
+
_check('E0b writepipe 调用 node_write_lock 的锚点在位(锚点自检)',
|
|
568
|
+
"with node_write_lock(cg, _nid):" in wp)
|
|
569
|
+
# 锚点取 **MdCGOS.add 自己的源码**而非整文件:同一条 `with node_write_lock(
|
|
570
|
+
# self, node_id):` 现在在 MdCGOS.add 与 MdCGSecure.add 各出现一次,整文件
|
|
571
|
+
# 计数会让「撤掉 MdCGOS.add 那把锁」时本项仍绿(变异腿实测 M2 漏红)。
|
|
572
|
+
_check('E0c mdcos.add 调用 node_write_lock 的锚点在位(锚点自检)',
|
|
573
|
+
"with node_write_lock(self, node_id):" in _mo_add)
|
|
574
|
+
try:
|
|
575
|
+
group_a1()
|
|
576
|
+
group_a2()
|
|
577
|
+
group_a3()
|
|
578
|
+
group_a4()
|
|
579
|
+
group_a5()
|
|
580
|
+
group_k1()
|
|
581
|
+
except Exception as e:
|
|
582
|
+
import traceback
|
|
583
|
+
traceback.print_exc()
|
|
584
|
+
_check('A/K 组内异常(fail-closed)', False, str(e)[:150])
|
|
585
|
+
group_e()
|
|
586
|
+
print('=' * 62)
|
|
587
|
+
print('#322 守卫:%d 通过,%d 失败' % (len(PASSED), len(FAILS)))
|
|
588
|
+
for f in FAILS:
|
|
589
|
+
print(' 红项:' + f)
|
|
590
|
+
return 0 if not FAILS else 1
|
|
591
|
+
|
|
592
|
+
|
|
593
|
+
def _mirror():
|
|
594
|
+
"""镜像树:md_cg 包 + data/policy.json(包内默认策略按包根解析,
|
|
595
|
+
缺它则写链在镜像里 policy_unavailable ⇒ 并发腿全被短路,变异判别力假绿)。"""
|
|
596
|
+
d = tempfile.mkdtemp(prefix="i322_mirror_")
|
|
597
|
+
shutil.copytree(os.path.join(_REPO, "md_cg"),
|
|
598
|
+
os.path.join(d, "md_cg"),
|
|
599
|
+
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
600
|
+
# 仓根一级模块(`md_cg/mcp_server.py` 顶部 `from utf8_boot import ensure_utf8`
|
|
601
|
+
# 等)必须一并镜像,否则副本里写链 import 即失败、并发腿全空跑(假红/假绿)。
|
|
602
|
+
for fn in os.listdir(_REPO):
|
|
603
|
+
if fn.endswith(".py") and os.path.isfile(os.path.join(_REPO, fn)):
|
|
604
|
+
shutil.copy2(os.path.join(_REPO, fn), os.path.join(d, fn))
|
|
605
|
+
src_pol = os.path.join(_REPO, "data", "policy.json")
|
|
606
|
+
if os.path.exists(src_pol):
|
|
607
|
+
os.makedirs(os.path.join(d, "data"), exist_ok=True)
|
|
608
|
+
shutil.copy2(src_pol, os.path.join(d, "data", "policy.json"))
|
|
609
|
+
return d
|
|
610
|
+
|
|
611
|
+
|
|
612
|
+
def _run_in(tree):
|
|
613
|
+
p = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
614
|
+
"md_cg.test_issue322_node_write_lock"],
|
|
615
|
+
cwd=tree, capture_output=True, text=True,
|
|
616
|
+
encoding="utf-8", errors="replace",
|
|
617
|
+
timeout=1800,
|
|
618
|
+
env=dict({k: v for k, v in os.environ.items()
|
|
619
|
+
if not k.startswith("PYTHON")},
|
|
620
|
+
PYTHONPATH=tree, PYTHONUTF8="1"))
|
|
621
|
+
reds = [ln.strip().split(" ", 1)[0].replace("FAIL ", "")
|
|
622
|
+
for ln in p.stdout.splitlines() if ln.strip().startswith("FAIL ")]
|
|
623
|
+
return p.returncode, reds, p.stdout + p.stderr
|
|
624
|
+
|
|
625
|
+
|
|
626
|
+
_MUTATIONS = [
|
|
627
|
+
("M1 撤 writepipe 整链锁", [("md_cg/writepipe.py",
|
|
628
|
+
" with node_write_lock(cg, _nid):\n"
|
|
629
|
+
" return self._run_chain(ctx, a)",
|
|
630
|
+
" return self._run_chain(ctx, a)")],
|
|
631
|
+
# 撤链锁:add 级锁仍在 ⇒ 盘面不会两份并存(A1a/A2 仍绿,如实),
|
|
632
|
+
# 但「判存在 → 定档 → 落盘」的整段不再互斥 ⇒ 两个写者都 committed(A1b)、
|
|
633
|
+
# 输的那份正文从 root 消失(A1c)——正是 #322 的症状。
|
|
634
|
+
("A1b", "A1c", "E0b", "E3")),
|
|
635
|
+
# M2/M3 用 `if True:` 顶替 `with`(保留缩进/作用域,只把锁去掉):
|
|
636
|
+
# 行为腿(A3)与结构锚同时可判,且不依赖字符串再缩进。
|
|
637
|
+
("M2 撤 MdCGOS.add 锁", [("md_cg/mdcos.py",
|
|
638
|
+
" with node_write_lock(self, node_id):\n"
|
|
639
|
+
" # #151",
|
|
640
|
+
" if True: # MUT\n"
|
|
641
|
+
" # #151")],
|
|
642
|
+
("A3", "E0c", "E4")),
|
|
643
|
+
("M3 撤 MdCGSecure.add 的密级继承锁", [("md_cg/mdcos.py",
|
|
644
|
+
" with node_write_lock(self, "
|
|
645
|
+
"node_id):\n"
|
|
646
|
+
" sens = self."
|
|
647
|
+
"_write_sensitivity(",
|
|
648
|
+
" if True: # MUT\n"
|
|
649
|
+
" sens = self."
|
|
650
|
+
"_write_sensitivity(")],
|
|
651
|
+
("E5",)),
|
|
652
|
+
# M3b:只撤「读前代际探活」——锁与结构锚都还在,只有**行为腿 A5** 能判它
|
|
653
|
+
# (这正是复核意见 5 指出的残留窗口:互斥 ≠ 读到新值)。
|
|
654
|
+
("M3b 撤密级继承的跨进程代际探活", [("md_cg/mdcos.py",
|
|
655
|
+
" _probe = getattr(self, "
|
|
656
|
+
"\"_maybe_reload_index\", None)\n"
|
|
657
|
+
" if callable(_probe):\n"
|
|
658
|
+
" _probe()\n",
|
|
659
|
+
" _probe = None\n")],
|
|
660
|
+
("A5",)),
|
|
661
|
+
("M4 撤 MdCGOS._move_layer 的搬迁锁", [("md_cg/mdcos.py",
|
|
662
|
+
" with node_write_lock(self, "
|
|
663
|
+
"node_id):\n"
|
|
664
|
+
" return super()."
|
|
665
|
+
"_move_layer(",
|
|
666
|
+
" if True: # MUT\n"
|
|
667
|
+
" return super()."
|
|
668
|
+
"_move_layer(")],
|
|
669
|
+
("A4", "E6")),
|
|
670
|
+
]
|
|
671
|
+
|
|
672
|
+
|
|
673
|
+
def _mutate():
|
|
674
|
+
print('!! 定点变异自证:把锁撤掉,守卫必须转红')
|
|
675
|
+
tree = _mirror()
|
|
676
|
+
try:
|
|
677
|
+
rc, reds, out = _run_in(tree)
|
|
678
|
+
print(' 未变异镜像基线:rc=%d 红项=%d(须 rc=0/0 红)' % (rc, len(reds)))
|
|
679
|
+
if rc != 0 or reds:
|
|
680
|
+
print(chr(10).join(out.splitlines()[-25:]))
|
|
681
|
+
bad = []
|
|
682
|
+
for desc, edits, exp in _MUTATIONS:
|
|
683
|
+
backups = []
|
|
684
|
+
miss = []
|
|
685
|
+
for rel, oldp, newp in edits:
|
|
686
|
+
p = os.path.join(tree, rel)
|
|
687
|
+
with open(p, encoding="utf-8", newline="") as f:
|
|
688
|
+
t = f.read()
|
|
689
|
+
if t.count(oldp) != 1:
|
|
690
|
+
miss.append("%s 命中 %d 次" % (rel, t.count(oldp)))
|
|
691
|
+
continue
|
|
692
|
+
backups.append((p, t))
|
|
693
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
694
|
+
f.write(t.replace(oldp, newp, 1))
|
|
695
|
+
if miss:
|
|
696
|
+
bad.append("%s —— %s" % (desc, ";".join(miss)))
|
|
697
|
+
print(' ANCHOR-MISS ' + desc)
|
|
698
|
+
for p, t in backups:
|
|
699
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
700
|
+
f.write(t)
|
|
701
|
+
continue
|
|
702
|
+
rc2, reds2, out2 = _run_in(tree)
|
|
703
|
+
for p, t in backups:
|
|
704
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
705
|
+
f.write(t)
|
|
706
|
+
hit = sorted({e for r in reds2 for e in exp if r.startswith(e + " ")
|
|
707
|
+
or r.startswith(e)})
|
|
708
|
+
if rc2 != 0 and hit == sorted(exp):
|
|
709
|
+
print(' OK %s 红项=%s' % (desc, reds2))
|
|
710
|
+
else:
|
|
711
|
+
bad.append(desc)
|
|
712
|
+
print(' MISMATCH %s rc=%d 红项=%s' % (desc, rc2, reds2))
|
|
713
|
+
print(chr(10).join(out2.splitlines()[-20:]))
|
|
714
|
+
print('定点变异自证:%s(%d 条不合格)'
|
|
715
|
+
% ('PASS' if not bad else 'FAIL', len(bad)))
|
|
716
|
+
for b in bad:
|
|
717
|
+
print(' 不合格:' + b)
|
|
718
|
+
_check('变异自证全过', not bad, bad)
|
|
719
|
+
finally:
|
|
720
|
+
shutil.rmtree(tree, ignore_errors=True)
|
|
721
|
+
|
|
722
|
+
|
|
723
|
+
if __name__ == '__main__':
|
|
724
|
+
if '--mutate' in sys.argv:
|
|
725
|
+
_mutate()
|
|
726
|
+
sys.exit(0 if not FAILS else 1)
|
|
727
|
+
sys.exit(main())
|