@furongjun1999/dsh-memory 0.9.6 → 0.9.7
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/data/policy.json +38 -38
- package/docs/discipline/templates/spec.txt.tmpl +1 -1
- package/dsh/cordis.yml.example +139 -139
- package/lib/hooks.d.ts +19 -0
- package/lib/hooks.js +29 -6
- package/lib/index.js +11 -2
- package/lib/lib/hook_audit.js +38 -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/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 +557 -557
- 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_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_retr_s5.py +312 -312
- package/md_cg/test_s1_ast_judge.py +109 -109
- 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_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 +30 -6
- package/src/index.ts +14 -5
- package/src/lib/hook_audit.ts +282 -256
- package/src/lib/mdcg_client.ts +469 -469
- package/src/lib/prompt_safety.ts +17 -3
- package/src/tools.ts +23 -1
|
@@ -1,420 +1,420 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
r"""守卫 · issue #72(Feature/operations)coldverify 队列无受控消费入口。
|
|
3
|
-
|
|
4
|
-
缺陷(本件修复 · md_cg/coldverify.py)
|
|
5
|
-
--------------------------------------
|
|
6
|
-
现状读数(issue 正文):queue_size=119 / processed=0 / worker_alive=false——
|
|
7
|
-
写入侧持续 enqueue,工具面只有 `cg(op=status)` 可看水位,没有任何**经权限、
|
|
8
|
-
限量、审计保护**的消费入口。`drain()` 是库内方法:无权限门、无单批硬上限、
|
|
9
|
-
无审计,任何拿到 cg 的调用方都能全量消费且不留痕。
|
|
10
|
-
|
|
11
|
-
修复:新增模块级单点 `controlled_drain(cg, limit=, dry_run=, principal=)`:
|
|
12
|
-
· 权限闸:须 can_admin;未授权返回 forbidden 且**不返回队列内容**;
|
|
13
|
-
· 限量闸:0 <= limit <= CONTROL_LIMIT_MAX(= BATCH_LIMIT),越界 fail-closed;
|
|
14
|
-
· 审计闸:cg._audit 写一行聚合(payload-free),失败不阻断;
|
|
15
|
-
· 失败处置:ok=False 的任务重入队(attempts+1,上限 CONTROL_MAX_ATTEMPTS),
|
|
16
|
-
超过计入 dead_letter——失败可见、可重试、不无限滞留;
|
|
17
|
-
· 不引入常驻线程(start_worker 的 opt-in 语义不变)。
|
|
18
|
-
|
|
19
|
-
【功能名】coldverify 受控消费入口(#72)
|
|
20
|
-
【生效条件】cg 挂有冷路径队列;principal.can_admin 为真;limit 在
|
|
21
|
-
[0, CONTROL_LIMIT_MAX];dry_run 亦过同一权限闸。
|
|
22
|
-
【子功能】限量消费 / 预演 / 失败重入队与 dead-letter / 聚合审计 / opt-in 不破。
|
|
23
|
-
【执行】python -X utf8 -m md_cg.test_issue72_coldverify_controlled_drain
|
|
24
|
-
python -X utf8 -m md_cg.test_issue72_coldverify_controlled_drain --mutate
|
|
25
|
-
【验证方式】退出码 0 全绿;--mutate 下每个变异体点名预期红项且非空。
|
|
26
|
-
【不适用条件】不判后台线程的吞吐/告警(issue 里那两条是运维配置面,非本件
|
|
27
|
-
最小能力);不覆盖 MCP op 注册接线(需改 mcp_server.py,不在本单元授权面)。
|
|
28
|
-
"""
|
|
29
|
-
from __future__ import annotations
|
|
30
|
-
|
|
31
|
-
import io
|
|
32
|
-
import json
|
|
33
|
-
import os
|
|
34
|
-
import shutil
|
|
35
|
-
import sys
|
|
36
|
-
import tempfile
|
|
37
|
-
|
|
38
|
-
HERE = os.path.dirname(os.path.abspath(__file__))
|
|
39
|
-
REPO = os.path.dirname(HERE)
|
|
40
|
-
if REPO not in sys.path:
|
|
41
|
-
sys.path.insert(0, REPO)
|
|
42
|
-
|
|
43
|
-
PASS = 0
|
|
44
|
-
FAIL = 0
|
|
45
|
-
FAILS = []
|
|
46
|
-
SILENT = False
|
|
47
|
-
VIOL = []
|
|
48
|
-
SANDBOXES = []
|
|
49
|
-
|
|
50
|
-
_SRC = os.path.join(HERE, "coldverify.py")
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
def check(name, cond, detail=""):
|
|
54
|
-
global PASS, FAIL
|
|
55
|
-
if SILENT:
|
|
56
|
-
if not cond:
|
|
57
|
-
VIOL.append(name)
|
|
58
|
-
return bool(cond)
|
|
59
|
-
if cond:
|
|
60
|
-
PASS += 1
|
|
61
|
-
print(" [PASS] %s%s" % (name, (" · " + str(detail)) if detail else ""))
|
|
62
|
-
else:
|
|
63
|
-
FAIL += 1
|
|
64
|
-
FAILS.append(name)
|
|
65
|
-
print(" [FAIL] %s · %s" % (name, detail))
|
|
66
|
-
return bool(cond)
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
def _tmp(tag):
|
|
70
|
-
t = tempfile.mkdtemp(prefix="p72c_%s_" % tag)
|
|
71
|
-
SANDBOXES.append(t)
|
|
72
|
-
return t
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
def _bind(cg, q):
|
|
76
|
-
"""把**同一个**队列实例挂到 cg(attach() 会新建实例,内存队列不共享)。"""
|
|
77
|
-
cg._coldverify = q
|
|
78
|
-
return q
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
def _cg(root, can_admin=True):
|
|
82
|
-
from md_cg.mdcos import MdCGSecure
|
|
83
|
-
from md_cg.security import Principal
|
|
84
|
-
return MdCGSecure(root, principal=Principal(
|
|
85
|
-
role="designer", clearance="private", can_write=True,
|
|
86
|
-
can_admin=can_admin), autoflush=1)
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
class _BoomCG:
|
|
90
|
-
"""消费必失败的最小 cg:get 抛异常 ⇒ drain 走 errors 分支(ok=False)。"""
|
|
91
|
-
|
|
92
|
-
def __init__(self, root):
|
|
93
|
-
self.root = root
|
|
94
|
-
self.audit = []
|
|
95
|
-
|
|
96
|
-
class _P:
|
|
97
|
-
can_admin = True
|
|
98
|
-
self.principal = _P()
|
|
99
|
-
|
|
100
|
-
def _audit(self, op, node_id, **meta):
|
|
101
|
-
self.audit.append({"op": op, "id": node_id, **meta})
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
def g1_forbidden_hides_queue():
|
|
105
|
-
print("== G1 未授权:不消费、不返回队列内容 ==")
|
|
106
|
-
from md_cg import coldverify
|
|
107
|
-
root = _tmp("forbid")
|
|
108
|
-
q = coldverify.ColdVerifyQueue(root=root)
|
|
109
|
-
cg = _cg(root, can_admin=False)
|
|
110
|
-
coldverify.attach(cg)
|
|
111
|
-
_bind(cg, q)
|
|
112
|
-
q.enqueue("secret-node", "reverify")
|
|
113
|
-
raw0 = io.open(q._queue_path, "rb").read()
|
|
114
|
-
proc0 = q.status()["stats"]["processed"]
|
|
115
|
-
r = coldverify.controlled_drain(cg, limit=5)
|
|
116
|
-
raw1 = io.open(q._queue_path, "rb").read()
|
|
117
|
-
check("G1a 非 admin ⇒ ok=False / forbidden",
|
|
118
|
-
r.get("ok") is False and r.get("error") == "forbidden", r)
|
|
119
|
-
check("G1b 拒绝体不含队列内容(无 would_process/results/queue_size/node_id)",
|
|
120
|
-
not any(k in r for k in ("would_process", "results", "queue_size"))
|
|
121
|
-
and "secret-node" not in json.dumps(r, ensure_ascii=False), sorted(r))
|
|
122
|
-
check("G1c 拒绝时不消费(队列文件逐字节不变、processed 不增)",
|
|
123
|
-
raw0 == raw1 and q.status()["stats"]["processed"] == proc0)
|
|
124
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
def g2_dry_run_no_side_effect():
|
|
128
|
-
print("== G2 预演:不改队列、不计数、无正文 ==")
|
|
129
|
-
from md_cg import coldverify
|
|
130
|
-
root = _tmp("dry")
|
|
131
|
-
q = coldverify.ColdVerifyQueue(root=root)
|
|
132
|
-
cg = _cg(root)
|
|
133
|
-
coldverify.attach(cg)
|
|
134
|
-
_bind(cg, q)
|
|
135
|
-
for i in range(3):
|
|
136
|
-
q.enqueue("n%d" % i, "reverify", secret="正文-不得外泄")
|
|
137
|
-
raw0 = io.open(q._queue_path, "rb").read()
|
|
138
|
-
proc0 = q.status()["stats"]["processed"]
|
|
139
|
-
r = coldverify.controlled_drain(cg, limit=2, dry_run=True)
|
|
140
|
-
raw1 = io.open(q._queue_path, "rb").read()
|
|
141
|
-
check("G2a dry_run 成功且 would_process 恰为 2 条",
|
|
142
|
-
r.get("ok") is True and len(r.get("would_process") or []) == 2,
|
|
143
|
-
r.get("would_process"))
|
|
144
|
-
check("G2b dry_run 不改队列文件、不增 processed",
|
|
145
|
-
raw0 == raw1 and q.status()["stats"]["processed"] == proc0)
|
|
146
|
-
check("G2c 预演体不含任务正文(只 node_id/action/age_s)",
|
|
147
|
-
"正文-不得外泄" not in json.dumps(r, ensure_ascii=False))
|
|
148
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
def g3_limit_exact_and_idempotent():
|
|
152
|
-
print("== G3 限量精确 + 重复运行不重复迁移 ==")
|
|
153
|
-
from md_cg import coldverify
|
|
154
|
-
root = _tmp("limit")
|
|
155
|
-
q = coldverify.ColdVerifyQueue(root=root)
|
|
156
|
-
cg = _cg(root)
|
|
157
|
-
coldverify.attach(cg)
|
|
158
|
-
_bind(cg, q)
|
|
159
|
-
for i in range(5):
|
|
160
|
-
q.enqueue("n%d" % i, "reverify")
|
|
161
|
-
r1 = coldverify.controlled_drain(cg, limit=2)
|
|
162
|
-
r2 = coldverify.controlled_drain(cg, limit=2)
|
|
163
|
-
ids1 = [x.get("node_id") for x in (r1.get("results") or [])]
|
|
164
|
-
ids2 = [x.get("node_id") for x in (r2.get("results") or [])]
|
|
165
|
-
check("G3a limit=2 ⇒ 每批恰处理 2 条",
|
|
166
|
-
len(ids1) == 2 and len(ids2) == 2, (ids1, ids2))
|
|
167
|
-
check("G3b 两批处理的不是同一批任务(不重复状态迁移)",
|
|
168
|
-
not (set(ids1) & set(ids2)), (ids1, ids2))
|
|
169
|
-
check("G3c 两批后队列剩 1 条",
|
|
170
|
-
q.status()["queue_size"] == 1, q.status()["queue_size"])
|
|
171
|
-
r3 = coldverify.controlled_drain(cg, limit=0)
|
|
172
|
-
check("G3d limit=0 合法且零处理(不静默改语义)",
|
|
173
|
-
r3.get("ok") is True and r3.get("processed") == 0
|
|
174
|
-
and q.status()["queue_size"] == 1, r3.get("processed"))
|
|
175
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
def g4_bad_limit_fail_closed():
|
|
179
|
-
print("== G4 limit 越界 fail-closed(不静默截断) ==")
|
|
180
|
-
from md_cg import coldverify
|
|
181
|
-
root = _tmp("badlim")
|
|
182
|
-
q = coldverify.ColdVerifyQueue(root=root)
|
|
183
|
-
cg = _cg(root)
|
|
184
|
-
coldverify.attach(cg)
|
|
185
|
-
_bind(cg, q)
|
|
186
|
-
q.enqueue("n0", "reverify")
|
|
187
|
-
for bad in (coldverify.CONTROL_LIMIT_MAX + 1, -1, "x"):
|
|
188
|
-
r = coldverify.controlled_drain(cg, limit=bad)
|
|
189
|
-
check("G4 limit=%r ⇒ bad_limit 且不消费" % (bad,),
|
|
190
|
-
r.get("ok") is False and r.get("error") == "bad_limit"
|
|
191
|
-
and q.status()["queue_size"] == 1, r)
|
|
192
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
def g5_failed_requeued_then_dead_letter():
|
|
196
|
-
print("== G5 失败任务可重试,超限进 dead_letter(不静默蒸发) ==")
|
|
197
|
-
from md_cg import coldverify
|
|
198
|
-
root = _tmp("fail")
|
|
199
|
-
q = coldverify.ColdVerifyQueue(root=root)
|
|
200
|
-
cg = _BoomCG(root)
|
|
201
|
-
q._root = root
|
|
202
|
-
q._queue_path = os.path.join(root, coldverify.QUEUE_FILE)
|
|
203
|
-
_bind(cg, q)
|
|
204
|
-
q.enqueue("boom", "reverify")
|
|
205
|
-
r1 = coldverify.controlled_drain(cg, limit=1)
|
|
206
|
-
check("G5a 失败被点名(errors 非空)",
|
|
207
|
-
len(r1.get("errors") or []) == 1, r1.get("errors"))
|
|
208
|
-
check("G5b 失败任务重新入队(requeued=1,队列仍有 1 条)",
|
|
209
|
-
r1.get("requeued") == 1 and q.status()["queue_size"] == 1,
|
|
210
|
-
{"requeued": r1.get("requeued"), "size": q.status()["queue_size"]})
|
|
211
|
-
r2 = coldverify.controlled_drain(cg, limit=1)
|
|
212
|
-
r3 = coldverify.controlled_drain(cg, limit=1)
|
|
213
|
-
r4 = coldverify.controlled_drain(cg, limit=1)
|
|
214
|
-
check("G5c 重试上限后进 dead_letter(第 4 次 dead_letter=1、队列清空)",
|
|
215
|
-
r4.get("dead_letter") == 1 and q.status()["queue_size"] == 0,
|
|
216
|
-
{"r2": r2.get("requeued"), "r3": r3.get("requeued"),
|
|
217
|
-
"dead": r4.get("dead_letter"), "size": q.status()["queue_size"]})
|
|
218
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
def g6_audit_payload_free():
|
|
222
|
-
print("== G6 消费留审计:聚合读数、不含正文 ==")
|
|
223
|
-
from md_cg import coldverify
|
|
224
|
-
root = _tmp("audit")
|
|
225
|
-
q = coldverify.ColdVerifyQueue(root=root)
|
|
226
|
-
cg = _cg(root)
|
|
227
|
-
coldverify.attach(cg)
|
|
228
|
-
_bind(cg, q)
|
|
229
|
-
q.enqueue("n0", "reverify", secret="正文-审计不得外泄")
|
|
230
|
-
r = coldverify.controlled_drain(cg, limit=1)
|
|
231
|
-
ap = os.path.join(root, "_audit.jsonl")
|
|
232
|
-
recs = []
|
|
233
|
-
if os.path.exists(ap):
|
|
234
|
-
for ln in io.open(ap, encoding="utf-8"):
|
|
235
|
-
if ln.strip():
|
|
236
|
-
try:
|
|
237
|
-
recs.append(json.loads(ln))
|
|
238
|
-
except Exception: # noqa: BLE001
|
|
239
|
-
pass
|
|
240
|
-
hit = [x for x in recs if x.get("op") == "coldverify_drain"]
|
|
241
|
-
check("G6a 审计落一行 coldverify_drain", len(hit) == 1, hit)
|
|
242
|
-
if hit:
|
|
243
|
-
h = hit[0]
|
|
244
|
-
check("G6b 审计含聚合读数(limit/processed/errors/queue_size)",
|
|
245
|
-
h.get("limit") == 1 and "processed" in h and "errors" in h
|
|
246
|
-
and "queue_size" in h, sorted(h))
|
|
247
|
-
check("G6c 审计 payload-free(不含任务正文)",
|
|
248
|
-
"正文-审计不得外泄" not in json.dumps(h, ensure_ascii=False))
|
|
249
|
-
check("G6d 返回体披露审计状态", r.get("audit") is True, r.get("audit"))
|
|
250
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
def g7_opt_in_intact():
|
|
254
|
-
print("== G7 回归:受控消费不启后台线程(opt-in 不变) ==")
|
|
255
|
-
from md_cg import coldverify
|
|
256
|
-
root = _tmp("optin")
|
|
257
|
-
q = coldverify.ColdVerifyQueue(root=root)
|
|
258
|
-
cg = _cg(root)
|
|
259
|
-
coldverify.attach(cg)
|
|
260
|
-
_bind(cg, q)
|
|
261
|
-
q.enqueue("n0", "reverify")
|
|
262
|
-
r = coldverify.controlled_drain(cg, limit=1)
|
|
263
|
-
check("G7 消费后 worker_alive 仍为 False",
|
|
264
|
-
r.get("worker_alive") is False and q.status()["worker_alive"] is False,
|
|
265
|
-
r.get("worker_alive"))
|
|
266
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
# ============================ 源断言 ============================
|
|
270
|
-
|
|
271
|
-
def b_source_face():
|
|
272
|
-
print("== B 源断言(关键判据在场 + 反陈化) ==")
|
|
273
|
-
src = io.open(_SRC, encoding="utf-8", errors="replace").read()
|
|
274
|
-
check("B1 权限闸在场", 'getattr(p, "can_admin", False)' in src)
|
|
275
|
-
check("B2 限量闸在场(范围判据 + 硬上限 + fail-closed)",
|
|
276
|
-
"CONTROL_LIMIT_MAX = BATCH_LIMIT" in src
|
|
277
|
-
and "if lim < 0 or lim > CONTROL_LIMIT_MAX:" in src
|
|
278
|
-
and '"bad_limit"' in src)
|
|
279
|
-
check("B3 失败重入队 + dead_letter 在场(调用点,不只是定义)",
|
|
280
|
-
"q._requeue_failed(src, attempts)" in src
|
|
281
|
-
and "attempts > CONTROL_MAX_ATTEMPTS" in src
|
|
282
|
-
and '"dead_letter"' in src)
|
|
283
|
-
check("B4 审计出口在场(payload-free)",
|
|
284
|
-
'"coldverify_drain"' in src and "payload" not in
|
|
285
|
-
src.split('"coldverify_drain"')[1][:600].lower())
|
|
286
|
-
check("B5 反陈化:点名 issue #72", "#72" in src)
|
|
287
|
-
seg = src[src.find("def controlled_drain"):]
|
|
288
|
-
nxt = seg.find("\ndef ")
|
|
289
|
-
if nxt > 0:
|
|
290
|
-
seg = seg[:nxt]
|
|
291
|
-
check("B6 不启后台线程(函数体内无 start_worker 调用)",
|
|
292
|
-
"start_worker(" not in seg)
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
# ============================ 主流程 ============================
|
|
296
|
-
|
|
297
|
-
GROUPS = (g1_forbidden_hides_queue, g2_dry_run_no_side_effect,
|
|
298
|
-
g3_limit_exact_and_idempotent, g4_bad_limit_fail_closed,
|
|
299
|
-
g5_failed_requeued_then_dead_letter, g6_audit_payload_free,
|
|
300
|
-
g7_opt_in_intact)
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
def run_groups():
|
|
304
|
-
global PASS, FAIL
|
|
305
|
-
PASS = 0
|
|
306
|
-
FAIL = 0
|
|
307
|
-
del FAILS[:]
|
|
308
|
-
del VIOL[:]
|
|
309
|
-
for g in GROUPS:
|
|
310
|
-
try:
|
|
311
|
-
g()
|
|
312
|
-
except Exception as exc: # noqa: BLE001
|
|
313
|
-
check("断言组 %s 抛异常:%s" % (g.__name__, exc), False)
|
|
314
|
-
import traceback
|
|
315
|
-
print(traceback.format_exc()[-600:])
|
|
316
|
-
b_source_face()
|
|
317
|
-
return len(FAILS)
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
# ============================ 变异自证 ============================
|
|
321
|
-
|
|
322
|
-
MUTATIONS = (
|
|
323
|
-
("M1 删权限闸",
|
|
324
|
-
' if not getattr(p, "can_admin", False):\n'
|
|
325
|
-
' return {"ok": False, "error": "forbidden",\n'
|
|
326
|
-
' "reason": "受控消费需 can_admin(未授权调用不返回队列内容)"}\n',
|
|
327
|
-
"", "G1a", "G1b", "B1"),
|
|
328
|
-
("M2 删限量闸",
|
|
329
|
-
" if lim < 0 or lim > CONTROL_LIMIT_MAX:\n"
|
|
330
|
-
' return {"ok": False, "error": "bad_limit",\n'
|
|
331
|
-
' "reason": "limit 须在 [0, %d](单批硬上限)" % CONTROL_LIMIT_MAX,\n'
|
|
332
|
-
' "limit_max": CONTROL_LIMIT_MAX}\n',
|
|
333
|
-
"", "G4", "B2"),
|
|
334
|
-
("M3 失败不重入队(静默蒸发)",
|
|
335
|
-
" q._requeue_failed(src, attempts)\n requeued += 1\n",
|
|
336
|
-
"", "G5b", "G5c", "B3"),
|
|
337
|
-
("M4 删审计调用",
|
|
338
|
-
' if a is not None:\n'
|
|
339
|
-
' try:\n'
|
|
340
|
-
' a("coldverify_drain", "", dry_run=False, limit=lim,\n'
|
|
341
|
-
' processed=st["stats"].get("processed"), errors=len(errs),\n'
|
|
342
|
-
' requeued=requeued, dead_letter=dead,\n'
|
|
343
|
-
' queue_size=st["queue_size"], oldest_age_s=st.get("oldest_age_s"))\n'
|
|
344
|
-
" audit_ok = True\n"
|
|
345
|
-
' except Exception: # noqa: BLE001\n'
|
|
346
|
-
' audit_ok = False # 审计失败不阻断消费(best-effort,同 G8)\n',
|
|
347
|
-
"", "G6a", "G6d", "B4"),
|
|
348
|
-
)
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
def mutate():
|
|
352
|
-
pristine = io.open(_SRC, encoding="utf-8", newline="").read()
|
|
353
|
-
global SILENT
|
|
354
|
-
bad = []
|
|
355
|
-
for name, anchor, repl, *want in MUTATIONS:
|
|
356
|
-
orig = pristine
|
|
357
|
-
NL = "\r\n" if "\r\n" in orig else "\n"
|
|
358
|
-
a_ = anchor.replace("\n", NL)
|
|
359
|
-
r_ = repl.replace("\n", NL)
|
|
360
|
-
if a_ not in orig:
|
|
361
|
-
print(" ANCHOR-MISS %s" % name)
|
|
362
|
-
bad.append(name)
|
|
363
|
-
continue
|
|
364
|
-
try:
|
|
365
|
-
io.open(_SRC, "w", encoding="utf-8", newline="").write(
|
|
366
|
-
orig.replace(a_, r_, 1))
|
|
367
|
-
# 变异体必须在**新模块状态**下判:否则第二轮起跑的是首轮缓存
|
|
368
|
-
# (首轮 M1 删权限闸 ⇒ 后续所有变异都看到无权限闸的旧代码)。
|
|
369
|
-
import importlib
|
|
370
|
-
from md_cg import coldverify as _cv
|
|
371
|
-
importlib.reload(_cv)
|
|
372
|
-
SILENT = True
|
|
373
|
-
run_groups()
|
|
374
|
-
reds = list(VIOL)
|
|
375
|
-
hit = [w for w in want if any(x.startswith(w) for x in reds)]
|
|
376
|
-
print(" %-4s %-34s 红项=%-3d 命中=%s"
|
|
377
|
-
% ("OK" if len(hit) == len(want) else "BAD", name,
|
|
378
|
-
len(reds), ",".join(hit) if hit else "无"))
|
|
379
|
-
if len(hit) != len(want):
|
|
380
|
-
print(" 期望红:%s;实红:%s" % (list(want), reds[:8]))
|
|
381
|
-
bad.append(name)
|
|
382
|
-
finally:
|
|
383
|
-
SILENT = False
|
|
384
|
-
io.open(_SRC, "w", encoding="utf-8", newline="").write(pristine)
|
|
385
|
-
import importlib
|
|
386
|
-
from md_cg import coldverify as _cv
|
|
387
|
-
importlib.reload(_cv) # 复原后立即回到真实现,避免污染下一轮
|
|
388
|
-
if io.open(_SRC, encoding="utf-8", newline="").read() != pristine:
|
|
389
|
-
print(" RESTORE-FAILED %s" % name)
|
|
390
|
-
bad.append(name + "(恢复失败)")
|
|
391
|
-
if bad:
|
|
392
|
-
print("\n定点变异自证:FAIL -- %s" % "、".join(bad))
|
|
393
|
-
return 1
|
|
394
|
-
print("\n定点变异自证:PASS(每处判据都被打红)")
|
|
395
|
-
return 0
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
def cleanup():
|
|
399
|
-
for t in SANDBOXES:
|
|
400
|
-
shutil.rmtree(t, ignore_errors=True)
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
if __name__ == "__main__":
|
|
404
|
-
if "--mutate" in sys.argv:
|
|
405
|
-
rc = mutate()
|
|
406
|
-
cleanup()
|
|
407
|
-
sys.exit(rc)
|
|
408
|
-
# 锚点自检(fail-closed):修法的关键判据不在源码里 ⇒ exit 2,不给假绿。
|
|
409
|
-
_s = io.open(_SRC, encoding="utf-8", errors="replace").read()
|
|
410
|
-
_miss = [a for a in ("def controlled_drain",
|
|
411
|
-
'getattr(p, "can_admin", False)',
|
|
412
|
-
'"coldverify_drain"') if a not in _s]
|
|
413
|
-
if _miss:
|
|
414
|
-
print("锚点自检失败:关键判据字面量缺失 %s" % _miss)
|
|
415
|
-
cleanup()
|
|
416
|
-
sys.exit(2)
|
|
417
|
-
n = run_groups()
|
|
418
|
-
print("\nissue72 coldverify 受控消费守卫:%d 通过,%d 失败" % (PASS, n))
|
|
419
|
-
cleanup()
|
|
420
|
-
sys.exit(1 if n else 0)
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
r"""守卫 · issue #72(Feature/operations)coldverify 队列无受控消费入口。
|
|
3
|
+
|
|
4
|
+
缺陷(本件修复 · md_cg/coldverify.py)
|
|
5
|
+
--------------------------------------
|
|
6
|
+
现状读数(issue 正文):queue_size=119 / processed=0 / worker_alive=false——
|
|
7
|
+
写入侧持续 enqueue,工具面只有 `cg(op=status)` 可看水位,没有任何**经权限、
|
|
8
|
+
限量、审计保护**的消费入口。`drain()` 是库内方法:无权限门、无单批硬上限、
|
|
9
|
+
无审计,任何拿到 cg 的调用方都能全量消费且不留痕。
|
|
10
|
+
|
|
11
|
+
修复:新增模块级单点 `controlled_drain(cg, limit=, dry_run=, principal=)`:
|
|
12
|
+
· 权限闸:须 can_admin;未授权返回 forbidden 且**不返回队列内容**;
|
|
13
|
+
· 限量闸:0 <= limit <= CONTROL_LIMIT_MAX(= BATCH_LIMIT),越界 fail-closed;
|
|
14
|
+
· 审计闸:cg._audit 写一行聚合(payload-free),失败不阻断;
|
|
15
|
+
· 失败处置:ok=False 的任务重入队(attempts+1,上限 CONTROL_MAX_ATTEMPTS),
|
|
16
|
+
超过计入 dead_letter——失败可见、可重试、不无限滞留;
|
|
17
|
+
· 不引入常驻线程(start_worker 的 opt-in 语义不变)。
|
|
18
|
+
|
|
19
|
+
【功能名】coldverify 受控消费入口(#72)
|
|
20
|
+
【生效条件】cg 挂有冷路径队列;principal.can_admin 为真;limit 在
|
|
21
|
+
[0, CONTROL_LIMIT_MAX];dry_run 亦过同一权限闸。
|
|
22
|
+
【子功能】限量消费 / 预演 / 失败重入队与 dead-letter / 聚合审计 / opt-in 不破。
|
|
23
|
+
【执行】python -X utf8 -m md_cg.test_issue72_coldverify_controlled_drain
|
|
24
|
+
python -X utf8 -m md_cg.test_issue72_coldverify_controlled_drain --mutate
|
|
25
|
+
【验证方式】退出码 0 全绿;--mutate 下每个变异体点名预期红项且非空。
|
|
26
|
+
【不适用条件】不判后台线程的吞吐/告警(issue 里那两条是运维配置面,非本件
|
|
27
|
+
最小能力);不覆盖 MCP op 注册接线(需改 mcp_server.py,不在本单元授权面)。
|
|
28
|
+
"""
|
|
29
|
+
from __future__ import annotations
|
|
30
|
+
|
|
31
|
+
import io
|
|
32
|
+
import json
|
|
33
|
+
import os
|
|
34
|
+
import shutil
|
|
35
|
+
import sys
|
|
36
|
+
import tempfile
|
|
37
|
+
|
|
38
|
+
HERE = os.path.dirname(os.path.abspath(__file__))
|
|
39
|
+
REPO = os.path.dirname(HERE)
|
|
40
|
+
if REPO not in sys.path:
|
|
41
|
+
sys.path.insert(0, REPO)
|
|
42
|
+
|
|
43
|
+
PASS = 0
|
|
44
|
+
FAIL = 0
|
|
45
|
+
FAILS = []
|
|
46
|
+
SILENT = False
|
|
47
|
+
VIOL = []
|
|
48
|
+
SANDBOXES = []
|
|
49
|
+
|
|
50
|
+
_SRC = os.path.join(HERE, "coldverify.py")
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
def check(name, cond, detail=""):
|
|
54
|
+
global PASS, FAIL
|
|
55
|
+
if SILENT:
|
|
56
|
+
if not cond:
|
|
57
|
+
VIOL.append(name)
|
|
58
|
+
return bool(cond)
|
|
59
|
+
if cond:
|
|
60
|
+
PASS += 1
|
|
61
|
+
print(" [PASS] %s%s" % (name, (" · " + str(detail)) if detail else ""))
|
|
62
|
+
else:
|
|
63
|
+
FAIL += 1
|
|
64
|
+
FAILS.append(name)
|
|
65
|
+
print(" [FAIL] %s · %s" % (name, detail))
|
|
66
|
+
return bool(cond)
|
|
67
|
+
|
|
68
|
+
|
|
69
|
+
def _tmp(tag):
|
|
70
|
+
t = tempfile.mkdtemp(prefix="p72c_%s_" % tag)
|
|
71
|
+
SANDBOXES.append(t)
|
|
72
|
+
return t
|
|
73
|
+
|
|
74
|
+
|
|
75
|
+
def _bind(cg, q):
|
|
76
|
+
"""把**同一个**队列实例挂到 cg(attach() 会新建实例,内存队列不共享)。"""
|
|
77
|
+
cg._coldverify = q
|
|
78
|
+
return q
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
def _cg(root, can_admin=True):
|
|
82
|
+
from md_cg.mdcos import MdCGSecure
|
|
83
|
+
from md_cg.security import Principal
|
|
84
|
+
return MdCGSecure(root, principal=Principal(
|
|
85
|
+
role="designer", clearance="private", can_write=True,
|
|
86
|
+
can_admin=can_admin), autoflush=1)
|
|
87
|
+
|
|
88
|
+
|
|
89
|
+
class _BoomCG:
|
|
90
|
+
"""消费必失败的最小 cg:get 抛异常 ⇒ drain 走 errors 分支(ok=False)。"""
|
|
91
|
+
|
|
92
|
+
def __init__(self, root):
|
|
93
|
+
self.root = root
|
|
94
|
+
self.audit = []
|
|
95
|
+
|
|
96
|
+
class _P:
|
|
97
|
+
can_admin = True
|
|
98
|
+
self.principal = _P()
|
|
99
|
+
|
|
100
|
+
def _audit(self, op, node_id, **meta):
|
|
101
|
+
self.audit.append({"op": op, "id": node_id, **meta})
|
|
102
|
+
|
|
103
|
+
|
|
104
|
+
def g1_forbidden_hides_queue():
|
|
105
|
+
print("== G1 未授权:不消费、不返回队列内容 ==")
|
|
106
|
+
from md_cg import coldverify
|
|
107
|
+
root = _tmp("forbid")
|
|
108
|
+
q = coldverify.ColdVerifyQueue(root=root)
|
|
109
|
+
cg = _cg(root, can_admin=False)
|
|
110
|
+
coldverify.attach(cg)
|
|
111
|
+
_bind(cg, q)
|
|
112
|
+
q.enqueue("secret-node", "reverify")
|
|
113
|
+
raw0 = io.open(q._queue_path, "rb").read()
|
|
114
|
+
proc0 = q.status()["stats"]["processed"]
|
|
115
|
+
r = coldverify.controlled_drain(cg, limit=5)
|
|
116
|
+
raw1 = io.open(q._queue_path, "rb").read()
|
|
117
|
+
check("G1a 非 admin ⇒ ok=False / forbidden",
|
|
118
|
+
r.get("ok") is False and r.get("error") == "forbidden", r)
|
|
119
|
+
check("G1b 拒绝体不含队列内容(无 would_process/results/queue_size/node_id)",
|
|
120
|
+
not any(k in r for k in ("would_process", "results", "queue_size"))
|
|
121
|
+
and "secret-node" not in json.dumps(r, ensure_ascii=False), sorted(r))
|
|
122
|
+
check("G1c 拒绝时不消费(队列文件逐字节不变、processed 不增)",
|
|
123
|
+
raw0 == raw1 and q.status()["stats"]["processed"] == proc0)
|
|
124
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
125
|
+
|
|
126
|
+
|
|
127
|
+
def g2_dry_run_no_side_effect():
|
|
128
|
+
print("== G2 预演:不改队列、不计数、无正文 ==")
|
|
129
|
+
from md_cg import coldverify
|
|
130
|
+
root = _tmp("dry")
|
|
131
|
+
q = coldverify.ColdVerifyQueue(root=root)
|
|
132
|
+
cg = _cg(root)
|
|
133
|
+
coldverify.attach(cg)
|
|
134
|
+
_bind(cg, q)
|
|
135
|
+
for i in range(3):
|
|
136
|
+
q.enqueue("n%d" % i, "reverify", secret="正文-不得外泄")
|
|
137
|
+
raw0 = io.open(q._queue_path, "rb").read()
|
|
138
|
+
proc0 = q.status()["stats"]["processed"]
|
|
139
|
+
r = coldverify.controlled_drain(cg, limit=2, dry_run=True)
|
|
140
|
+
raw1 = io.open(q._queue_path, "rb").read()
|
|
141
|
+
check("G2a dry_run 成功且 would_process 恰为 2 条",
|
|
142
|
+
r.get("ok") is True and len(r.get("would_process") or []) == 2,
|
|
143
|
+
r.get("would_process"))
|
|
144
|
+
check("G2b dry_run 不改队列文件、不增 processed",
|
|
145
|
+
raw0 == raw1 and q.status()["stats"]["processed"] == proc0)
|
|
146
|
+
check("G2c 预演体不含任务正文(只 node_id/action/age_s)",
|
|
147
|
+
"正文-不得外泄" not in json.dumps(r, ensure_ascii=False))
|
|
148
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
149
|
+
|
|
150
|
+
|
|
151
|
+
def g3_limit_exact_and_idempotent():
|
|
152
|
+
print("== G3 限量精确 + 重复运行不重复迁移 ==")
|
|
153
|
+
from md_cg import coldverify
|
|
154
|
+
root = _tmp("limit")
|
|
155
|
+
q = coldverify.ColdVerifyQueue(root=root)
|
|
156
|
+
cg = _cg(root)
|
|
157
|
+
coldverify.attach(cg)
|
|
158
|
+
_bind(cg, q)
|
|
159
|
+
for i in range(5):
|
|
160
|
+
q.enqueue("n%d" % i, "reverify")
|
|
161
|
+
r1 = coldverify.controlled_drain(cg, limit=2)
|
|
162
|
+
r2 = coldverify.controlled_drain(cg, limit=2)
|
|
163
|
+
ids1 = [x.get("node_id") for x in (r1.get("results") or [])]
|
|
164
|
+
ids2 = [x.get("node_id") for x in (r2.get("results") or [])]
|
|
165
|
+
check("G3a limit=2 ⇒ 每批恰处理 2 条",
|
|
166
|
+
len(ids1) == 2 and len(ids2) == 2, (ids1, ids2))
|
|
167
|
+
check("G3b 两批处理的不是同一批任务(不重复状态迁移)",
|
|
168
|
+
not (set(ids1) & set(ids2)), (ids1, ids2))
|
|
169
|
+
check("G3c 两批后队列剩 1 条",
|
|
170
|
+
q.status()["queue_size"] == 1, q.status()["queue_size"])
|
|
171
|
+
r3 = coldverify.controlled_drain(cg, limit=0)
|
|
172
|
+
check("G3d limit=0 合法且零处理(不静默改语义)",
|
|
173
|
+
r3.get("ok") is True and r3.get("processed") == 0
|
|
174
|
+
and q.status()["queue_size"] == 1, r3.get("processed"))
|
|
175
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
176
|
+
|
|
177
|
+
|
|
178
|
+
def g4_bad_limit_fail_closed():
|
|
179
|
+
print("== G4 limit 越界 fail-closed(不静默截断) ==")
|
|
180
|
+
from md_cg import coldverify
|
|
181
|
+
root = _tmp("badlim")
|
|
182
|
+
q = coldverify.ColdVerifyQueue(root=root)
|
|
183
|
+
cg = _cg(root)
|
|
184
|
+
coldverify.attach(cg)
|
|
185
|
+
_bind(cg, q)
|
|
186
|
+
q.enqueue("n0", "reverify")
|
|
187
|
+
for bad in (coldverify.CONTROL_LIMIT_MAX + 1, -1, "x"):
|
|
188
|
+
r = coldverify.controlled_drain(cg, limit=bad)
|
|
189
|
+
check("G4 limit=%r ⇒ bad_limit 且不消费" % (bad,),
|
|
190
|
+
r.get("ok") is False and r.get("error") == "bad_limit"
|
|
191
|
+
and q.status()["queue_size"] == 1, r)
|
|
192
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
193
|
+
|
|
194
|
+
|
|
195
|
+
def g5_failed_requeued_then_dead_letter():
|
|
196
|
+
print("== G5 失败任务可重试,超限进 dead_letter(不静默蒸发) ==")
|
|
197
|
+
from md_cg import coldverify
|
|
198
|
+
root = _tmp("fail")
|
|
199
|
+
q = coldverify.ColdVerifyQueue(root=root)
|
|
200
|
+
cg = _BoomCG(root)
|
|
201
|
+
q._root = root
|
|
202
|
+
q._queue_path = os.path.join(root, coldverify.QUEUE_FILE)
|
|
203
|
+
_bind(cg, q)
|
|
204
|
+
q.enqueue("boom", "reverify")
|
|
205
|
+
r1 = coldverify.controlled_drain(cg, limit=1)
|
|
206
|
+
check("G5a 失败被点名(errors 非空)",
|
|
207
|
+
len(r1.get("errors") or []) == 1, r1.get("errors"))
|
|
208
|
+
check("G5b 失败任务重新入队(requeued=1,队列仍有 1 条)",
|
|
209
|
+
r1.get("requeued") == 1 and q.status()["queue_size"] == 1,
|
|
210
|
+
{"requeued": r1.get("requeued"), "size": q.status()["queue_size"]})
|
|
211
|
+
r2 = coldverify.controlled_drain(cg, limit=1)
|
|
212
|
+
r3 = coldverify.controlled_drain(cg, limit=1)
|
|
213
|
+
r4 = coldverify.controlled_drain(cg, limit=1)
|
|
214
|
+
check("G5c 重试上限后进 dead_letter(第 4 次 dead_letter=1、队列清空)",
|
|
215
|
+
r4.get("dead_letter") == 1 and q.status()["queue_size"] == 0,
|
|
216
|
+
{"r2": r2.get("requeued"), "r3": r3.get("requeued"),
|
|
217
|
+
"dead": r4.get("dead_letter"), "size": q.status()["queue_size"]})
|
|
218
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
219
|
+
|
|
220
|
+
|
|
221
|
+
def g6_audit_payload_free():
|
|
222
|
+
print("== G6 消费留审计:聚合读数、不含正文 ==")
|
|
223
|
+
from md_cg import coldverify
|
|
224
|
+
root = _tmp("audit")
|
|
225
|
+
q = coldverify.ColdVerifyQueue(root=root)
|
|
226
|
+
cg = _cg(root)
|
|
227
|
+
coldverify.attach(cg)
|
|
228
|
+
_bind(cg, q)
|
|
229
|
+
q.enqueue("n0", "reverify", secret="正文-审计不得外泄")
|
|
230
|
+
r = coldverify.controlled_drain(cg, limit=1)
|
|
231
|
+
ap = os.path.join(root, "_audit.jsonl")
|
|
232
|
+
recs = []
|
|
233
|
+
if os.path.exists(ap):
|
|
234
|
+
for ln in io.open(ap, encoding="utf-8"):
|
|
235
|
+
if ln.strip():
|
|
236
|
+
try:
|
|
237
|
+
recs.append(json.loads(ln))
|
|
238
|
+
except Exception: # noqa: BLE001
|
|
239
|
+
pass
|
|
240
|
+
hit = [x for x in recs if x.get("op") == "coldverify_drain"]
|
|
241
|
+
check("G6a 审计落一行 coldverify_drain", len(hit) == 1, hit)
|
|
242
|
+
if hit:
|
|
243
|
+
h = hit[0]
|
|
244
|
+
check("G6b 审计含聚合读数(limit/processed/errors/queue_size)",
|
|
245
|
+
h.get("limit") == 1 and "processed" in h and "errors" in h
|
|
246
|
+
and "queue_size" in h, sorted(h))
|
|
247
|
+
check("G6c 审计 payload-free(不含任务正文)",
|
|
248
|
+
"正文-审计不得外泄" not in json.dumps(h, ensure_ascii=False))
|
|
249
|
+
check("G6d 返回体披露审计状态", r.get("audit") is True, r.get("audit"))
|
|
250
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
251
|
+
|
|
252
|
+
|
|
253
|
+
def g7_opt_in_intact():
|
|
254
|
+
print("== G7 回归:受控消费不启后台线程(opt-in 不变) ==")
|
|
255
|
+
from md_cg import coldverify
|
|
256
|
+
root = _tmp("optin")
|
|
257
|
+
q = coldverify.ColdVerifyQueue(root=root)
|
|
258
|
+
cg = _cg(root)
|
|
259
|
+
coldverify.attach(cg)
|
|
260
|
+
_bind(cg, q)
|
|
261
|
+
q.enqueue("n0", "reverify")
|
|
262
|
+
r = coldverify.controlled_drain(cg, limit=1)
|
|
263
|
+
check("G7 消费后 worker_alive 仍为 False",
|
|
264
|
+
r.get("worker_alive") is False and q.status()["worker_alive"] is False,
|
|
265
|
+
r.get("worker_alive"))
|
|
266
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
267
|
+
|
|
268
|
+
|
|
269
|
+
# ============================ 源断言 ============================
|
|
270
|
+
|
|
271
|
+
def b_source_face():
|
|
272
|
+
print("== B 源断言(关键判据在场 + 反陈化) ==")
|
|
273
|
+
src = io.open(_SRC, encoding="utf-8", errors="replace").read()
|
|
274
|
+
check("B1 权限闸在场", 'getattr(p, "can_admin", False)' in src)
|
|
275
|
+
check("B2 限量闸在场(范围判据 + 硬上限 + fail-closed)",
|
|
276
|
+
"CONTROL_LIMIT_MAX = BATCH_LIMIT" in src
|
|
277
|
+
and "if lim < 0 or lim > CONTROL_LIMIT_MAX:" in src
|
|
278
|
+
and '"bad_limit"' in src)
|
|
279
|
+
check("B3 失败重入队 + dead_letter 在场(调用点,不只是定义)",
|
|
280
|
+
"q._requeue_failed(src, attempts)" in src
|
|
281
|
+
and "attempts > CONTROL_MAX_ATTEMPTS" in src
|
|
282
|
+
and '"dead_letter"' in src)
|
|
283
|
+
check("B4 审计出口在场(payload-free)",
|
|
284
|
+
'"coldverify_drain"' in src and "payload" not in
|
|
285
|
+
src.split('"coldverify_drain"')[1][:600].lower())
|
|
286
|
+
check("B5 反陈化:点名 issue #72", "#72" in src)
|
|
287
|
+
seg = src[src.find("def controlled_drain"):]
|
|
288
|
+
nxt = seg.find("\ndef ")
|
|
289
|
+
if nxt > 0:
|
|
290
|
+
seg = seg[:nxt]
|
|
291
|
+
check("B6 不启后台线程(函数体内无 start_worker 调用)",
|
|
292
|
+
"start_worker(" not in seg)
|
|
293
|
+
|
|
294
|
+
|
|
295
|
+
# ============================ 主流程 ============================
|
|
296
|
+
|
|
297
|
+
GROUPS = (g1_forbidden_hides_queue, g2_dry_run_no_side_effect,
|
|
298
|
+
g3_limit_exact_and_idempotent, g4_bad_limit_fail_closed,
|
|
299
|
+
g5_failed_requeued_then_dead_letter, g6_audit_payload_free,
|
|
300
|
+
g7_opt_in_intact)
|
|
301
|
+
|
|
302
|
+
|
|
303
|
+
def run_groups():
|
|
304
|
+
global PASS, FAIL
|
|
305
|
+
PASS = 0
|
|
306
|
+
FAIL = 0
|
|
307
|
+
del FAILS[:]
|
|
308
|
+
del VIOL[:]
|
|
309
|
+
for g in GROUPS:
|
|
310
|
+
try:
|
|
311
|
+
g()
|
|
312
|
+
except Exception as exc: # noqa: BLE001
|
|
313
|
+
check("断言组 %s 抛异常:%s" % (g.__name__, exc), False)
|
|
314
|
+
import traceback
|
|
315
|
+
print(traceback.format_exc()[-600:])
|
|
316
|
+
b_source_face()
|
|
317
|
+
return len(FAILS)
|
|
318
|
+
|
|
319
|
+
|
|
320
|
+
# ============================ 变异自证 ============================
|
|
321
|
+
|
|
322
|
+
MUTATIONS = (
|
|
323
|
+
("M1 删权限闸",
|
|
324
|
+
' if not getattr(p, "can_admin", False):\n'
|
|
325
|
+
' return {"ok": False, "error": "forbidden",\n'
|
|
326
|
+
' "reason": "受控消费需 can_admin(未授权调用不返回队列内容)"}\n',
|
|
327
|
+
"", "G1a", "G1b", "B1"),
|
|
328
|
+
("M2 删限量闸",
|
|
329
|
+
" if lim < 0 or lim > CONTROL_LIMIT_MAX:\n"
|
|
330
|
+
' return {"ok": False, "error": "bad_limit",\n'
|
|
331
|
+
' "reason": "limit 须在 [0, %d](单批硬上限)" % CONTROL_LIMIT_MAX,\n'
|
|
332
|
+
' "limit_max": CONTROL_LIMIT_MAX}\n',
|
|
333
|
+
"", "G4", "B2"),
|
|
334
|
+
("M3 失败不重入队(静默蒸发)",
|
|
335
|
+
" q._requeue_failed(src, attempts)\n requeued += 1\n",
|
|
336
|
+
"", "G5b", "G5c", "B3"),
|
|
337
|
+
("M4 删审计调用",
|
|
338
|
+
' if a is not None:\n'
|
|
339
|
+
' try:\n'
|
|
340
|
+
' a("coldverify_drain", "", dry_run=False, limit=lim,\n'
|
|
341
|
+
' processed=st["stats"].get("processed"), errors=len(errs),\n'
|
|
342
|
+
' requeued=requeued, dead_letter=dead,\n'
|
|
343
|
+
' queue_size=st["queue_size"], oldest_age_s=st.get("oldest_age_s"))\n'
|
|
344
|
+
" audit_ok = True\n"
|
|
345
|
+
' except Exception: # noqa: BLE001\n'
|
|
346
|
+
' audit_ok = False # 审计失败不阻断消费(best-effort,同 G8)\n',
|
|
347
|
+
"", "G6a", "G6d", "B4"),
|
|
348
|
+
)
|
|
349
|
+
|
|
350
|
+
|
|
351
|
+
def mutate():
|
|
352
|
+
pristine = io.open(_SRC, encoding="utf-8", newline="").read()
|
|
353
|
+
global SILENT
|
|
354
|
+
bad = []
|
|
355
|
+
for name, anchor, repl, *want in MUTATIONS:
|
|
356
|
+
orig = pristine
|
|
357
|
+
NL = "\r\n" if "\r\n" in orig else "\n"
|
|
358
|
+
a_ = anchor.replace("\n", NL)
|
|
359
|
+
r_ = repl.replace("\n", NL)
|
|
360
|
+
if a_ not in orig:
|
|
361
|
+
print(" ANCHOR-MISS %s" % name)
|
|
362
|
+
bad.append(name)
|
|
363
|
+
continue
|
|
364
|
+
try:
|
|
365
|
+
io.open(_SRC, "w", encoding="utf-8", newline="").write(
|
|
366
|
+
orig.replace(a_, r_, 1))
|
|
367
|
+
# 变异体必须在**新模块状态**下判:否则第二轮起跑的是首轮缓存
|
|
368
|
+
# (首轮 M1 删权限闸 ⇒ 后续所有变异都看到无权限闸的旧代码)。
|
|
369
|
+
import importlib
|
|
370
|
+
from md_cg import coldverify as _cv
|
|
371
|
+
importlib.reload(_cv)
|
|
372
|
+
SILENT = True
|
|
373
|
+
run_groups()
|
|
374
|
+
reds = list(VIOL)
|
|
375
|
+
hit = [w for w in want if any(x.startswith(w) for x in reds)]
|
|
376
|
+
print(" %-4s %-34s 红项=%-3d 命中=%s"
|
|
377
|
+
% ("OK" if len(hit) == len(want) else "BAD", name,
|
|
378
|
+
len(reds), ",".join(hit) if hit else "无"))
|
|
379
|
+
if len(hit) != len(want):
|
|
380
|
+
print(" 期望红:%s;实红:%s" % (list(want), reds[:8]))
|
|
381
|
+
bad.append(name)
|
|
382
|
+
finally:
|
|
383
|
+
SILENT = False
|
|
384
|
+
io.open(_SRC, "w", encoding="utf-8", newline="").write(pristine)
|
|
385
|
+
import importlib
|
|
386
|
+
from md_cg import coldverify as _cv
|
|
387
|
+
importlib.reload(_cv) # 复原后立即回到真实现,避免污染下一轮
|
|
388
|
+
if io.open(_SRC, encoding="utf-8", newline="").read() != pristine:
|
|
389
|
+
print(" RESTORE-FAILED %s" % name)
|
|
390
|
+
bad.append(name + "(恢复失败)")
|
|
391
|
+
if bad:
|
|
392
|
+
print("\n定点变异自证:FAIL -- %s" % "、".join(bad))
|
|
393
|
+
return 1
|
|
394
|
+
print("\n定点变异自证:PASS(每处判据都被打红)")
|
|
395
|
+
return 0
|
|
396
|
+
|
|
397
|
+
|
|
398
|
+
def cleanup():
|
|
399
|
+
for t in SANDBOXES:
|
|
400
|
+
shutil.rmtree(t, ignore_errors=True)
|
|
401
|
+
|
|
402
|
+
|
|
403
|
+
if __name__ == "__main__":
|
|
404
|
+
if "--mutate" in sys.argv:
|
|
405
|
+
rc = mutate()
|
|
406
|
+
cleanup()
|
|
407
|
+
sys.exit(rc)
|
|
408
|
+
# 锚点自检(fail-closed):修法的关键判据不在源码里 ⇒ exit 2,不给假绿。
|
|
409
|
+
_s = io.open(_SRC, encoding="utf-8", errors="replace").read()
|
|
410
|
+
_miss = [a for a in ("def controlled_drain",
|
|
411
|
+
'getattr(p, "can_admin", False)',
|
|
412
|
+
'"coldverify_drain"') if a not in _s]
|
|
413
|
+
if _miss:
|
|
414
|
+
print("锚点自检失败:关键判据字面量缺失 %s" % _miss)
|
|
415
|
+
cleanup()
|
|
416
|
+
sys.exit(2)
|
|
417
|
+
n = run_groups()
|
|
418
|
+
print("\nissue72 coldverify 受控消费守卫:%d 通过,%d 失败" % (PASS, n))
|
|
419
|
+
cleanup()
|
|
420
|
+
sys.exit(1 if n else 0)
|