@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,327 +1,327 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
# 功能名:writelimit 台账「读 → 改 → 写」的跨进程互斥(issue #354 P2-17 TOCTOU)
|
|
3
|
-
# 生效条件:python -X utf8 -m md_cg.test_issue354_p2_writelimit_toctou [--mutate];被测面=md_cg/writelimit.py 的 check / record_accepted / _transaction / _save_locked
|
|
4
|
-
# 子功能:A 组=多进程并发 check 的记账零丢失(修前 8 并发实测只剩 3~7 条);B 组=并发下的限流上限仍生效(计数不丢 ⇒ 第 RATE_MAX+1 条起判 DEFER);C 组=单进程语义未变(放行/CONVERGE/DROP/DEFER 与 #345/#148 口径一致);D 组=临界区判据在场(读改写同锁、落盘无锁版本、strict=True)
|
|
5
|
-
# 执行:--mutate 时把「读改写同临界区」退回修前形态(_load 在锁外、_save 在锁内)到**镜像树**,守卫必须转红
|
|
6
|
-
# 验证方式:默认模式全部 PASS(退出码 0);--mutate 下未变异镜像 0 红、变异后指定项逐项转红
|
|
7
|
-
# 不适用条件:不覆盖 Windows 之外的 msvcrt/flock 实现差异(FileLock 本体另有 test_lock.py);不判「限流阈值 RATE_MAX 是否合理」(业务参数);不覆盖 swarm Rust 侧并发(另有 md_cg/test_issue354_rust_wal_containment.py)
|
|
8
|
-
"""issue #354 [P2-17] 守卫:writelimit 台账读改写必须全程持跨进程锁。
|
|
9
|
-
|
|
10
|
-
病象(修前,本文件 A 组实测):8 个进程各自对同一台账调用一次 check,每个进程都
|
|
11
|
-
应留下 1 条时间戳;旧实现 `_load` 在锁**外**、`_save` 在锁**内**,后写者用陈旧
|
|
12
|
-
快照整份覆写先写者 ⇒ 实测只剩 3~7 条(丢更新),频率上限被并发穿透。
|
|
13
|
-
`atomic_write` 只防撕裂、不防丢失更新——这是两件事。
|
|
14
|
-
|
|
15
|
-
修法(报告 §5.9):读改写全程持同一把 OS 级 `FileLock(strict=True)`(与 #322/#348
|
|
16
|
-
同口径);临界区内落盘走 `_save_locked`(不再二次取锁——Windows 上同进程第二次
|
|
17
|
-
获取同一字节范围会自我阻塞);`now` 也在锁内取(锁外取的 now 会落在别人已写入
|
|
18
|
-
的时间戳之前,被 P1-10 的双向界定当作「未来戳」剔掉,同样丢记账)。
|
|
19
|
-
|
|
20
|
-
隔离纪律:台账全部落在 tempfile.mkdtemp 下;子进程显式剔除父 shell 的
|
|
21
|
-
MDCG_TOKEN / MDCG_VERIFY_KEY(派工书 §0 的假红陷阱)。镜像树变异只在临时目录
|
|
22
|
-
改源码,真实工作树一字不动。
|
|
23
|
-
"""
|
|
24
|
-
from __future__ import annotations
|
|
25
|
-
|
|
26
|
-
import io
|
|
27
|
-
import json
|
|
28
|
-
import os
|
|
29
|
-
import shutil
|
|
30
|
-
import subprocess
|
|
31
|
-
import sys
|
|
32
|
-
import tempfile
|
|
33
|
-
|
|
34
|
-
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
35
|
-
|
|
36
|
-
FLOOR = 12
|
|
37
|
-
PASS, FAIL = 0, 0
|
|
38
|
-
FAILS = []
|
|
39
|
-
|
|
40
|
-
N_PROC = 8
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
def _check(name, cond, detail=""):
|
|
44
|
-
global PASS, FAIL
|
|
45
|
-
if cond:
|
|
46
|
-
PASS += 1
|
|
47
|
-
print(" PASS " + name)
|
|
48
|
-
else:
|
|
49
|
-
FAIL += 1
|
|
50
|
-
FAILS.append(name)
|
|
51
|
-
print(" FAIL " + name + " " + str(detail)[:220])
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
# ---------------------------------------------------------------- 桩与夹具
|
|
55
|
-
|
|
56
|
-
class _CG:
|
|
57
|
-
"""最小 cg 桩:check/record_accepted 只用到 root 与 get。"""
|
|
58
|
-
|
|
59
|
-
def __init__(self, root, nodes=None):
|
|
60
|
-
self.root = root
|
|
61
|
-
self._nodes = nodes or {}
|
|
62
|
-
|
|
63
|
-
def get(self, nid):
|
|
64
|
-
return self._nodes.get(nid)
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
def _env():
|
|
68
|
-
e = dict(os.environ)
|
|
69
|
-
e.pop("MDCG_TOKEN", None) # 派工书 §0:父 shell 的令牌会污染子进程
|
|
70
|
-
e.pop("MDCG_VERIFY_KEY", None)
|
|
71
|
-
e["PYTHONUTF8"] = "1"
|
|
72
|
-
e["PYTHONDONTWRITEBYTECODE"] = "1"
|
|
73
|
-
e["MDCG_WRITELIMIT"] = "1"
|
|
74
|
-
return e
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
#: 并发 worker:一次 check(正文各异 ⇒ 签名各异),跑完打印台账窗口条数。
|
|
78
|
-
_WORKER = r'''
|
|
79
|
-
import json, sys, time
|
|
80
|
-
sys.path.insert(0, sys.argv[1])
|
|
81
|
-
from md_cg import writelimit
|
|
82
|
-
|
|
83
|
-
class CG:
|
|
84
|
-
def __init__(self, root):
|
|
85
|
-
self.root = root
|
|
86
|
-
def get(self, nid):
|
|
87
|
-
return None
|
|
88
|
-
|
|
89
|
-
cg = CG(sys.argv[2])
|
|
90
|
-
r = writelimit.check(cg, "并发写入正文 %s 用于区分签名" % sys.argv[3], role="u")
|
|
91
|
-
try:
|
|
92
|
-
st = json.load(open(sys.argv[2] + "/_writelimit.json", encoding="utf-8"))
|
|
93
|
-
n = len((st.get("rate") or {}).get("contextual:u") or [])
|
|
94
|
-
except Exception as exc:
|
|
95
|
-
n = -1
|
|
96
|
-
print(json.dumps({"verdict": r, "rate_after": n}))
|
|
97
|
-
'''
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
def _spawn_concurrent(root, repo, n=N_PROC):
|
|
101
|
-
procs = [subprocess.Popen([sys.executable, "-X", "utf8", "-c", _WORKER, repo, root, str(i)],
|
|
102
|
-
env=_env(), stdout=subprocess.PIPE, stderr=subprocess.PIPE,
|
|
103
|
-
text=True, encoding="utf-8", errors="replace")
|
|
104
|
-
for i in range(n)]
|
|
105
|
-
outs = []
|
|
106
|
-
for p in procs:
|
|
107
|
-
o, e = p.communicate(timeout=180)
|
|
108
|
-
outs.append((p.returncode, o, e))
|
|
109
|
-
return outs
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
def _rate_len(root, key="contextual:u"):
|
|
113
|
-
p = os.path.join(root, "_writelimit.json")
|
|
114
|
-
if not os.path.exists(p):
|
|
115
|
-
return -1
|
|
116
|
-
st = json.load(open(p, encoding="utf-8"))
|
|
117
|
-
return len((st.get("rate") or {}).get(key) or [])
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
# ---------------------------------------------------------------- A/B 组:并发
|
|
121
|
-
|
|
122
|
-
def group_concurrent(repo):
|
|
123
|
-
print("== A 组:8 进程并发 check 的记账零丢失(修前实测只剩 3~7 条)==")
|
|
124
|
-
root = tempfile.mkdtemp(prefix="i354p2_toc_")
|
|
125
|
-
outs = _spawn_concurrent(root, repo)
|
|
126
|
-
bad = [(rc, (e or "")[-160:]) for rc, _o, e in outs if rc != 0]
|
|
127
|
-
_check("A1 全部 worker 正常退出(锁竞争不误伤)", not bad, bad)
|
|
128
|
-
got = _rate_len(root)
|
|
129
|
-
_check("A2 并发记账零丢失(8 进程 ⇒ 恰好 8 条)", got == N_PROC,
|
|
130
|
-
"台账窗口条数=%r 期望=%d" % (got, N_PROC))
|
|
131
|
-
# B 组:并发下上限仍生效——再并发一轮,总量受 RATE_MAX*4 封顶且判定 DEFER
|
|
132
|
-
print("== B 组:并发下的限流上限仍生效(计数不丢 ⇒ 后续判 DEFER)==")
|
|
133
|
-
root2 = tempfile.mkdtemp(prefix="i354p2_cap_")
|
|
134
|
-
# 先灌满窗口:顺序写 RATE_MAX 条(此刻未满,应全部放行)
|
|
135
|
-
from . import writelimit as W
|
|
136
|
-
cg = _CG(root2)
|
|
137
|
-
verdicts = [W.check(cg, "顺序写入正文 %d 号" % i, role="u") for i in range(W.RATE_MAX)]
|
|
138
|
-
_check("B1 前 RATE_MAX 条顺序写入放行", all(v is None for v in verdicts), verdicts)
|
|
139
|
-
# 再并发 8 条:全部应判 DEFER(修前并发丢记账 ⇒ 部分被放行)
|
|
140
|
-
outs2 = _spawn_concurrent(root2, repo)
|
|
141
|
-
vs = []
|
|
142
|
-
for _rc, o, _e in outs2:
|
|
143
|
-
try:
|
|
144
|
-
vs.append(json.loads(o.strip().splitlines()[-1])["verdict"])
|
|
145
|
-
except Exception:
|
|
146
|
-
vs.append(None)
|
|
147
|
-
defers = [v for v in vs if isinstance(v, dict) and v.get("verdict") == "DEFER"]
|
|
148
|
-
_check("B2 满窗口后并发写入一律 DEFER(上限未被并发穿透)",
|
|
149
|
-
len(defers) == N_PROC, "实测 verdicts=%r" % (vs,))
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
# ---------------------------------------------------------------- C 组:单进程语义
|
|
153
|
-
|
|
154
|
-
def group_semantics():
|
|
155
|
-
print("== C 组:单进程语义未变(放行 / CONVERGE / DROP / DEFER)==")
|
|
156
|
-
from . import writelimit as W
|
|
157
|
-
root = tempfile.mkdtemp(prefix="i354p2_sem_")
|
|
158
|
-
node = {"id": "n1", "content": "同模板内容 1", "frontmatter": {"layer": "contextual"}}
|
|
159
|
-
cg = _CG(root, {"n1": node})
|
|
160
|
-
_check("C1 首次写入放行", W.check(cg, "同模板内容 1", role="u", node_id="n1") is None)
|
|
161
|
-
r = W.check(cg, "同模板内容 2", role="u", node_id="n1")
|
|
162
|
-
_check("C2 同模板不同正文 ⇒ CONVERGE",
|
|
163
|
-
isinstance(r, dict) and r.get("verdict") == "CONVERGE", r)
|
|
164
|
-
r = W.check(cg, "同模板内容 1", role="u", node_id="n1")
|
|
165
|
-
_check("C3 正文完全一致 ⇒ DROP",
|
|
166
|
-
isinstance(r, dict) and r.get("verdict") == "DROP", r)
|
|
167
|
-
root2 = tempfile.mkdtemp(prefix="i354p2_defer_")
|
|
168
|
-
cg2 = _CG(root2)
|
|
169
|
-
for i in range(W.RATE_MAX):
|
|
170
|
-
W.check(cg2, "灌水正文 %d 号" % i, role="u")
|
|
171
|
-
r = W.check(cg2, "再来一条", role="u")
|
|
172
|
-
_check("C4 窗口满 ⇒ DEFER", isinstance(r, dict) and r.get("verdict") == "DEFER", r)
|
|
173
|
-
_check("C5 record_accepted 首见即落占位(锁内读改写)", _record_ok(W, root2))
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
def _record_ok(W, root):
|
|
177
|
-
cg = _CG(root)
|
|
178
|
-
W.record_accepted(cg, "nid-x", "一个足够长的模板正文用于签名")
|
|
179
|
-
st = json.load(open(os.path.join(root, "_writelimit.json"), encoding="utf-8"))
|
|
180
|
-
return any(isinstance(v, dict) and v.get("nid") == "nid-x" for v in st["sigs"].values())
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
# ---------------------------------------------------------------- D 组:判据在场
|
|
184
|
-
|
|
185
|
-
def group_source():
|
|
186
|
-
print("== D 组:临界区判据在场(源码级)==")
|
|
187
|
-
p = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
|
|
188
|
-
"md_cg", "writelimit.py")
|
|
189
|
-
src = io.open(p, encoding="utf-8").read()
|
|
190
|
-
_check("D1 _transaction 用 strict=True 的跨进程锁", "FileLock(_state_path(cg), strict=True)" in src)
|
|
191
|
-
_check("D2 check 的 _load 在 _transaction 内", "with _transaction(cg):\n now = float" in src
|
|
192
|
-
or "with _transaction(cg):\r\n now = float" in src)
|
|
193
|
-
_check("D3 临界区内落盘走无锁版 _save_locked", src.count("_save_locked(cg, st)") >= 4)
|
|
194
|
-
_check("D4 record_accepted 也在临界区内", src.count("with _transaction(cg):") >= 2)
|
|
195
|
-
_check("D5 反陈化:点名 issue #354 与 P2-17", "#354" in src and "P2-17" in src)
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
# ---------------------------------------------------------------- 定点变异自证
|
|
199
|
-
|
|
200
|
-
_TARGET = "md_cg/writelimit.py"
|
|
201
|
-
|
|
202
|
-
#: (说明, 改前锚, 改后锚, 期望转红的断言名前缀)
|
|
203
|
-
_MUTATIONS = (
|
|
204
|
-
# 缺陷形态:**锁外**读快照、锁内用它落盘(后写者整份覆盖先写者)。为了把
|
|
205
|
-
# 「读在锁外」这个竞态窗口放大成确定性现象,变异腿在 load 与取锁之间插入
|
|
206
|
-
# 0.25s——语义上仍是「锁外的陈旧快照」,只是让 8 个 worker 必然同时落在
|
|
207
|
-
# 同一个空快照上(真实修前代码正是这个形态,只是窗口更窄)。
|
|
208
|
-
("V1 读改写退回修前形态(_load 在锁外、_save 在锁内)",
|
|
209
|
-
" with _transaction(cg):\n"
|
|
210
|
-
" now = float(now) if now is not None else time.time()\n"
|
|
211
|
-
" st = _load(cg)\n"
|
|
212
|
-
" # 1) 同源频率限制",
|
|
213
|
-
" _st_pre = _load(cg)\n"
|
|
214
|
-
" time.sleep(0.25)\n"
|
|
215
|
-
" with _transaction(cg):\n"
|
|
216
|
-
" now = float(now) if now is not None else time.time()\n"
|
|
217
|
-
" st = _st_pre\n"
|
|
218
|
-
" # 1) 同源频率限制",
|
|
219
|
-
("A2",)),
|
|
220
|
-
)
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
def _fold(text, eol):
|
|
224
|
-
return text.replace("\r\n", "\n").replace("\n", eol)
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
def _mirror_build():
|
|
228
|
-
repo = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
229
|
-
dst = tempfile.mkdtemp(prefix="i354p2_mut_")
|
|
230
|
-
for name in ("md_cg", "scripts"):
|
|
231
|
-
src = os.path.join(repo, name)
|
|
232
|
-
if os.path.isdir(src):
|
|
233
|
-
shutil.copytree(src, os.path.join(dst, name),
|
|
234
|
-
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
235
|
-
for name in sorted(os.listdir(repo)):
|
|
236
|
-
p = os.path.join(repo, name)
|
|
237
|
-
if os.path.isfile(p) and name.endswith(".py"):
|
|
238
|
-
shutil.copy2(p, os.path.join(dst, name))
|
|
239
|
-
return dst
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
def _run_in(tree):
|
|
243
|
-
env = _env()
|
|
244
|
-
env["PYTHONPATH"] = tree
|
|
245
|
-
pr = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
246
|
-
"md_cg.test_issue354_p2_writelimit_toctou"],
|
|
247
|
-
capture_output=True, text=True, encoding="utf-8",
|
|
248
|
-
errors="replace", cwd=tree, env=env, timeout=1800)
|
|
249
|
-
out = (pr.stdout or "") + (pr.stderr or "")
|
|
250
|
-
# 复核意见 4:只认行首的 "FAIL " 红项行;汇总行
|
|
251
|
-
# "断言总数 N(PASS x / FAIL y),FLOOR=z" 里也含 "FAIL ",按子串匹配会把它
|
|
252
|
-
# 当成一条红项(基线 0 红被读成 1 红)。
|
|
253
|
-
reds = [ln.strip()[len("FAIL "):].strip()
|
|
254
|
-
for ln in out.splitlines() if ln.strip().startswith("FAIL ")]
|
|
255
|
-
return pr.returncode, reds, out
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
def _mutate():
|
|
259
|
-
print("!! 定点变异自证:把读改写退回修前形态,守卫必须转红(镜像树)")
|
|
260
|
-
tree = _mirror_build()
|
|
261
|
-
try:
|
|
262
|
-
rc, reds, out = _run_in(tree)
|
|
263
|
-
print(" 未变异镜像基线:rc=%d 红项=%d(须 rc=0 且 0 红)" % (rc, len(reds)))
|
|
264
|
-
base_ok = (rc == 0 and not reds)
|
|
265
|
-
if not base_ok:
|
|
266
|
-
print("\n".join(out.splitlines()[-25:]))
|
|
267
|
-
ok, bad = 0, []
|
|
268
|
-
# 复核意见 4:基线必须干净才算变异腿有效(基线本身红着,转红就没有区分力)。
|
|
269
|
-
if not base_ok:
|
|
270
|
-
bad.append("未变异镜像基线不干净(rc=%d 红项=%d)" % (rc, len(reds)))
|
|
271
|
-
for desc, old, new, exp in _MUTATIONS:
|
|
272
|
-
p = os.path.join(tree, _TARGET)
|
|
273
|
-
with io.open(p, encoding="utf-8", newline="") as f:
|
|
274
|
-
t = f.read()
|
|
275
|
-
eol = "\r\n" if "\r\n" in t else "\n"
|
|
276
|
-
o, n = _fold(old, eol), _fold(new, eol)
|
|
277
|
-
if t.count(o) != 1:
|
|
278
|
-
bad.append("%s —— 锚点在 %s 里命中 %d 次" % (desc, _TARGET, t.count(o)))
|
|
279
|
-
print(" ANCHOR-MISS " + desc)
|
|
280
|
-
continue
|
|
281
|
-
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
282
|
-
f.write(t.replace(o, n, 1))
|
|
283
|
-
for root, dd, ff in os.walk(tree):
|
|
284
|
-
if os.path.basename(root) == "__pycache__":
|
|
285
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
286
|
-
rc2, reds2, out2 = _run_in(tree)
|
|
287
|
-
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
288
|
-
f.write(t)
|
|
289
|
-
hit = [r for r in reds2 if any(r.startswith(e) for e in exp)]
|
|
290
|
-
if rc2 != 0 and len(hit) >= len(exp):
|
|
291
|
-
ok += 1
|
|
292
|
-
print(" OK %s 红项=%d 指定命中=%d/%d"
|
|
293
|
-
% (desc, len(reds2), len(hit), len(exp)))
|
|
294
|
-
else:
|
|
295
|
-
bad.append(desc)
|
|
296
|
-
print(" MISMATCH %s 红项=%d 指定命中=%d/%d rc=%d"
|
|
297
|
-
% (desc, len(reds2), len(hit), len(exp), rc2))
|
|
298
|
-
for r in reds2[:8]:
|
|
299
|
-
print(" FAIL " + r)
|
|
300
|
-
print("定点变异自证:%s(%d 条不合格)"
|
|
301
|
-
% ("PASS" if not bad else "FAIL", len(bad)))
|
|
302
|
-
if bad:
|
|
303
|
-
FAILS.extend(bad)
|
|
304
|
-
finally:
|
|
305
|
-
shutil.rmtree(tree, ignore_errors=True)
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
def main():
|
|
309
|
-
repo = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
310
|
-
if "--mutate" in sys.argv:
|
|
311
|
-
_mutate()
|
|
312
|
-
return 0 if not FAILS else 1
|
|
313
|
-
group_concurrent(repo)
|
|
314
|
-
group_semantics()
|
|
315
|
-
group_source()
|
|
316
|
-
print()
|
|
317
|
-
print("断言总数 %d(PASS %d / FAIL %d),FLOOR=%d"
|
|
318
|
-
% (PASS + FAIL, PASS, FAIL, FLOOR))
|
|
319
|
-
if FAIL or (PASS + FAIL) < FLOOR:
|
|
320
|
-
print("issue #354 [P2-17] 结果:失败")
|
|
321
|
-
return 1
|
|
322
|
-
print("issue #354 [P2-17] 结果:全部通过")
|
|
323
|
-
return 0
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
if __name__ == "__main__":
|
|
327
|
-
sys.exit(main())
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
# 功能名:writelimit 台账「读 → 改 → 写」的跨进程互斥(issue #354 P2-17 TOCTOU)
|
|
3
|
+
# 生效条件:python -X utf8 -m md_cg.test_issue354_p2_writelimit_toctou [--mutate];被测面=md_cg/writelimit.py 的 check / record_accepted / _transaction / _save_locked
|
|
4
|
+
# 子功能:A 组=多进程并发 check 的记账零丢失(修前 8 并发实测只剩 3~7 条);B 组=并发下的限流上限仍生效(计数不丢 ⇒ 第 RATE_MAX+1 条起判 DEFER);C 组=单进程语义未变(放行/CONVERGE/DROP/DEFER 与 #345/#148 口径一致);D 组=临界区判据在场(读改写同锁、落盘无锁版本、strict=True)
|
|
5
|
+
# 执行:--mutate 时把「读改写同临界区」退回修前形态(_load 在锁外、_save 在锁内)到**镜像树**,守卫必须转红
|
|
6
|
+
# 验证方式:默认模式全部 PASS(退出码 0);--mutate 下未变异镜像 0 红、变异后指定项逐项转红
|
|
7
|
+
# 不适用条件:不覆盖 Windows 之外的 msvcrt/flock 实现差异(FileLock 本体另有 test_lock.py);不判「限流阈值 RATE_MAX 是否合理」(业务参数);不覆盖 swarm Rust 侧并发(另有 md_cg/test_issue354_rust_wal_containment.py)
|
|
8
|
+
"""issue #354 [P2-17] 守卫:writelimit 台账读改写必须全程持跨进程锁。
|
|
9
|
+
|
|
10
|
+
病象(修前,本文件 A 组实测):8 个进程各自对同一台账调用一次 check,每个进程都
|
|
11
|
+
应留下 1 条时间戳;旧实现 `_load` 在锁**外**、`_save` 在锁**内**,后写者用陈旧
|
|
12
|
+
快照整份覆写先写者 ⇒ 实测只剩 3~7 条(丢更新),频率上限被并发穿透。
|
|
13
|
+
`atomic_write` 只防撕裂、不防丢失更新——这是两件事。
|
|
14
|
+
|
|
15
|
+
修法(报告 §5.9):读改写全程持同一把 OS 级 `FileLock(strict=True)`(与 #322/#348
|
|
16
|
+
同口径);临界区内落盘走 `_save_locked`(不再二次取锁——Windows 上同进程第二次
|
|
17
|
+
获取同一字节范围会自我阻塞);`now` 也在锁内取(锁外取的 now 会落在别人已写入
|
|
18
|
+
的时间戳之前,被 P1-10 的双向界定当作「未来戳」剔掉,同样丢记账)。
|
|
19
|
+
|
|
20
|
+
隔离纪律:台账全部落在 tempfile.mkdtemp 下;子进程显式剔除父 shell 的
|
|
21
|
+
MDCG_TOKEN / MDCG_VERIFY_KEY(派工书 §0 的假红陷阱)。镜像树变异只在临时目录
|
|
22
|
+
改源码,真实工作树一字不动。
|
|
23
|
+
"""
|
|
24
|
+
from __future__ import annotations
|
|
25
|
+
|
|
26
|
+
import io
|
|
27
|
+
import json
|
|
28
|
+
import os
|
|
29
|
+
import shutil
|
|
30
|
+
import subprocess
|
|
31
|
+
import sys
|
|
32
|
+
import tempfile
|
|
33
|
+
|
|
34
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
35
|
+
|
|
36
|
+
FLOOR = 12
|
|
37
|
+
PASS, FAIL = 0, 0
|
|
38
|
+
FAILS = []
|
|
39
|
+
|
|
40
|
+
N_PROC = 8
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
def _check(name, cond, detail=""):
|
|
44
|
+
global PASS, FAIL
|
|
45
|
+
if cond:
|
|
46
|
+
PASS += 1
|
|
47
|
+
print(" PASS " + name)
|
|
48
|
+
else:
|
|
49
|
+
FAIL += 1
|
|
50
|
+
FAILS.append(name)
|
|
51
|
+
print(" FAIL " + name + " " + str(detail)[:220])
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
# ---------------------------------------------------------------- 桩与夹具
|
|
55
|
+
|
|
56
|
+
class _CG:
|
|
57
|
+
"""最小 cg 桩:check/record_accepted 只用到 root 与 get。"""
|
|
58
|
+
|
|
59
|
+
def __init__(self, root, nodes=None):
|
|
60
|
+
self.root = root
|
|
61
|
+
self._nodes = nodes or {}
|
|
62
|
+
|
|
63
|
+
def get(self, nid):
|
|
64
|
+
return self._nodes.get(nid)
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
def _env():
|
|
68
|
+
e = dict(os.environ)
|
|
69
|
+
e.pop("MDCG_TOKEN", None) # 派工书 §0:父 shell 的令牌会污染子进程
|
|
70
|
+
e.pop("MDCG_VERIFY_KEY", None)
|
|
71
|
+
e["PYTHONUTF8"] = "1"
|
|
72
|
+
e["PYTHONDONTWRITEBYTECODE"] = "1"
|
|
73
|
+
e["MDCG_WRITELIMIT"] = "1"
|
|
74
|
+
return e
|
|
75
|
+
|
|
76
|
+
|
|
77
|
+
#: 并发 worker:一次 check(正文各异 ⇒ 签名各异),跑完打印台账窗口条数。
|
|
78
|
+
_WORKER = r'''
|
|
79
|
+
import json, sys, time
|
|
80
|
+
sys.path.insert(0, sys.argv[1])
|
|
81
|
+
from md_cg import writelimit
|
|
82
|
+
|
|
83
|
+
class CG:
|
|
84
|
+
def __init__(self, root):
|
|
85
|
+
self.root = root
|
|
86
|
+
def get(self, nid):
|
|
87
|
+
return None
|
|
88
|
+
|
|
89
|
+
cg = CG(sys.argv[2])
|
|
90
|
+
r = writelimit.check(cg, "并发写入正文 %s 用于区分签名" % sys.argv[3], role="u")
|
|
91
|
+
try:
|
|
92
|
+
st = json.load(open(sys.argv[2] + "/_writelimit.json", encoding="utf-8"))
|
|
93
|
+
n = len((st.get("rate") or {}).get("contextual:u") or [])
|
|
94
|
+
except Exception as exc:
|
|
95
|
+
n = -1
|
|
96
|
+
print(json.dumps({"verdict": r, "rate_after": n}))
|
|
97
|
+
'''
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
def _spawn_concurrent(root, repo, n=N_PROC):
|
|
101
|
+
procs = [subprocess.Popen([sys.executable, "-X", "utf8", "-c", _WORKER, repo, root, str(i)],
|
|
102
|
+
env=_env(), stdout=subprocess.PIPE, stderr=subprocess.PIPE,
|
|
103
|
+
text=True, encoding="utf-8", errors="replace")
|
|
104
|
+
for i in range(n)]
|
|
105
|
+
outs = []
|
|
106
|
+
for p in procs:
|
|
107
|
+
o, e = p.communicate(timeout=180)
|
|
108
|
+
outs.append((p.returncode, o, e))
|
|
109
|
+
return outs
|
|
110
|
+
|
|
111
|
+
|
|
112
|
+
def _rate_len(root, key="contextual:u"):
|
|
113
|
+
p = os.path.join(root, "_writelimit.json")
|
|
114
|
+
if not os.path.exists(p):
|
|
115
|
+
return -1
|
|
116
|
+
st = json.load(open(p, encoding="utf-8"))
|
|
117
|
+
return len((st.get("rate") or {}).get(key) or [])
|
|
118
|
+
|
|
119
|
+
|
|
120
|
+
# ---------------------------------------------------------------- A/B 组:并发
|
|
121
|
+
|
|
122
|
+
def group_concurrent(repo):
|
|
123
|
+
print("== A 组:8 进程并发 check 的记账零丢失(修前实测只剩 3~7 条)==")
|
|
124
|
+
root = tempfile.mkdtemp(prefix="i354p2_toc_")
|
|
125
|
+
outs = _spawn_concurrent(root, repo)
|
|
126
|
+
bad = [(rc, (e or "")[-160:]) for rc, _o, e in outs if rc != 0]
|
|
127
|
+
_check("A1 全部 worker 正常退出(锁竞争不误伤)", not bad, bad)
|
|
128
|
+
got = _rate_len(root)
|
|
129
|
+
_check("A2 并发记账零丢失(8 进程 ⇒ 恰好 8 条)", got == N_PROC,
|
|
130
|
+
"台账窗口条数=%r 期望=%d" % (got, N_PROC))
|
|
131
|
+
# B 组:并发下上限仍生效——再并发一轮,总量受 RATE_MAX*4 封顶且判定 DEFER
|
|
132
|
+
print("== B 组:并发下的限流上限仍生效(计数不丢 ⇒ 后续判 DEFER)==")
|
|
133
|
+
root2 = tempfile.mkdtemp(prefix="i354p2_cap_")
|
|
134
|
+
# 先灌满窗口:顺序写 RATE_MAX 条(此刻未满,应全部放行)
|
|
135
|
+
from . import writelimit as W
|
|
136
|
+
cg = _CG(root2)
|
|
137
|
+
verdicts = [W.check(cg, "顺序写入正文 %d 号" % i, role="u") for i in range(W.RATE_MAX)]
|
|
138
|
+
_check("B1 前 RATE_MAX 条顺序写入放行", all(v is None for v in verdicts), verdicts)
|
|
139
|
+
# 再并发 8 条:全部应判 DEFER(修前并发丢记账 ⇒ 部分被放行)
|
|
140
|
+
outs2 = _spawn_concurrent(root2, repo)
|
|
141
|
+
vs = []
|
|
142
|
+
for _rc, o, _e in outs2:
|
|
143
|
+
try:
|
|
144
|
+
vs.append(json.loads(o.strip().splitlines()[-1])["verdict"])
|
|
145
|
+
except Exception:
|
|
146
|
+
vs.append(None)
|
|
147
|
+
defers = [v for v in vs if isinstance(v, dict) and v.get("verdict") == "DEFER"]
|
|
148
|
+
_check("B2 满窗口后并发写入一律 DEFER(上限未被并发穿透)",
|
|
149
|
+
len(defers) == N_PROC, "实测 verdicts=%r" % (vs,))
|
|
150
|
+
|
|
151
|
+
|
|
152
|
+
# ---------------------------------------------------------------- C 组:单进程语义
|
|
153
|
+
|
|
154
|
+
def group_semantics():
|
|
155
|
+
print("== C 组:单进程语义未变(放行 / CONVERGE / DROP / DEFER)==")
|
|
156
|
+
from . import writelimit as W
|
|
157
|
+
root = tempfile.mkdtemp(prefix="i354p2_sem_")
|
|
158
|
+
node = {"id": "n1", "content": "同模板内容 1", "frontmatter": {"layer": "contextual"}}
|
|
159
|
+
cg = _CG(root, {"n1": node})
|
|
160
|
+
_check("C1 首次写入放行", W.check(cg, "同模板内容 1", role="u", node_id="n1") is None)
|
|
161
|
+
r = W.check(cg, "同模板内容 2", role="u", node_id="n1")
|
|
162
|
+
_check("C2 同模板不同正文 ⇒ CONVERGE",
|
|
163
|
+
isinstance(r, dict) and r.get("verdict") == "CONVERGE", r)
|
|
164
|
+
r = W.check(cg, "同模板内容 1", role="u", node_id="n1")
|
|
165
|
+
_check("C3 正文完全一致 ⇒ DROP",
|
|
166
|
+
isinstance(r, dict) and r.get("verdict") == "DROP", r)
|
|
167
|
+
root2 = tempfile.mkdtemp(prefix="i354p2_defer_")
|
|
168
|
+
cg2 = _CG(root2)
|
|
169
|
+
for i in range(W.RATE_MAX):
|
|
170
|
+
W.check(cg2, "灌水正文 %d 号" % i, role="u")
|
|
171
|
+
r = W.check(cg2, "再来一条", role="u")
|
|
172
|
+
_check("C4 窗口满 ⇒ DEFER", isinstance(r, dict) and r.get("verdict") == "DEFER", r)
|
|
173
|
+
_check("C5 record_accepted 首见即落占位(锁内读改写)", _record_ok(W, root2))
|
|
174
|
+
|
|
175
|
+
|
|
176
|
+
def _record_ok(W, root):
|
|
177
|
+
cg = _CG(root)
|
|
178
|
+
W.record_accepted(cg, "nid-x", "一个足够长的模板正文用于签名")
|
|
179
|
+
st = json.load(open(os.path.join(root, "_writelimit.json"), encoding="utf-8"))
|
|
180
|
+
return any(isinstance(v, dict) and v.get("nid") == "nid-x" for v in st["sigs"].values())
|
|
181
|
+
|
|
182
|
+
|
|
183
|
+
# ---------------------------------------------------------------- D 组:判据在场
|
|
184
|
+
|
|
185
|
+
def group_source():
|
|
186
|
+
print("== D 组:临界区判据在场(源码级)==")
|
|
187
|
+
p = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
|
|
188
|
+
"md_cg", "writelimit.py")
|
|
189
|
+
src = io.open(p, encoding="utf-8").read()
|
|
190
|
+
_check("D1 _transaction 用 strict=True 的跨进程锁", "FileLock(_state_path(cg), strict=True)" in src)
|
|
191
|
+
_check("D2 check 的 _load 在 _transaction 内", "with _transaction(cg):\n now = float" in src
|
|
192
|
+
or "with _transaction(cg):\r\n now = float" in src)
|
|
193
|
+
_check("D3 临界区内落盘走无锁版 _save_locked", src.count("_save_locked(cg, st)") >= 4)
|
|
194
|
+
_check("D4 record_accepted 也在临界区内", src.count("with _transaction(cg):") >= 2)
|
|
195
|
+
_check("D5 反陈化:点名 issue #354 与 P2-17", "#354" in src and "P2-17" in src)
|
|
196
|
+
|
|
197
|
+
|
|
198
|
+
# ---------------------------------------------------------------- 定点变异自证
|
|
199
|
+
|
|
200
|
+
_TARGET = "md_cg/writelimit.py"
|
|
201
|
+
|
|
202
|
+
#: (说明, 改前锚, 改后锚, 期望转红的断言名前缀)
|
|
203
|
+
_MUTATIONS = (
|
|
204
|
+
# 缺陷形态:**锁外**读快照、锁内用它落盘(后写者整份覆盖先写者)。为了把
|
|
205
|
+
# 「读在锁外」这个竞态窗口放大成确定性现象,变异腿在 load 与取锁之间插入
|
|
206
|
+
# 0.25s——语义上仍是「锁外的陈旧快照」,只是让 8 个 worker 必然同时落在
|
|
207
|
+
# 同一个空快照上(真实修前代码正是这个形态,只是窗口更窄)。
|
|
208
|
+
("V1 读改写退回修前形态(_load 在锁外、_save 在锁内)",
|
|
209
|
+
" with _transaction(cg):\n"
|
|
210
|
+
" now = float(now) if now is not None else time.time()\n"
|
|
211
|
+
" st = _load(cg)\n"
|
|
212
|
+
" # 1) 同源频率限制",
|
|
213
|
+
" _st_pre = _load(cg)\n"
|
|
214
|
+
" time.sleep(0.25)\n"
|
|
215
|
+
" with _transaction(cg):\n"
|
|
216
|
+
" now = float(now) if now is not None else time.time()\n"
|
|
217
|
+
" st = _st_pre\n"
|
|
218
|
+
" # 1) 同源频率限制",
|
|
219
|
+
("A2",)),
|
|
220
|
+
)
|
|
221
|
+
|
|
222
|
+
|
|
223
|
+
def _fold(text, eol):
|
|
224
|
+
return text.replace("\r\n", "\n").replace("\n", eol)
|
|
225
|
+
|
|
226
|
+
|
|
227
|
+
def _mirror_build():
|
|
228
|
+
repo = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
229
|
+
dst = tempfile.mkdtemp(prefix="i354p2_mut_")
|
|
230
|
+
for name in ("md_cg", "scripts"):
|
|
231
|
+
src = os.path.join(repo, name)
|
|
232
|
+
if os.path.isdir(src):
|
|
233
|
+
shutil.copytree(src, os.path.join(dst, name),
|
|
234
|
+
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
235
|
+
for name in sorted(os.listdir(repo)):
|
|
236
|
+
p = os.path.join(repo, name)
|
|
237
|
+
if os.path.isfile(p) and name.endswith(".py"):
|
|
238
|
+
shutil.copy2(p, os.path.join(dst, name))
|
|
239
|
+
return dst
|
|
240
|
+
|
|
241
|
+
|
|
242
|
+
def _run_in(tree):
|
|
243
|
+
env = _env()
|
|
244
|
+
env["PYTHONPATH"] = tree
|
|
245
|
+
pr = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
246
|
+
"md_cg.test_issue354_p2_writelimit_toctou"],
|
|
247
|
+
capture_output=True, text=True, encoding="utf-8",
|
|
248
|
+
errors="replace", cwd=tree, env=env, timeout=1800)
|
|
249
|
+
out = (pr.stdout or "") + (pr.stderr or "")
|
|
250
|
+
# 复核意见 4:只认行首的 "FAIL " 红项行;汇总行
|
|
251
|
+
# "断言总数 N(PASS x / FAIL y),FLOOR=z" 里也含 "FAIL ",按子串匹配会把它
|
|
252
|
+
# 当成一条红项(基线 0 红被读成 1 红)。
|
|
253
|
+
reds = [ln.strip()[len("FAIL "):].strip()
|
|
254
|
+
for ln in out.splitlines() if ln.strip().startswith("FAIL ")]
|
|
255
|
+
return pr.returncode, reds, out
|
|
256
|
+
|
|
257
|
+
|
|
258
|
+
def _mutate():
|
|
259
|
+
print("!! 定点变异自证:把读改写退回修前形态,守卫必须转红(镜像树)")
|
|
260
|
+
tree = _mirror_build()
|
|
261
|
+
try:
|
|
262
|
+
rc, reds, out = _run_in(tree)
|
|
263
|
+
print(" 未变异镜像基线:rc=%d 红项=%d(须 rc=0 且 0 红)" % (rc, len(reds)))
|
|
264
|
+
base_ok = (rc == 0 and not reds)
|
|
265
|
+
if not base_ok:
|
|
266
|
+
print("\n".join(out.splitlines()[-25:]))
|
|
267
|
+
ok, bad = 0, []
|
|
268
|
+
# 复核意见 4:基线必须干净才算变异腿有效(基线本身红着,转红就没有区分力)。
|
|
269
|
+
if not base_ok:
|
|
270
|
+
bad.append("未变异镜像基线不干净(rc=%d 红项=%d)" % (rc, len(reds)))
|
|
271
|
+
for desc, old, new, exp in _MUTATIONS:
|
|
272
|
+
p = os.path.join(tree, _TARGET)
|
|
273
|
+
with io.open(p, encoding="utf-8", newline="") as f:
|
|
274
|
+
t = f.read()
|
|
275
|
+
eol = "\r\n" if "\r\n" in t else "\n"
|
|
276
|
+
o, n = _fold(old, eol), _fold(new, eol)
|
|
277
|
+
if t.count(o) != 1:
|
|
278
|
+
bad.append("%s —— 锚点在 %s 里命中 %d 次" % (desc, _TARGET, t.count(o)))
|
|
279
|
+
print(" ANCHOR-MISS " + desc)
|
|
280
|
+
continue
|
|
281
|
+
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
282
|
+
f.write(t.replace(o, n, 1))
|
|
283
|
+
for root, dd, ff in os.walk(tree):
|
|
284
|
+
if os.path.basename(root) == "__pycache__":
|
|
285
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
286
|
+
rc2, reds2, out2 = _run_in(tree)
|
|
287
|
+
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
288
|
+
f.write(t)
|
|
289
|
+
hit = [r for r in reds2 if any(r.startswith(e) for e in exp)]
|
|
290
|
+
if rc2 != 0 and len(hit) >= len(exp):
|
|
291
|
+
ok += 1
|
|
292
|
+
print(" OK %s 红项=%d 指定命中=%d/%d"
|
|
293
|
+
% (desc, len(reds2), len(hit), len(exp)))
|
|
294
|
+
else:
|
|
295
|
+
bad.append(desc)
|
|
296
|
+
print(" MISMATCH %s 红项=%d 指定命中=%d/%d rc=%d"
|
|
297
|
+
% (desc, len(reds2), len(hit), len(exp), rc2))
|
|
298
|
+
for r in reds2[:8]:
|
|
299
|
+
print(" FAIL " + r)
|
|
300
|
+
print("定点变异自证:%s(%d 条不合格)"
|
|
301
|
+
% ("PASS" if not bad else "FAIL", len(bad)))
|
|
302
|
+
if bad:
|
|
303
|
+
FAILS.extend(bad)
|
|
304
|
+
finally:
|
|
305
|
+
shutil.rmtree(tree, ignore_errors=True)
|
|
306
|
+
|
|
307
|
+
|
|
308
|
+
def main():
|
|
309
|
+
repo = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
310
|
+
if "--mutate" in sys.argv:
|
|
311
|
+
_mutate()
|
|
312
|
+
return 0 if not FAILS else 1
|
|
313
|
+
group_concurrent(repo)
|
|
314
|
+
group_semantics()
|
|
315
|
+
group_source()
|
|
316
|
+
print()
|
|
317
|
+
print("断言总数 %d(PASS %d / FAIL %d),FLOOR=%d"
|
|
318
|
+
% (PASS + FAIL, PASS, FAIL, FLOOR))
|
|
319
|
+
if FAIL or (PASS + FAIL) < FLOOR:
|
|
320
|
+
print("issue #354 [P2-17] 结果:失败")
|
|
321
|
+
return 1
|
|
322
|
+
print("issue #354 [P2-17] 结果:全部通过")
|
|
323
|
+
return 0
|
|
324
|
+
|
|
325
|
+
|
|
326
|
+
if __name__ == "__main__":
|
|
327
|
+
sys.exit(main())
|