@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.
Files changed (233) hide show
  1. package/README.md +150 -662
  2. package/codebuddy/CODEBUDDY.md +333 -204
  3. package/data/policy.json +38 -38
  4. package/docs/README.md +18 -0
  5. package/docs/discipline/harnesses.yaml +11 -3
  6. package/docs/discipline/templates/compact.txt.tmpl +20 -18
  7. package/docs/discipline/templates/full.md.tmpl +63 -61
  8. package/docs/discipline/templates/rules.mdc.tmpl +5 -3
  9. package/docs/discipline/templates/skill.md.tmpl +25 -23
  10. package/docs/discipline/templates/spec.txt.tmpl +2 -2
  11. package/docs/discipline/templates/zcode-user.md.tmpl +1 -1
  12. package/dsh/cordis.yml.example +139 -139
  13. package/lib/hooks.d.ts +19 -0
  14. package/lib/hooks.js +30 -7
  15. package/lib/index.js +18 -3
  16. package/lib/init.js +19 -4
  17. package/lib/lib/hook_audit.js +64 -2
  18. package/lib/lib/prompt_safety.js +14 -3
  19. package/lib/tools.d.ts +7 -0
  20. package/lib/tools.js +22 -1
  21. package/md_cg/_guard_kit.py +121 -121
  22. package/md_cg/anchor.py +114 -114
  23. package/md_cg/audit.py +15 -2
  24. package/md_cg/chain.py +3 -2
  25. package/md_cg/config_registry_guard.py +487 -487
  26. package/md_cg/conformance.py +747 -747
  27. package/md_cg/consolidate.py +1793 -1793
  28. package/md_cg/crypto.py +794 -794
  29. package/md_cg/hyperedge.py +262 -262
  30. package/md_cg/interface_schema.py +146 -146
  31. package/md_cg/lifecycle.py +426 -426
  32. package/md_cg/mdcos.py +12 -8
  33. package/md_cg/predict.py +1103 -1103
  34. package/md_cg/protect.py +654 -654
  35. package/md_cg/provenance.py +606 -606
  36. package/md_cg/queue_health.py +130 -130
  37. package/md_cg/refine.py +613 -613
  38. package/md_cg/retrieve.py +128 -128
  39. package/md_cg/revise.py +140 -140
  40. package/md_cg/rollback.py +657 -657
  41. package/md_cg/rollback_cli.py +124 -124
  42. package/md_cg/rotate.py +346 -346
  43. package/md_cg/routing.py +490 -490
  44. package/md_cg/self_surface.py +50 -50
  45. package/md_cg/semantic/canonical.py +144 -144
  46. package/md_cg/semantic/zh_en_atoms.py +141 -141
  47. package/md_cg/sources.py +1091 -1091
  48. package/md_cg/stg.py +3 -2
  49. package/md_cg/sustain.py +10 -1
  50. package/md_cg/test_audit_rotate_parity.py +279 -279
  51. package/md_cg/test_autonomy_modes.py +2013 -2013
  52. package/md_cg/test_cn_recall_grams.py +206 -206
  53. package/md_cg/test_code_kind_forbidden.py +101 -0
  54. package/md_cg/test_condaccept.py +156 -156
  55. package/md_cg/test_condgate.py +141 -141
  56. package/md_cg/test_heartbeat_ledger.py +9 -3
  57. package/md_cg/test_i50e_readside_protection.py +658 -658
  58. package/md_cg/test_issue111_gate_order.py +76 -76
  59. package/md_cg/test_issue111_scoring_contract.py +86 -86
  60. package/md_cg/test_issue121_calibration_bounds.py +293 -293
  61. package/md_cg/test_issue145_sleep_no_silent_rollback.py +167 -167
  62. package/md_cg/test_issue147_pack_id_escape.py +378 -378
  63. package/md_cg/test_issue148_merge_downgrade_leak.py +192 -192
  64. package/md_cg/test_issue149_accel_default_face.py +248 -248
  65. package/md_cg/test_issue150_empty_query_terms.py +328 -328
  66. package/md_cg/test_issue151_153_157_write_cache_index.py +151 -151
  67. package/md_cg/test_issue152_sealed_postings.py +309 -309
  68. package/md_cg/test_issue153b_index_generation_invalidation.py +142 -142
  69. package/md_cg/test_issue157b_index_remainder.py +344 -344
  70. package/md_cg/test_issue189_conclusion_bidirectional.py +223 -223
  71. package/md_cg/test_issue191_import_trust.py +382 -382
  72. package/md_cg/test_issue193_write_scope.py +378 -378
  73. package/md_cg/test_issue212_writeface_gaps.py +349 -349
  74. package/md_cg/test_issue214_reject_sensitivity.py +266 -266
  75. package/md_cg/test_issue215_condition_source_gap.py +272 -272
  76. package/md_cg/test_issue216_clash_routes.py +214 -214
  77. package/md_cg/test_issue217_slot_routes.py +248 -248
  78. package/md_cg/test_issue218_postcondition_value_blind.py +222 -222
  79. package/md_cg/test_issue258_pack_sensitivity.py +468 -468
  80. package/md_cg/test_issue265_coldverify_multiproc.py +438 -438
  81. package/md_cg/test_issue274_read_node_id_none.py +341 -341
  82. package/md_cg/test_issue275_layer_param.py +250 -250
  83. package/md_cg/test_issue277_node_id_traversal.py +384 -384
  84. package/md_cg/test_issue278_neg_separated_tension.py +271 -271
  85. package/md_cg/test_issue278_neg_window.py +294 -294
  86. package/md_cg/test_issue278_negative_layering.py +83 -83
  87. package/md_cg/test_issue284_skip_not_pass.py +291 -291
  88. package/md_cg/test_issue294_flywheel_sensitivity.py +573 -573
  89. package/md_cg/test_issue301_baseline_corpus_gate.py +245 -245
  90. package/md_cg/test_issue303_design_boundaries.py +262 -262
  91. package/md_cg/test_issue315_merge_branch_sensitivity.py +383 -383
  92. package/md_cg/test_issue319_tenant_unregistered_bypass.py +256 -256
  93. package/md_cg/test_issue321_mcp_deep_json.py +304 -304
  94. package/md_cg/test_issue322_node_write_lock.py +727 -727
  95. package/md_cg/test_issue324_write_size_fields.py +214 -214
  96. package/md_cg/test_issue325_audit_poison.py +229 -229
  97. package/md_cg/test_issue326_ingest_auto_whitelist.py +331 -331
  98. package/md_cg/test_issue326_key_perms.py +355 -355
  99. package/md_cg/test_issue326_twin_parser_parity.py +323 -323
  100. package/md_cg/test_issue326_vm_call_frame.py +569 -569
  101. package/md_cg/test_issue345_writelimit_effective_sens.py +233 -233
  102. package/md_cg/test_issue346_overwrite_sensitivity_gate.py +424 -424
  103. package/md_cg/test_issue348_insight_verify_op.py +199 -199
  104. package/md_cg/test_issue348_merge_rmw_lock.py +345 -345
  105. package/md_cg/test_issue350_casefold_collision.py +235 -235
  106. package/md_cg/test_issue351_ingest_root_fallback.py +201 -201
  107. package/md_cg/test_issue352_imgaudit.py +418 -418
  108. package/md_cg/test_issue352_pathsjson.py +537 -537
  109. package/md_cg/test_issue352_refindex.py +412 -412
  110. package/md_cg/test_issue352_rollback.py +604 -604
  111. package/md_cg/test_issue354_p2_writelimit_toctou.py +327 -327
  112. package/md_cg/test_issue354_rust_index_containment.py +571 -571
  113. package/md_cg/test_issue354_rust_wal_containment.py +606 -606
  114. package/md_cg/test_issue358_truncation_observable.py +247 -247
  115. package/md_cg/test_issue360_tidy_private_excerpt.py +195 -195
  116. package/md_cg/test_issue361_blindspot_not_silent_drop.py +494 -494
  117. package/md_cg/test_issue362_neg_condition.py +468 -468
  118. package/md_cg/test_issue363_lexical_idf.py +275 -275
  119. package/md_cg/test_issue370_readcache_assembly.py +488 -488
  120. package/md_cg/test_issue376_heartbeat_failed.py +293 -293
  121. package/md_cg/test_issue377_layer_protect_stamp.py +324 -324
  122. package/md_cg/test_issue378_protected_floor.py +310 -310
  123. package/md_cg/test_issue383_state_event_write_gate.py +462 -462
  124. package/md_cg/test_issue397_sens_eff_wiring.py +435 -435
  125. package/md_cg/test_issue398_toolface_op_parity.py +511 -511
  126. package/md_cg/test_issue399_hive_json_shape.py +317 -317
  127. package/md_cg/test_issue401_wisdom_codegen.py +295 -295
  128. package/md_cg/test_issue404_heal_receipt.py +389 -389
  129. package/md_cg/test_issue409_compact_index_completeness.py +509 -509
  130. package/md_cg/test_issue410_verify_demote_write.py +366 -366
  131. package/md_cg/test_issue411_scrub_idempotence.py +575 -575
  132. package/md_cg/test_issue412_discipline_producer_parity.py +311 -311
  133. package/md_cg/test_issue413_preimage_failclosed.py +239 -239
  134. package/md_cg/test_issue413_preimage_twin.py +339 -339
  135. package/md_cg/test_issue415_deps_gate_probe.py +357 -357
  136. package/md_cg/test_issue416_entry_key_subset.py +525 -525
  137. package/md_cg/test_issue417_twophase_merge_landed.py +423 -423
  138. package/md_cg/test_issue425_ingest_library_path.py +331 -331
  139. package/md_cg/test_issue426c_enqueue_not_silent.py +346 -346
  140. package/md_cg/test_issue426e_restore_overwrite_live.py +310 -310
  141. package/md_cg/test_issue426f_paths_gbk_failclosed.py +301 -301
  142. package/md_cg/test_issue427_serve_status_shape.py +191 -191
  143. package/md_cg/test_issue431_432_468_protect_single_point.py +322 -322
  144. package/md_cg/test_issue433_outlook_threshold_single_point.py +278 -278
  145. package/md_cg/test_issue434_435_float_gate.py +90 -90
  146. package/md_cg/test_issue439_sibling_sensitivity_inherit.py +448 -448
  147. package/md_cg/test_issue43_default_policy.py +874 -874
  148. package/md_cg/test_issue444_scrub_evidence_plaintext.py +281 -281
  149. package/md_cg/test_issue445_metacognition_ledger_gate.py +454 -454
  150. package/md_cg/test_issue446_453_403_verified_evidence.py +382 -382
  151. package/md_cg/test_issue450_sensitivity_fallback_reason.py +51 -51
  152. package/md_cg/test_issue450_writegate_unknown_sens.py +203 -203
  153. package/md_cg/test_issue451_audit_actor.py +313 -313
  154. package/md_cg/test_issue452_ingest_root_sensitivity.py +299 -299
  155. package/md_cg/test_issue463_ghost_prune_guard.py +259 -259
  156. package/md_cg/test_issue466_basis_registry.py +469 -469
  157. package/md_cg/test_issue467_identity_sensitivity_parity.py +360 -360
  158. package/md_cg/test_issue469_scrub_override_passthrough.py +126 -126
  159. package/md_cg/test_issue470_wal_event_durable.py +427 -427
  160. package/md_cg/test_issue471_identity_readable.py +136 -136
  161. package/md_cg/test_issue472_audit_chain.py +90 -90
  162. package/md_cg/test_issue472_prune_ledger.py +105 -105
  163. package/md_cg/test_issue472_rollback_degraded.py +81 -81
  164. package/md_cg/test_issue491_compose_sandbox.py +460 -460
  165. package/md_cg/test_issue498_merge_trace_stale_index.py +280 -280
  166. package/md_cg/test_issue511_scoreboard_bad_files.py +256 -256
  167. package/md_cg/test_issue521_rotate_lock_suffix.py +110 -110
  168. package/md_cg/test_issue524_orphan_noise_no_demote.py +88 -88
  169. package/md_cg/test_issue525_read_null_semantics.py +52 -52
  170. package/md_cg/test_issue547_append_jsonl_whitelist.py +114 -114
  171. package/md_cg/test_issue547_audit_durable.py +96 -96
  172. package/md_cg/test_issue557_r2_write_entries_size_gate.py +83 -83
  173. package/md_cg/test_issue559_refine_prefix.py +69 -69
  174. package/md_cg/test_issue562_retired_faces.py +150 -0
  175. package/md_cg/test_issue71_queue_backlog.py +376 -376
  176. package/md_cg/test_issue72_coldverify_controlled_drain.py +420 -420
  177. package/md_cg/test_issue82_credential_rules.py +271 -271
  178. package/md_cg/test_issue91_verifier_sandbox.py +314 -314
  179. package/md_cg/test_issue93_remember_redaction.py +282 -282
  180. package/md_cg/test_logref.py +1141 -1141
  181. package/md_cg/test_md_access_parity.py +330 -330
  182. package/md_cg/test_md_cg_no_hive_dep.py +139 -139
  183. package/md_cg/test_mutation_residue.py +119 -119
  184. package/md_cg/test_mutation_rollback.py +835 -835
  185. package/md_cg/test_n123_derive_expiry_chain.py +210 -210
  186. package/md_cg/test_n184_keys_concurrent_provision.py +1 -1
  187. package/md_cg/test_n209_verify_write_face_gates.py +466 -466
  188. package/md_cg/test_n62_tenant_bind_failclosed.py +200 -200
  189. package/md_cg/test_neg_tail_honesty.py +733 -733
  190. package/md_cg/test_p21_tokens.py +294 -294
  191. package/md_cg/test_p27_docindex.py +792 -792
  192. package/md_cg/test_p28_refcheck.py +1053 -1053
  193. package/md_cg/test_p2_six_elements.py +476 -476
  194. package/md_cg/test_p33_ccg_wiring.py +300 -300
  195. package/md_cg/test_p3_legacy_closure.py +438 -438
  196. package/md_cg/test_p40_refine_worklist.py +244 -244
  197. package/md_cg/test_p4_freshness.py +781 -781
  198. package/md_cg/test_p9c_dedup_hints.py +288 -288
  199. package/md_cg/test_policy_required_ccg.py +444 -444
  200. package/md_cg/test_read_scope_b27.py +2 -2
  201. package/md_cg/test_retr_s5.py +312 -312
  202. package/md_cg/test_s1_ast_judge.py +109 -109
  203. package/md_cg/test_security_audit_v21.py +249 -249
  204. package/md_cg/test_state_event_op.py +521 -521
  205. package/md_cg/test_stgidx_index_parity.py +1024 -1024
  206. package/md_cg/test_sustain_bad_stamp.py +178 -0
  207. package/md_cg/test_sustain_bounded.py +652 -652
  208. package/md_cg/test_trust_edge_reachability.py +405 -405
  209. package/md_cg/test_w7_redlines.py +659 -659
  210. package/md_cg/test_write_return_shape.py +919 -919
  211. package/md_cg/test_writepipe.py +228 -228
  212. package/md_cg/trust.py +1114 -1114
  213. package/md_cg/twophase.py +303 -303
  214. package/md_cg/whitebox.py +536 -536
  215. package/md_cg/whitebox_kb/wisdom/compose_engine.py +1634 -1634
  216. package/md_cg/whitebox_kb/wisdom/core/condition_vm.py +318 -318
  217. package/md_cg/whitebox_kb/wisdom/core/parser.py +1082 -1082
  218. package/md_cg/whitebox_kb/wisdom/md_access.py +490 -490
  219. package/md_cg/whitebox_kb/wisdom/migrate_wisdom.py +497 -497
  220. package/md_cg/whitebox_kb/wisdom/mini_python.py +995 -995
  221. package/md_cg/whitebox_kb/wisdom/net_units.py +2900 -2900
  222. package/md_cg/whitebox_kb/wisdom/semantic_translate.py +4060 -4060
  223. package/md_cg/writepipe.py +1337 -1337
  224. package/package.json +3 -2
  225. package/scripts/workspace_index.py +328 -0
  226. package/src/hooks.ts +932 -908
  227. package/src/index.ts +21 -6
  228. package/src/init.ts +16 -4
  229. package/src/lib/hook_audit.ts +48 -2
  230. package/src/lib/mdcg_client.ts +469 -469
  231. package/src/lib/prompt_safety.ts +17 -3
  232. package/src/tools.ts +23 -1
  233. package/zcode/AGENTS.md +333 -204
@@ -1,200 +1,200 @@
1
- # -*- coding: utf-8 -*-
2
- """N62 守卫(第 5 轮,2026-09-27):令牌路径租户上限夹紧 + 租户绑定覆盖 fail-closed。
3
-
4
- 留档复测(v8 N62 首报 → v9/v15/v16 历轮成立 → 本轮第 5 次,medium 维持):
5
-
6
- 病灶①(cap 夹紧从未接线):verify_token 令牌路径返回 Principal 时
7
- clearance=rec["clearance"] 原样透出(tokens.py:450)——TenantRegistry.cap_of /
8
- principal_for 现成(security.py:323/332)但令牌路径零调用;tenantC 登记上限
9
- internal 时 designer(secret) 令牌仍以 secret 运行(可读含 private/secret)。
10
-
11
- 病灶②(绑定覆盖 warn-only):verify_token 形参 tenant(MCP 侧来自
12
- MDCG_TENANT)与令牌记录 rec["tenant"] 不同时仅 stderr 告警(tokens.py:441-446),
13
- 形参值照常顶替(:448 tenant=tenant or ...)——tenantA 令牌在 MDCG_TENANT=
14
- tenantB 下以原权限对 tenantB 运行。
15
-
16
- 红守卫(哑临时登记表 + 哑令牌库 + 临时根,确定性、零真实状态;登记表经
17
- MDCG_TENANT_REGISTRY 注入——与 _resolve_root 同源,无新形参,旧代码红为
18
- 功能红而非 TypeError):
19
- R1 ② 覆盖被拒:tenantA designer 令牌 + tenant="tenantB" → TokenError
20
- (fail-closed),消息含两侧租户与校正指引;
21
- R2 ① cap 夹紧:tenantC(登记 cap=internal)designer 令牌(角色默认 secret)
22
- 无覆盖 → clearance 夹紧为 internal,allows("private"/"secret") 均 False;
23
- R3 未登记租户零闸变:tenantD(不在登记表)令牌 clearance 原样;
24
- R4 无冲突零误伤:tenant=None/""/同值 → 原令牌租户、零异常;
25
- R5 MCP 进程面:_build_principal 同面复现(env 注入 MDCG_TOKEN + MDCG_TENANT
26
- + MDCG_TENANT_REGISTRY)——② 拒绝、① 夹紧、同值零误伤。
27
-
28
- 同面搭车(N174,low,见 deferred,本轮不修):mcp_server.py:3522-3528 legacy
29
- env 路径 clearance 夹紧另行 deferred。
30
-
31
- 运行:python -m md_cg.test_n62_tenant_bind_failclosed
32
- """
33
- from __future__ import annotations
34
-
35
- import contextlib
36
- import io
37
- import os
38
- import shutil
39
- import sys
40
- import tempfile
41
-
42
- from . import tokens
43
- from .security import TenantRegistry
44
-
45
- PASS = FAIL = 0
46
- FAILS = []
47
- MARK = "租户绑定被入参覆盖" # fail-closed 拒绝消息稳定锚点
48
-
49
-
50
- def check(name, cond, detail=""):
51
- global PASS, FAIL
52
- if cond:
53
- PASS += 1
54
- print(" OK " + name)
55
- else:
56
- FAIL += 1
57
- FAILS.append(name)
58
- print(" FAIL " + name + " " + str(detail)[:110])
59
-
60
-
61
- def _verify(token, tenant=None, path=None):
62
- """verify_token 捕获异常,返回 (principal|None, exc|None)。"""
63
- try:
64
- return tokens.verify_token(token, tenant=tenant, path=path), None
65
- except tokens.TokenError as e:
66
- return None, e
67
-
68
-
69
- def main():
70
- sys.stdout.reconfigure(encoding="utf-8", errors="replace")
71
- tmp = tempfile.mkdtemp(prefix="mdcg_n62_")
72
- tf = os.path.join(tmp, "_tokens.json")
73
- reg_path = os.path.join(tmp, "_tenants.json")
74
- old_reg = os.environ.get("MDCG_TENANT_REGISTRY")
75
- try:
76
- # 哑临时登记表:确定性上限(tenantA=secret 不夹、tenantB/tenantC=internal)
77
- reg = TenantRegistry(reg_path)
78
- reg.register("tenantA", os.path.join(tmp, "rootA"), clearance_cap="secret",
79
- description="N62 守卫哑登记 tenantA")
80
- reg.register("tenantB", os.path.join(tmp, "rootB"),
81
- clearance_cap="internal", description="N62 哑登记 tenantB")
82
- reg.register("tenantC", os.path.join(tmp, "rootC"),
83
- clearance_cap="internal", description="N62 哑登记 tenantC")
84
- os.environ["MDCG_TENANT_REGISTRY"] = reg_path
85
- d_a = tokens.issue("designer", actor="dummy-designer-a", tenant="tenantA",
86
- path=tf, _allow_bootstrap=True) # 测试搭架;闸的证明在 test_issue543
87
- d_c = tokens.issue("designer", actor="dummy-designer-c", tenant="tenantC",
88
- path=tf, _allow_bootstrap=True) # 测试搭架;闸的证明在 test_issue543
89
- d_d = tokens.issue("designer", actor="dummy-designer-d", tenant="tenantD",
90
- path=tf, _allow_bootstrap=True) # 测试搭架;闸的证明在 test_issue543
91
-
92
- # ---------- R1 ② 覆盖 fail-closed ----------
93
- print("== R1 租户绑定被入参覆盖 → 拒绝(fail-closed)==")
94
- p1, e1 = _verify(d_a["token"], tenant="tenantB", path=tf)
95
- check("R1a 覆盖被拒(TokenError 且含锚点)",
96
- p1 is None and e1 is not None and MARK in str(e1),
97
- f"p={p1} exc={type(e1).__name__}: {str(e1)[:80]}")
98
- check("R1b 拒绝消息含两侧租户与校正指引",
99
- e1 is not None and "tenantA" in str(e1) and "tenantB" in str(e1)
100
- and "MDCG_TENANT" in str(e1), str(e1)[:100])
101
-
102
- # ---------- R2 ① cap 夹紧(登记租户,纯收紧) ----------
103
- print("== R2 登记租户上限夹紧(cap=internal < 令牌 secret)==")
104
- p2, e2 = _verify(d_c["token"], path=tf)
105
- check("R2a clearance 夹紧为 internal",
106
- e2 is None and p2 is not None and p2.clearance == "internal",
107
- f"clearance={getattr(p2, 'clearance', None)} err={e2}")
108
- check("R2b 可读不含 private/secret",
109
- p2 is not None and not p2.allows("private")
110
- and not p2.allows("secret"),
111
- f"private={p2.allows('private') if p2 else None} "
112
- f"secret={p2.allows('secret') if p2 else None}")
113
- check("R2c internal 本级仍可读(收紧不误伤)",
114
- p2 is not None and p2.allows("internal"),
115
- f"internal={p2.allows('internal') if p2 else None}")
116
-
117
- # ---------- R3 未登记租户零闸变 ----------
118
- print("== R3 未登记租户零闸变(fresh install 行为不变)==")
119
- p3, e3 = _verify(d_d["token"], path=tf)
120
- check("R3 未登记 tenantD clearance 原样(不夹紧)",
121
- e3 is None and p3 is not None and p3.clearance == "secret"
122
- and p3.tenant == "tenantD" and p3.allows("secret"),
123
- f"clearance={getattr(p3, 'clearance', None)} "
124
- f"tenant={getattr(p3, 'tenant', None)} err={e3}")
125
-
126
- # ---------- R4 无冲突零误伤 ----------
127
- print("== R4 无冲突路径零误伤 ==")
128
- for label, arg in (("None", None), ("空串", ""), ("同值", "tenantA")):
129
- p4, e4 = _verify(d_a["token"], tenant=arg, path=tf)
130
- check(f"R4 tenant={label}:零异常且回落令牌租户 tenantA",
131
- e4 is None and p4 is not None and p4.tenant == "tenantA"
132
- and p4.clearance == "secret",
133
- f"tenant={getattr(p4, 'tenant', None)} "
134
- f"clearance={getattr(p4, 'clearance', None)} err={e4}")
135
-
136
- # ---------- R5 MCP 进程面(_build_principal 同面) ----------
137
- print("== R5 MCP 进程级:MDCG_TOKEN + MDCG_TENANT + MDCG_TENANT_REGISTRY ==")
138
- from .mcp_server import _build_principal
139
- saved = {k: os.environ.get(k) for k in
140
- ("MDCG_TOKEN", "MDCG_TENANT", "MDCG_TOKEN_FILE", "MDCG_ROOT",
141
- "MDCG_TENANT_REGISTRY", "MDCG_LEGACY_ENV_AUTH",
142
- "MDCG_LEGACY_ENV_ADMIN", "MDCG_CAN_ADMIN", "MDCG_CAN_WRITE",
143
- "MDCG_CLEARANCE", "MDCG_ACTOR")}
144
- try:
145
- os.environ["MDCG_TOKEN"] = d_a["token"]
146
- os.environ["MDCG_TOKEN_FILE"] = tf
147
- os.environ["MDCG_ROOT"] = os.path.join(tmp, "mcp")
148
- os.environ["MDCG_TENANT_REGISTRY"] = reg_path
149
- os.environ["MDCG_TENANT"] = "tenantB"
150
- for k in ("MDCG_LEGACY_ENV_AUTH", "MDCG_LEGACY_ENV_ADMIN",
151
- "MDCG_CAN_ADMIN", "MDCG_CAN_WRITE", "MDCG_CLEARANCE",
152
- "MDCG_ACTOR"):
153
- os.environ.pop(k, None)
154
- buf = io.StringIO()
155
- with contextlib.redirect_stderr(buf):
156
- mp, merr = _build_principal()
157
- check("R5a MCP 面覆盖被拒(err 含锚点,principal=None)",
158
- mp is None and merr is not None and MARK in merr,
159
- f"err={str(merr)[:90]}")
160
- # ① 经 MCP 面:tenantC(登记 cap=internal)夹紧
161
- os.environ["MDCG_TOKEN"] = d_c["token"]
162
- os.environ["MDCG_TENANT"] = "tenantC"
163
- mp2, merr2 = _build_principal()
164
- check("R5b MCP 面 cap 夹紧(tenantC designer → internal)",
165
- merr2 is None and mp2 is not None
166
- and getattr(mp2, "clearance", None) == "internal",
167
- f"clearance={getattr(mp2, 'clearance', None)} err={merr2}")
168
- # 同值零误伤
169
- os.environ["MDCG_TOKEN"] = d_a["token"]
170
- os.environ["MDCG_TENANT"] = "tenantA"
171
- mp3, merr3 = _build_principal()
172
- check("R5c MDCG_TENANT 同值:零误伤正常通过",
173
- merr3 is None and mp3 is not None
174
- and getattr(mp3, "tenant", None) == "tenantA"
175
- and getattr(mp3, "clearance", None) == "secret",
176
- f"err={merr3} tenant={getattr(mp3, 'tenant', None)} "
177
- f"clearance={getattr(mp3, 'clearance', None)}")
178
- finally:
179
- for k, v in saved.items():
180
- if v is None:
181
- os.environ.pop(k, None)
182
- else:
183
- os.environ[k] = v
184
- finally:
185
- if old_reg is None:
186
- os.environ.pop("MDCG_TENANT_REGISTRY", None)
187
- else:
188
- os.environ["MDCG_TENANT_REGISTRY"] = old_reg
189
- shutil.rmtree(tmp, ignore_errors=True)
190
-
191
- print()
192
- if FAILS:
193
- print("FAILED: %d 项 → %s" % (len(FAILS), ", ".join(FAILS)))
194
- return 1
195
- print("ALL OK: %d 项(N62 令牌路径 cap 夹紧 + 租户覆盖 fail-closed 守卫全绿)" % PASS)
196
- return 0
197
-
198
-
199
- if __name__ == "__main__":
200
- sys.exit(main())
1
+ # -*- coding: utf-8 -*-
2
+ """N62 守卫(第 5 轮,2026-09-27):令牌路径租户上限夹紧 + 租户绑定覆盖 fail-closed。
3
+
4
+ 留档复测(v8 N62 首报 → v9/v15/v16 历轮成立 → 本轮第 5 次,medium 维持):
5
+
6
+ 病灶①(cap 夹紧从未接线):verify_token 令牌路径返回 Principal 时
7
+ clearance=rec["clearance"] 原样透出(tokens.py:450)——TenantRegistry.cap_of /
8
+ principal_for 现成(security.py:323/332)但令牌路径零调用;tenantC 登记上限
9
+ internal 时 designer(secret) 令牌仍以 secret 运行(可读含 private/secret)。
10
+
11
+ 病灶②(绑定覆盖 warn-only):verify_token 形参 tenant(MCP 侧来自
12
+ MDCG_TENANT)与令牌记录 rec["tenant"] 不同时仅 stderr 告警(tokens.py:441-446),
13
+ 形参值照常顶替(:448 tenant=tenant or ...)——tenantA 令牌在 MDCG_TENANT=
14
+ tenantB 下以原权限对 tenantB 运行。
15
+
16
+ 红守卫(哑临时登记表 + 哑令牌库 + 临时根,确定性、零真实状态;登记表经
17
+ MDCG_TENANT_REGISTRY 注入——与 _resolve_root 同源,无新形参,旧代码红为
18
+ 功能红而非 TypeError):
19
+ R1 ② 覆盖被拒:tenantA designer 令牌 + tenant="tenantB" → TokenError
20
+ (fail-closed),消息含两侧租户与校正指引;
21
+ R2 ① cap 夹紧:tenantC(登记 cap=internal)designer 令牌(角色默认 secret)
22
+ 无覆盖 → clearance 夹紧为 internal,allows("private"/"secret") 均 False;
23
+ R3 未登记租户零闸变:tenantD(不在登记表)令牌 clearance 原样;
24
+ R4 无冲突零误伤:tenant=None/""/同值 → 原令牌租户、零异常;
25
+ R5 MCP 进程面:_build_principal 同面复现(env 注入 MDCG_TOKEN + MDCG_TENANT
26
+ + MDCG_TENANT_REGISTRY)——② 拒绝、① 夹紧、同值零误伤。
27
+
28
+ 同面搭车(N174,low,见 deferred,本轮不修):mcp_server.py:3522-3528 legacy
29
+ env 路径 clearance 夹紧另行 deferred。
30
+
31
+ 运行:python -m md_cg.test_n62_tenant_bind_failclosed
32
+ """
33
+ from __future__ import annotations
34
+
35
+ import contextlib
36
+ import io
37
+ import os
38
+ import shutil
39
+ import sys
40
+ import tempfile
41
+
42
+ from . import tokens
43
+ from .security import TenantRegistry
44
+
45
+ PASS = FAIL = 0
46
+ FAILS = []
47
+ MARK = "租户绑定被入参覆盖" # fail-closed 拒绝消息稳定锚点
48
+
49
+
50
+ def check(name, cond, detail=""):
51
+ global PASS, FAIL
52
+ if cond:
53
+ PASS += 1
54
+ print(" OK " + name)
55
+ else:
56
+ FAIL += 1
57
+ FAILS.append(name)
58
+ print(" FAIL " + name + " " + str(detail)[:110])
59
+
60
+
61
+ def _verify(token, tenant=None, path=None):
62
+ """verify_token 捕获异常,返回 (principal|None, exc|None)。"""
63
+ try:
64
+ return tokens.verify_token(token, tenant=tenant, path=path), None
65
+ except tokens.TokenError as e:
66
+ return None, e
67
+
68
+
69
+ def main():
70
+ sys.stdout.reconfigure(encoding="utf-8", errors="replace")
71
+ tmp = tempfile.mkdtemp(prefix="mdcg_n62_")
72
+ tf = os.path.join(tmp, "_tokens.json")
73
+ reg_path = os.path.join(tmp, "_tenants.json")
74
+ old_reg = os.environ.get("MDCG_TENANT_REGISTRY")
75
+ try:
76
+ # 哑临时登记表:确定性上限(tenantA=secret 不夹、tenantB/tenantC=internal)
77
+ reg = TenantRegistry(reg_path)
78
+ reg.register("tenantA", os.path.join(tmp, "rootA"), clearance_cap="secret",
79
+ description="N62 守卫哑登记 tenantA")
80
+ reg.register("tenantB", os.path.join(tmp, "rootB"),
81
+ clearance_cap="internal", description="N62 哑登记 tenantB")
82
+ reg.register("tenantC", os.path.join(tmp, "rootC"),
83
+ clearance_cap="internal", description="N62 哑登记 tenantC")
84
+ os.environ["MDCG_TENANT_REGISTRY"] = reg_path
85
+ d_a = tokens.issue("designer", actor="dummy-designer-a", tenant="tenantA",
86
+ path=tf, _allow_bootstrap=True) # 测试搭架;闸的证明在 test_issue543
87
+ d_c = tokens.issue("designer", actor="dummy-designer-c", tenant="tenantC",
88
+ path=tf, _allow_bootstrap=True) # 测试搭架;闸的证明在 test_issue543
89
+ d_d = tokens.issue("designer", actor="dummy-designer-d", tenant="tenantD",
90
+ path=tf, _allow_bootstrap=True) # 测试搭架;闸的证明在 test_issue543
91
+
92
+ # ---------- R1 ② 覆盖 fail-closed ----------
93
+ print("== R1 租户绑定被入参覆盖 → 拒绝(fail-closed)==")
94
+ p1, e1 = _verify(d_a["token"], tenant="tenantB", path=tf)
95
+ check("R1a 覆盖被拒(TokenError 且含锚点)",
96
+ p1 is None and e1 is not None and MARK in str(e1),
97
+ f"p={p1} exc={type(e1).__name__}: {str(e1)[:80]}")
98
+ check("R1b 拒绝消息含两侧租户与校正指引",
99
+ e1 is not None and "tenantA" in str(e1) and "tenantB" in str(e1)
100
+ and "MDCG_TENANT" in str(e1), str(e1)[:100])
101
+
102
+ # ---------- R2 ① cap 夹紧(登记租户,纯收紧) ----------
103
+ print("== R2 登记租户上限夹紧(cap=internal < 令牌 secret)==")
104
+ p2, e2 = _verify(d_c["token"], path=tf)
105
+ check("R2a clearance 夹紧为 internal",
106
+ e2 is None and p2 is not None and p2.clearance == "internal",
107
+ f"clearance={getattr(p2, 'clearance', None)} err={e2}")
108
+ check("R2b 可读不含 private/secret",
109
+ p2 is not None and not p2.allows("private")
110
+ and not p2.allows("secret"),
111
+ f"private={p2.allows('private') if p2 else None} "
112
+ f"secret={p2.allows('secret') if p2 else None}")
113
+ check("R2c internal 本级仍可读(收紧不误伤)",
114
+ p2 is not None and p2.allows("internal"),
115
+ f"internal={p2.allows('internal') if p2 else None}")
116
+
117
+ # ---------- R3 未登记租户零闸变 ----------
118
+ print("== R3 未登记租户零闸变(fresh install 行为不变)==")
119
+ p3, e3 = _verify(d_d["token"], path=tf)
120
+ check("R3 未登记 tenantD clearance 原样(不夹紧)",
121
+ e3 is None and p3 is not None and p3.clearance == "secret"
122
+ and p3.tenant == "tenantD" and p3.allows("secret"),
123
+ f"clearance={getattr(p3, 'clearance', None)} "
124
+ f"tenant={getattr(p3, 'tenant', None)} err={e3}")
125
+
126
+ # ---------- R4 无冲突零误伤 ----------
127
+ print("== R4 无冲突路径零误伤 ==")
128
+ for label, arg in (("None", None), ("空串", ""), ("同值", "tenantA")):
129
+ p4, e4 = _verify(d_a["token"], tenant=arg, path=tf)
130
+ check(f"R4 tenant={label}:零异常且回落令牌租户 tenantA",
131
+ e4 is None and p4 is not None and p4.tenant == "tenantA"
132
+ and p4.clearance == "secret",
133
+ f"tenant={getattr(p4, 'tenant', None)} "
134
+ f"clearance={getattr(p4, 'clearance', None)} err={e4}")
135
+
136
+ # ---------- R5 MCP 进程面(_build_principal 同面) ----------
137
+ print("== R5 MCP 进程级:MDCG_TOKEN + MDCG_TENANT + MDCG_TENANT_REGISTRY ==")
138
+ from .mcp_server import _build_principal
139
+ saved = {k: os.environ.get(k) for k in
140
+ ("MDCG_TOKEN", "MDCG_TENANT", "MDCG_TOKEN_FILE", "MDCG_ROOT",
141
+ "MDCG_TENANT_REGISTRY", "MDCG_LEGACY_ENV_AUTH",
142
+ "MDCG_LEGACY_ENV_ADMIN", "MDCG_CAN_ADMIN", "MDCG_CAN_WRITE",
143
+ "MDCG_CLEARANCE", "MDCG_ACTOR")}
144
+ try:
145
+ os.environ["MDCG_TOKEN"] = d_a["token"]
146
+ os.environ["MDCG_TOKEN_FILE"] = tf
147
+ os.environ["MDCG_ROOT"] = os.path.join(tmp, "mcp")
148
+ os.environ["MDCG_TENANT_REGISTRY"] = reg_path
149
+ os.environ["MDCG_TENANT"] = "tenantB"
150
+ for k in ("MDCG_LEGACY_ENV_AUTH", "MDCG_LEGACY_ENV_ADMIN",
151
+ "MDCG_CAN_ADMIN", "MDCG_CAN_WRITE", "MDCG_CLEARANCE",
152
+ "MDCG_ACTOR"):
153
+ os.environ.pop(k, None)
154
+ buf = io.StringIO()
155
+ with contextlib.redirect_stderr(buf):
156
+ mp, merr = _build_principal()
157
+ check("R5a MCP 面覆盖被拒(err 含锚点,principal=None)",
158
+ mp is None and merr is not None and MARK in merr,
159
+ f"err={str(merr)[:90]}")
160
+ # ① 经 MCP 面:tenantC(登记 cap=internal)夹紧
161
+ os.environ["MDCG_TOKEN"] = d_c["token"]
162
+ os.environ["MDCG_TENANT"] = "tenantC"
163
+ mp2, merr2 = _build_principal()
164
+ check("R5b MCP 面 cap 夹紧(tenantC designer → internal)",
165
+ merr2 is None and mp2 is not None
166
+ and getattr(mp2, "clearance", None) == "internal",
167
+ f"clearance={getattr(mp2, 'clearance', None)} err={merr2}")
168
+ # 同值零误伤
169
+ os.environ["MDCG_TOKEN"] = d_a["token"]
170
+ os.environ["MDCG_TENANT"] = "tenantA"
171
+ mp3, merr3 = _build_principal()
172
+ check("R5c MDCG_TENANT 同值:零误伤正常通过",
173
+ merr3 is None and mp3 is not None
174
+ and getattr(mp3, "tenant", None) == "tenantA"
175
+ and getattr(mp3, "clearance", None) == "secret",
176
+ f"err={merr3} tenant={getattr(mp3, 'tenant', None)} "
177
+ f"clearance={getattr(mp3, 'clearance', None)}")
178
+ finally:
179
+ for k, v in saved.items():
180
+ if v is None:
181
+ os.environ.pop(k, None)
182
+ else:
183
+ os.environ[k] = v
184
+ finally:
185
+ if old_reg is None:
186
+ os.environ.pop("MDCG_TENANT_REGISTRY", None)
187
+ else:
188
+ os.environ["MDCG_TENANT_REGISTRY"] = old_reg
189
+ shutil.rmtree(tmp, ignore_errors=True)
190
+
191
+ print()
192
+ if FAILS:
193
+ print("FAILED: %d 项 → %s" % (len(FAILS), ", ".join(FAILS)))
194
+ return 1
195
+ print("ALL OK: %d 项(N62 令牌路径 cap 夹紧 + 租户覆盖 fail-closed 守卫全绿)" % PASS)
196
+ return 0
197
+
198
+
199
+ if __name__ == "__main__":
200
+ sys.exit(main())