@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,331 +1,331 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
# 功能名:mdcg_ingest 的 source="auto" 必须过 MDCG_INGEST_ROOT 白名单(仅显式配置时)(issue #326-①)
|
|
3
|
-
# 生效条件:python -X utf8 -m md_cg.test_issue326_ingest_auto_whitelist [--mutate];被测面=md_cg/mcp_server.py 的 mdcg_ingest auto 闸与 md_cg/security.py 的「已显式配置」判据单点 whitelist_root_configured
|
|
4
|
-
# 子功能:A 组=报告逐字行为矩阵(未配白名单 ⇒ auto 放行;配受控目录 ⇒ auto 拒)+「会话在受控目录内 ⇒ 放行」+显式路径既有语义不变;K 组=非恒真对照(过度收紧方向:空白 env/多根/「配了但不含 sessions」都不得把默认 auto 拦死;单点同源一致性;相邻语义不受扰);E 组=判据单源源码面(auto 闸不得自己再读一次 env)
|
|
5
|
-
# 执行:--mutate 时在镜像树里逐条把闸删掉(回缺陷)/改成无条件过闸(过度收紧),守卫必须按指定项转红
|
|
6
|
-
# 验证方式:全部 PASS 即通过(退出码 0);--mutate 下每条变异的红项集合须与预期**逐项相符**
|
|
7
|
-
# 不适用条件:不判 ~/.dsh 是 junction 时 realpath 语义差异(报告已说明属既有 check_path_root 语义、非本条引入);不覆盖 discover_detailed 的排序策略(issue #23 另议);不判 ingest 的内容面(sources.run)
|
|
8
|
-
"""issue #326-① 守卫:auto 分支不是「没有路径」,它扫 ~/.dsh/sessions 并整份 ingest。
|
|
9
|
-
|
|
10
|
-
病象(修前):`if src_arg != "auto": check_path_root(...)` —— 把「没有入参」当成了
|
|
11
|
-
「没有路径」⇒ 把 root 收紧到受控目录后,`source="auto"` 仍会把白名单之外的跨项目
|
|
12
|
-
数据读进来(实测 ~/.dsh/sessions 2474 文件 / ≈469MB)。
|
|
13
|
-
|
|
14
|
-
**回归陷阱(报告实测)**:修法必须带「**仅在显式配置了 MDCG_INGEST_ROOT 时**才约束
|
|
15
|
-
auto」这一条件——未配置时 `_whitelist_roots` 回落「记忆库根」,`~/.dsh/sessions` 不在
|
|
16
|
-
其中,无条件过闸会把**默认 `source="auto"` 整个拦死**。本守卫的 A01/K01/K02/K06 与
|
|
17
|
-
变异腿 M2 就是钉这条的。
|
|
18
|
-
|
|
19
|
-
判据单源:`security.whitelist_root_configured` 是「白名单根是否被显式配置」的**单点**,
|
|
20
|
-
`_whitelist_roots` 与 auto 闸共用(E 组源码面断言:auto 闸不得自己再读一次 os.environ)。
|
|
21
|
-
|
|
22
|
-
「守卫必须能在变异态下跑完」(task-8/④ 的教训):所有取数经 `_call()` 折成可命名形态,
|
|
23
|
-
变异态产出**命名红项**而非崩栈。
|
|
24
|
-
"""
|
|
25
|
-
from __future__ import annotations
|
|
26
|
-
|
|
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
|
-
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
37
|
-
if _REPO not in sys.path:
|
|
38
|
-
sys.path.insert(0, _REPO)
|
|
39
|
-
|
|
40
|
-
FAILS = []
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
def _check(name, cond, detail=""):
|
|
44
|
-
if cond:
|
|
45
|
-
print(" PASS " + name)
|
|
46
|
-
else:
|
|
47
|
-
print(" FAIL " + name + " " + str(detail)[:220])
|
|
48
|
-
FAILS.append(name)
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
_TMP = tempfile.mkdtemp(prefix="iss326a_")
|
|
52
|
-
os.environ.update({"MDCG_ROOT": _TMP + "/brain", "MDCG_STATE_ROOT": _TMP + "/state",
|
|
53
|
-
"MDCG_AUX_ROOT": _TMP + "/auxstore", # 末段不得是 Windows 保留设备名
|
|
54
|
-
"MDCG_DATA_ROOT": _TMP + "/datastore",
|
|
55
|
-
"MDCG_EXPORT_ROOT": _TMP, "MDCG_SUSTAIN": "0", "MDCG_SLEEP": "0"})
|
|
56
|
-
os.environ.pop("MDCG_INGEST_ROOT", None)
|
|
57
|
-
|
|
58
|
-
from md_cg import mcp_server as _ms # noqa: E402
|
|
59
|
-
from md_cg import security as _sec # noqa: E402
|
|
60
|
-
from md_cg import sources as _src # noqa: E402
|
|
61
|
-
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
62
|
-
|
|
63
|
-
_REAL_DISCOVER = _src.DSHSessionSource.discover_detailed
|
|
64
|
-
|
|
65
|
-
# 受控白名单目录(**不含**会话文件所在目录)与被控会话文件(白名单之外)。
|
|
66
|
-
_CTRL = os.path.join(_TMP, "controlled")
|
|
67
|
-
_SESS = os.path.join(_TMP, "outside", "sess", "session.jsonl")
|
|
68
|
-
os.makedirs(_CTRL, exist_ok=True)
|
|
69
|
-
os.makedirs(os.path.dirname(_SESS), exist_ok=True)
|
|
70
|
-
with open(_SESS, "w", encoding="utf-8") as _f:
|
|
71
|
-
_f.write(json.dumps({"type": "user",
|
|
72
|
-
"message": {"content": [{"type": "text", "text": "你好"}]}},
|
|
73
|
-
ensure_ascii=False) + chr(10))
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
def _pin_discovery(path):
|
|
77
|
-
"""把 auto 的候选来源钉到受控路径(避开本机 ~/.dsh/sessions 是 junction 的干扰)。"""
|
|
78
|
-
_src.DSHSessionSource.discover_detailed = staticmethod(
|
|
79
|
-
lambda root=None, limit=None: [(path, os.path.getsize(path),
|
|
80
|
-
os.path.getmtime(path))])
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
def _call(name="mdcg_ingest", **kw):
|
|
84
|
-
"""调 _dispatch:正常返回 ("", 结果);抛异常(含 BaseException)返回 (类型名, 文本)。"""
|
|
85
|
-
cg = MdCGOS(os.path.join(_TMP, "brain"))
|
|
86
|
-
try:
|
|
87
|
-
return "", _ms._dispatch(cg, name, dict(kw))
|
|
88
|
-
except BaseException as exc: # noqa: BLE001 —— 变异态不得崩栈
|
|
89
|
-
return type(exc).__name__, str(exc)
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
def _env(value):
|
|
93
|
-
"""把 MDCG_INGEST_ROOT 置为 value(None = 移除)。"""
|
|
94
|
-
if value is None:
|
|
95
|
-
os.environ.pop("MDCG_INGEST_ROOT", None)
|
|
96
|
-
else:
|
|
97
|
-
os.environ["MDCG_INGEST_ROOT"] = value
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
_pin_discovery(_SESS)
|
|
101
|
-
|
|
102
|
-
print("== A 组:#326-① 正题——报告逐字行为矩阵 ==")
|
|
103
|
-
_env(None)
|
|
104
|
-
_e1, _r1 = _call()
|
|
105
|
-
_check("A01 矩阵第 1 行|未配 MDCG_INGEST_ROOT ⇒ auto **放行**(默认工作流不受影响)",
|
|
106
|
-
_e1 == "" and isinstance(_r1, dict) and "new_events" in _r1, (_e1, str(_r1)[:80]))
|
|
107
|
-
_env(_CTRL)
|
|
108
|
-
_e2, _r2 = _call()
|
|
109
|
-
_check("A02 矩阵第 2 行|配受控目录(不含 sessions)⇒ auto **拒**(PermissionError 点名白名单)",
|
|
110
|
-
_e2 == "PermissionError" and "MDCG_INGEST_ROOT" in _r2, (_e2, str(_r2)[:120]))
|
|
111
|
-
# 会话**在**白名单内时应放行(闸不是无条件拒 auto)
|
|
112
|
-
_CTRL_SESS_DIR = os.path.join(_CTRL, "sess")
|
|
113
|
-
os.makedirs(_CTRL_SESS_DIR, exist_ok=True)
|
|
114
|
-
_IN_SESS = os.path.join(_CTRL_SESS_DIR, "session.jsonl")
|
|
115
|
-
shutil.copyfile(_SESS, _IN_SESS)
|
|
116
|
-
_pin_discovery(_IN_SESS)
|
|
117
|
-
_e3, _r3 = _call()
|
|
118
|
-
_check("A03 会话落在受控目录**内** ⇒ auto 放行(不是无条件拒 auto)",
|
|
119
|
-
_e3 == "" and isinstance(_r3, dict), (_e3, str(_r3)[:80]))
|
|
120
|
-
_pin_discovery(_SESS)
|
|
121
|
-
_e4, _r4 = _call(source=_SESS)
|
|
122
|
-
_check("A04 显式路径(白名单外)⇒ 仍拒(既有语义未被削弱)",
|
|
123
|
-
_e4 == "PermissionError", (_e4, str(_r4)[:100]))
|
|
124
|
-
_e5, _r5 = _call(source=_IN_SESS)
|
|
125
|
-
_check("A05 显式路径(白名单内)⇒ 仍放行", _e5 == "" and isinstance(_r5, dict),
|
|
126
|
-
(_e5, str(_r5)[:80]))
|
|
127
|
-
_env(None)
|
|
128
|
-
_e6, _r6 = _call(source=_SESS)
|
|
129
|
-
_check("A06 未配白名单 + 显式路径(库外)⇒ 仍按回落根拒(#351/既有语义不变)",
|
|
130
|
-
_e6 == "PermissionError", (_e6, str(_r6)[:100]))
|
|
131
|
-
|
|
132
|
-
print("== K 组:非恒真对照(过度收紧方向——不得把默认 auto 拦死) ==")
|
|
133
|
-
# 空白 env ≡ 未配(与 _whitelist_roots 的 raw 口径同源)
|
|
134
|
-
_env(" ")
|
|
135
|
-
_e7, _r7 = _call()
|
|
136
|
-
_check("K01 空白 env(MDCG_INGEST_ROOT=" ")≡ 未配 ⇒ auto 仍放行",
|
|
137
|
-
_e7 == "" and isinstance(_r7, dict), (_e7, str(_r7)[:80]))
|
|
138
|
-
_env("")
|
|
139
|
-
_e8, _r8 = _call()
|
|
140
|
-
_check("K02 空串 env(键存在但为空)⇒ 仍视为未配、auto 放行",
|
|
141
|
-
_e8 == "" and isinstance(_r8, dict), (_e8, str(_r8)[:80]))
|
|
142
|
-
# 多根:其中一段含会话目录 ⇒ 放行(os.pathsep 多根语义未被破坏)
|
|
143
|
-
_env(_CTRL + os.pathsep + os.path.dirname(_SESS))
|
|
144
|
-
_e9, _r9 = _call()
|
|
145
|
-
_check("K03 os.pathsep 多根且有一段覆盖会话目录 ⇒ auto 放行(多根语义不变)",
|
|
146
|
-
_e9 == "" and isinstance(_r9, dict), (_e9, str(_r9)[:90]))
|
|
147
|
-
# 配了白名单但**不含**会话 ⇒ 必须拒(不得因「目录不存在」等任何理由放行)
|
|
148
|
-
_env(os.path.join(_TMP, "nowhere-not-exist"))
|
|
149
|
-
_e10, _r10 = _call()
|
|
150
|
-
_check("K04 配了不存在的受控根 ⇒ auto 拒(不因路径不存在而放行)",
|
|
151
|
-
_e10 == "PermissionError", (_e10, str(_r10)[:100]))
|
|
152
|
-
_env(_CTRL)
|
|
153
|
-
_e11, _r11 = _call(source=os.path.join(_CTRL, "sub", "..", "x.jsonl"))
|
|
154
|
-
_check("K05 realpath 语义未被绕开①:受控根内的 `..` 形态路径 ⇒ 放行",
|
|
155
|
-
_e11 == "" and isinstance(_r11, dict), (_e11, str(_r11)[:90]))
|
|
156
|
-
_e12, _r12 = _call(source=os.path.join(_CTRL, "..", "outside", "sess", "session.jsonl"))
|
|
157
|
-
_check("K06 realpath 语义未被绕开②:形似在根内、realpath 落在根外 ⇒ 拒",
|
|
158
|
-
_e12 == "PermissionError", (_e12, str(_r12)[:100]))
|
|
159
|
-
# 「已配」判据单点自洽:三态取值 与 _whitelist_roots 是否走 env 分支**逐态一致**
|
|
160
|
-
_env(None)
|
|
161
|
-
_c_unset = _sec.whitelist_root_configured("MDCG_INGEST_ROOT")
|
|
162
|
-
_r_unset = _sec._whitelist_roots("MDCG_INGEST_ROOT")
|
|
163
|
-
_env(" ")
|
|
164
|
-
_c_blank = _sec.whitelist_root_configured("MDCG_INGEST_ROOT")
|
|
165
|
-
_r_blank = _sec._whitelist_roots("MDCG_INGEST_ROOT")
|
|
166
|
-
_env(_CTRL)
|
|
167
|
-
_c_set = _sec.whitelist_root_configured("MDCG_INGEST_ROOT")
|
|
168
|
-
_r_set = _sec._whitelist_roots("MDCG_INGEST_ROOT")
|
|
169
|
-
_env(None)
|
|
170
|
-
_check("K07 判据单点自洽:已配 ⇒ _whitelist_roots 恰为 env 根;未配/空白 ⇒ 走回落链(非 env 根)",
|
|
171
|
-
_c_set is True and _r_set == [os.path.realpath(os.path.expanduser(_CTRL))]
|
|
172
|
-
and _c_unset is False and _c_blank is False
|
|
173
|
-
and _r_unset != _r_set and _r_blank != _r_set,
|
|
174
|
-
(_c_unset, _c_blank, _c_set, _r_set, _r_unset))
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
print("== E 组:判据单源(源码面) ==")
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
def _src(rel):
|
|
181
|
-
with open(os.path.join(_REPO, rel), encoding="utf-8") as f:
|
|
182
|
-
return f.read()
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
_Q = chr(34)
|
|
186
|
-
_ENV_LITERAL = "os.environ.get(" + _Q + "MDCG_INGEST_ROOT" + _Q + ")"
|
|
187
|
-
_check("E01 whitelist_root_configured 是 security 的模块级可调用单点",
|
|
188
|
-
callable(getattr(_sec, "whitelist_root_configured", None)), "")
|
|
189
|
-
_check("E02 _whitelist_roots 复用该单点(不自己再判一次「已配」)",
|
|
190
|
-
"if whitelist_root_configured(env_var):" in _src("md_cg/security.py"), "")
|
|
191
|
-
_check("E03 mdcg_ingest 的 auto 闸经该单点(源码含 whitelist_root_configured(MDCG_INGEST_ROOT))",
|
|
192
|
-
"whitelist_root_configured(" + _Q + "MDCG_INGEST_ROOT" + _Q + ")"
|
|
193
|
-
in _src("md_cg/mcp_server.py"), "")
|
|
194
|
-
_check("E04 auto 闸**不得**自己再读一次 env(字面 os.environ.get(MDCG_INGEST_ROOT) 仍只 1 处=#351 那处)",
|
|
195
|
-
_src("md_cg/mcp_server.py").count(_ENV_LITERAL) == 1,
|
|
196
|
-
_src("md_cg/mcp_server.py").count(_ENV_LITERAL))
|
|
197
|
-
|
|
198
|
-
shutil.rmtree(_TMP, ignore_errors=True)
|
|
199
|
-
print("")
|
|
200
|
-
if FAILS:
|
|
201
|
-
print("issue #326-① 结果:%d 失败" % len(FAILS))
|
|
202
|
-
else:
|
|
203
|
-
print("issue #326-① 结果:全部通过")
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
# ---------------------------------------------------------------- 定点变异表
|
|
207
|
-
# 锚点跨行用 chr(10) 拼接;_apply_text 按目标文件**实际行尾**折算(mcp_server.py 为 CRLF)。
|
|
208
|
-
_GATE = chr(10).join([
|
|
209
|
-
" # 发现到的会话路径过**同一条**白名单闸(仅在显式配置时——见上)。",
|
|
210
|
-
" if whitelist_root_configured(\"MDCG_INGEST_ROOT\"):",
|
|
211
|
-
" check_path_root(picked[0], \"MDCG_INGEST_ROOT\", \"mdcg_ingest\")",
|
|
212
|
-
])
|
|
213
|
-
_GATE_OFF = " # 变异:删掉 auto 闸(回到「auto 不经路径参数」的缺陷形态)"
|
|
214
|
-
_GATE_ALWAYS = chr(10).join([
|
|
215
|
-
" # 变异:无条件过闸(去掉「仅显式配置时」条件——报告实测的回归陷阱)",
|
|
216
|
-
" check_path_root(picked[0], \"MDCG_INGEST_ROOT\", \"mdcg_ingest\")",
|
|
217
|
-
])
|
|
218
|
-
|
|
219
|
-
_MUTATIONS = (
|
|
220
|
-
# M1 删闸(回缺陷)⇒ auto 不再过白名单:矩阵第 2 行(配受控目录仍放行)转红;
|
|
221
|
-
# E03(源码面「经单点」)同步转红;K04(配了受控根 ⇒ 必须拒)也随之转红——
|
|
222
|
-
# 闸没了,任何配置都不再拒。恒绿项如实说明:第 1 行(未配 ⇒ 放行)两态皆放行。
|
|
223
|
-
("M1 删闸(回缺陷:auto 不经路径参数)", "md_cg/mcp_server.py",
|
|
224
|
-
((_GATE, _GATE_OFF),),
|
|
225
|
-
("A02", "E03", "K04")),
|
|
226
|
-
# M2 无条件过闸(过度收紧)⇒ 未配时 ~/.dsh/sessions 不在回落根内、默认 auto 被拦死:
|
|
227
|
-
# 矩阵第 1 行与「未配/空白 env ⇒ auto 放行」项转红,E03(源码面「经单点」)同步转红。
|
|
228
|
-
# 恒绿项如实说明:A02(配受控目录 ⇒ 拒)两态皆拒;K03(多根覆盖会话目录)本就被放行。
|
|
229
|
-
("M2 无条件过闸(过度收紧:默认 auto 被拦死)", "md_cg/mcp_server.py",
|
|
230
|
-
((_GATE, _GATE_ALWAYS),),
|
|
231
|
-
("A01", "E03", "K01", "K02")),
|
|
232
|
-
)
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
def _mirror_build():
|
|
236
|
-
dst = tempfile.mkdtemp(prefix="iss326a_mut_")
|
|
237
|
-
for name in ("md_cg", "scripts"):
|
|
238
|
-
src = os.path.join(_REPO, name)
|
|
239
|
-
if os.path.isdir(src):
|
|
240
|
-
shutil.copytree(src, os.path.join(dst, name),
|
|
241
|
-
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
242
|
-
for name in sorted(os.listdir(_REPO)):
|
|
243
|
-
p = os.path.join(_REPO, name)
|
|
244
|
-
if os.path.isfile(p) and (name.endswith(".py")
|
|
245
|
-
or name in ("README.md", "pyproject.toml",
|
|
246
|
-
"package.json")):
|
|
247
|
-
shutil.copy2(p, os.path.join(dst, name))
|
|
248
|
-
return dst
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
def _apply_text(text, rel, pairs):
|
|
252
|
-
"""按目标文件实际行尾折算锚点后逐条替换;任一锚点命中数 != 1 返回 (None, 原因)。"""
|
|
253
|
-
eol = (chr(13) + chr(10)) if (chr(13) + chr(10)) in text else chr(10)
|
|
254
|
-
for old, new in pairs:
|
|
255
|
-
o = old.replace(chr(10), eol)
|
|
256
|
-
n = new.replace(chr(10), eol)
|
|
257
|
-
if text.count(o) != 1:
|
|
258
|
-
return None, "锚点在 %s 里命中 %d 次" % (rel, text.count(o))
|
|
259
|
-
text = text.replace(o, n, 1)
|
|
260
|
-
return text, ""
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
def _run_in(tree):
|
|
264
|
-
env = dict(os.environ)
|
|
265
|
-
env["PYTHONPATH"] = tree
|
|
266
|
-
env["PYTHONUTF8"] = "1"
|
|
267
|
-
env["PYTHONDONTWRITEBYTECODE"] = "1"
|
|
268
|
-
for k in ("MDCG_ROOT", "MDCG_STATE_ROOT", "MDCG_AUX_ROOT",
|
|
269
|
-
"MDCG_DATA_ROOT", "MDCG_EXPORT_ROOT", "MDCG_INGEST_ROOT"):
|
|
270
|
-
env.pop(k, None)
|
|
271
|
-
pr = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
272
|
-
"md_cg.test_issue326_ingest_auto_whitelist"],
|
|
273
|
-
capture_output=True, text=True, encoding="utf-8",
|
|
274
|
-
errors="replace", cwd=tree, env=env, timeout=1800)
|
|
275
|
-
out = (pr.stdout or "") + (pr.stderr or "")
|
|
276
|
-
reds = [ln.split("FAIL ", 1)[1].strip()
|
|
277
|
-
for ln in out.splitlines() if ln.strip().startswith("FAIL ")]
|
|
278
|
-
return pr.returncode, reds, out
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
def _mutate():
|
|
282
|
-
print("!! 定点变异自证:逐条把 auto 闸改成缺陷/过度收紧形态,守卫必须按指定项转红")
|
|
283
|
-
tree = _mirror_build()
|
|
284
|
-
bad = []
|
|
285
|
-
try:
|
|
286
|
-
rc, reds, out = _run_in(tree)
|
|
287
|
-
print(" 未变异镜像基线:rc=%d 红项=%d(必须 rc=0 且 0 红)" % (rc, len(reds)))
|
|
288
|
-
if rc != 0 or reds:
|
|
289
|
-
bad.append("未变异镜像基线即红")
|
|
290
|
-
print(chr(10).join(out.splitlines()[-25:]))
|
|
291
|
-
for desc, rel, pairs, exp in _MUTATIONS:
|
|
292
|
-
p = os.path.join(tree, rel)
|
|
293
|
-
with open(p, encoding="utf-8", newline="") as f:
|
|
294
|
-
bak = f.read()
|
|
295
|
-
mut, why = _apply_text(bak, rel, pairs)
|
|
296
|
-
if mut is None:
|
|
297
|
-
bad.append("%s —— %s" % (desc, why))
|
|
298
|
-
print(" ANCHOR-MISS " + desc + " " + why)
|
|
299
|
-
continue
|
|
300
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
301
|
-
f.write(mut)
|
|
302
|
-
for root, dd, ff in os.walk(tree):
|
|
303
|
-
if os.path.basename(root) == "__pycache__":
|
|
304
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
305
|
-
rc2, reds2, out2 = _run_in(tree)
|
|
306
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
307
|
-
f.write(bak)
|
|
308
|
-
hit = sorted({r.split(" ")[0] for r in reds2})
|
|
309
|
-
if rc2 != 0 and hit == sorted(exp):
|
|
310
|
-
print(" OK %s 红项=%d 指定命中=%s" % (desc, len(reds2), hit))
|
|
311
|
-
else:
|
|
312
|
-
bad.append(desc)
|
|
313
|
-
print(" MISMATCH %s 实际红项=%s 期望=%s rc=%d"
|
|
314
|
-
% (desc, hit, sorted(exp), rc2))
|
|
315
|
-
for r in reds2[:12]:
|
|
316
|
-
print(" FAIL " + r)
|
|
317
|
-
print("定点变异自证:%s(%d 条不合格)" % ("PASS" if not bad else "FAIL", len(bad)))
|
|
318
|
-
for b in bad:
|
|
319
|
-
print(" 不合格:" + b)
|
|
320
|
-
return len(bad)
|
|
321
|
-
finally:
|
|
322
|
-
shutil.rmtree(tree, ignore_errors=True)
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
def main():
|
|
326
|
-
_bad = _mutate() if "--mutate" in sys.argv else 0
|
|
327
|
-
return 1 if (FAILS or _bad) else 0
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
if __name__ == "__main__":
|
|
331
|
-
sys.exit(main())
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
# 功能名:mdcg_ingest 的 source="auto" 必须过 MDCG_INGEST_ROOT 白名单(仅显式配置时)(issue #326-①)
|
|
3
|
+
# 生效条件:python -X utf8 -m md_cg.test_issue326_ingest_auto_whitelist [--mutate];被测面=md_cg/mcp_server.py 的 mdcg_ingest auto 闸与 md_cg/security.py 的「已显式配置」判据单点 whitelist_root_configured
|
|
4
|
+
# 子功能:A 组=报告逐字行为矩阵(未配白名单 ⇒ auto 放行;配受控目录 ⇒ auto 拒)+「会话在受控目录内 ⇒ 放行」+显式路径既有语义不变;K 组=非恒真对照(过度收紧方向:空白 env/多根/「配了但不含 sessions」都不得把默认 auto 拦死;单点同源一致性;相邻语义不受扰);E 组=判据单源源码面(auto 闸不得自己再读一次 env)
|
|
5
|
+
# 执行:--mutate 时在镜像树里逐条把闸删掉(回缺陷)/改成无条件过闸(过度收紧),守卫必须按指定项转红
|
|
6
|
+
# 验证方式:全部 PASS 即通过(退出码 0);--mutate 下每条变异的红项集合须与预期**逐项相符**
|
|
7
|
+
# 不适用条件:不判 ~/.dsh 是 junction 时 realpath 语义差异(报告已说明属既有 check_path_root 语义、非本条引入);不覆盖 discover_detailed 的排序策略(issue #23 另议);不判 ingest 的内容面(sources.run)
|
|
8
|
+
"""issue #326-① 守卫:auto 分支不是「没有路径」,它扫 ~/.dsh/sessions 并整份 ingest。
|
|
9
|
+
|
|
10
|
+
病象(修前):`if src_arg != "auto": check_path_root(...)` —— 把「没有入参」当成了
|
|
11
|
+
「没有路径」⇒ 把 root 收紧到受控目录后,`source="auto"` 仍会把白名单之外的跨项目
|
|
12
|
+
数据读进来(实测 ~/.dsh/sessions 2474 文件 / ≈469MB)。
|
|
13
|
+
|
|
14
|
+
**回归陷阱(报告实测)**:修法必须带「**仅在显式配置了 MDCG_INGEST_ROOT 时**才约束
|
|
15
|
+
auto」这一条件——未配置时 `_whitelist_roots` 回落「记忆库根」,`~/.dsh/sessions` 不在
|
|
16
|
+
其中,无条件过闸会把**默认 `source="auto"` 整个拦死**。本守卫的 A01/K01/K02/K06 与
|
|
17
|
+
变异腿 M2 就是钉这条的。
|
|
18
|
+
|
|
19
|
+
判据单源:`security.whitelist_root_configured` 是「白名单根是否被显式配置」的**单点**,
|
|
20
|
+
`_whitelist_roots` 与 auto 闸共用(E 组源码面断言:auto 闸不得自己再读一次 os.environ)。
|
|
21
|
+
|
|
22
|
+
「守卫必须能在变异态下跑完」(task-8/④ 的教训):所有取数经 `_call()` 折成可命名形态,
|
|
23
|
+
变异态产出**命名红项**而非崩栈。
|
|
24
|
+
"""
|
|
25
|
+
from __future__ import annotations
|
|
26
|
+
|
|
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
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
37
|
+
if _REPO not in sys.path:
|
|
38
|
+
sys.path.insert(0, _REPO)
|
|
39
|
+
|
|
40
|
+
FAILS = []
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
def _check(name, cond, detail=""):
|
|
44
|
+
if cond:
|
|
45
|
+
print(" PASS " + name)
|
|
46
|
+
else:
|
|
47
|
+
print(" FAIL " + name + " " + str(detail)[:220])
|
|
48
|
+
FAILS.append(name)
|
|
49
|
+
|
|
50
|
+
|
|
51
|
+
_TMP = tempfile.mkdtemp(prefix="iss326a_")
|
|
52
|
+
os.environ.update({"MDCG_ROOT": _TMP + "/brain", "MDCG_STATE_ROOT": _TMP + "/state",
|
|
53
|
+
"MDCG_AUX_ROOT": _TMP + "/auxstore", # 末段不得是 Windows 保留设备名
|
|
54
|
+
"MDCG_DATA_ROOT": _TMP + "/datastore",
|
|
55
|
+
"MDCG_EXPORT_ROOT": _TMP, "MDCG_SUSTAIN": "0", "MDCG_SLEEP": "0"})
|
|
56
|
+
os.environ.pop("MDCG_INGEST_ROOT", None)
|
|
57
|
+
|
|
58
|
+
from md_cg import mcp_server as _ms # noqa: E402
|
|
59
|
+
from md_cg import security as _sec # noqa: E402
|
|
60
|
+
from md_cg import sources as _src # noqa: E402
|
|
61
|
+
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
62
|
+
|
|
63
|
+
_REAL_DISCOVER = _src.DSHSessionSource.discover_detailed
|
|
64
|
+
|
|
65
|
+
# 受控白名单目录(**不含**会话文件所在目录)与被控会话文件(白名单之外)。
|
|
66
|
+
_CTRL = os.path.join(_TMP, "controlled")
|
|
67
|
+
_SESS = os.path.join(_TMP, "outside", "sess", "session.jsonl")
|
|
68
|
+
os.makedirs(_CTRL, exist_ok=True)
|
|
69
|
+
os.makedirs(os.path.dirname(_SESS), exist_ok=True)
|
|
70
|
+
with open(_SESS, "w", encoding="utf-8") as _f:
|
|
71
|
+
_f.write(json.dumps({"type": "user",
|
|
72
|
+
"message": {"content": [{"type": "text", "text": "你好"}]}},
|
|
73
|
+
ensure_ascii=False) + chr(10))
|
|
74
|
+
|
|
75
|
+
|
|
76
|
+
def _pin_discovery(path):
|
|
77
|
+
"""把 auto 的候选来源钉到受控路径(避开本机 ~/.dsh/sessions 是 junction 的干扰)。"""
|
|
78
|
+
_src.DSHSessionSource.discover_detailed = staticmethod(
|
|
79
|
+
lambda root=None, limit=None: [(path, os.path.getsize(path),
|
|
80
|
+
os.path.getmtime(path))])
|
|
81
|
+
|
|
82
|
+
|
|
83
|
+
def _call(name="mdcg_ingest", **kw):
|
|
84
|
+
"""调 _dispatch:正常返回 ("", 结果);抛异常(含 BaseException)返回 (类型名, 文本)。"""
|
|
85
|
+
cg = MdCGOS(os.path.join(_TMP, "brain"))
|
|
86
|
+
try:
|
|
87
|
+
return "", _ms._dispatch(cg, name, dict(kw))
|
|
88
|
+
except BaseException as exc: # noqa: BLE001 —— 变异态不得崩栈
|
|
89
|
+
return type(exc).__name__, str(exc)
|
|
90
|
+
|
|
91
|
+
|
|
92
|
+
def _env(value):
|
|
93
|
+
"""把 MDCG_INGEST_ROOT 置为 value(None = 移除)。"""
|
|
94
|
+
if value is None:
|
|
95
|
+
os.environ.pop("MDCG_INGEST_ROOT", None)
|
|
96
|
+
else:
|
|
97
|
+
os.environ["MDCG_INGEST_ROOT"] = value
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
_pin_discovery(_SESS)
|
|
101
|
+
|
|
102
|
+
print("== A 组:#326-① 正题——报告逐字行为矩阵 ==")
|
|
103
|
+
_env(None)
|
|
104
|
+
_e1, _r1 = _call()
|
|
105
|
+
_check("A01 矩阵第 1 行|未配 MDCG_INGEST_ROOT ⇒ auto **放行**(默认工作流不受影响)",
|
|
106
|
+
_e1 == "" and isinstance(_r1, dict) and "new_events" in _r1, (_e1, str(_r1)[:80]))
|
|
107
|
+
_env(_CTRL)
|
|
108
|
+
_e2, _r2 = _call()
|
|
109
|
+
_check("A02 矩阵第 2 行|配受控目录(不含 sessions)⇒ auto **拒**(PermissionError 点名白名单)",
|
|
110
|
+
_e2 == "PermissionError" and "MDCG_INGEST_ROOT" in _r2, (_e2, str(_r2)[:120]))
|
|
111
|
+
# 会话**在**白名单内时应放行(闸不是无条件拒 auto)
|
|
112
|
+
_CTRL_SESS_DIR = os.path.join(_CTRL, "sess")
|
|
113
|
+
os.makedirs(_CTRL_SESS_DIR, exist_ok=True)
|
|
114
|
+
_IN_SESS = os.path.join(_CTRL_SESS_DIR, "session.jsonl")
|
|
115
|
+
shutil.copyfile(_SESS, _IN_SESS)
|
|
116
|
+
_pin_discovery(_IN_SESS)
|
|
117
|
+
_e3, _r3 = _call()
|
|
118
|
+
_check("A03 会话落在受控目录**内** ⇒ auto 放行(不是无条件拒 auto)",
|
|
119
|
+
_e3 == "" and isinstance(_r3, dict), (_e3, str(_r3)[:80]))
|
|
120
|
+
_pin_discovery(_SESS)
|
|
121
|
+
_e4, _r4 = _call(source=_SESS)
|
|
122
|
+
_check("A04 显式路径(白名单外)⇒ 仍拒(既有语义未被削弱)",
|
|
123
|
+
_e4 == "PermissionError", (_e4, str(_r4)[:100]))
|
|
124
|
+
_e5, _r5 = _call(source=_IN_SESS)
|
|
125
|
+
_check("A05 显式路径(白名单内)⇒ 仍放行", _e5 == "" and isinstance(_r5, dict),
|
|
126
|
+
(_e5, str(_r5)[:80]))
|
|
127
|
+
_env(None)
|
|
128
|
+
_e6, _r6 = _call(source=_SESS)
|
|
129
|
+
_check("A06 未配白名单 + 显式路径(库外)⇒ 仍按回落根拒(#351/既有语义不变)",
|
|
130
|
+
_e6 == "PermissionError", (_e6, str(_r6)[:100]))
|
|
131
|
+
|
|
132
|
+
print("== K 组:非恒真对照(过度收紧方向——不得把默认 auto 拦死) ==")
|
|
133
|
+
# 空白 env ≡ 未配(与 _whitelist_roots 的 raw 口径同源)
|
|
134
|
+
_env(" ")
|
|
135
|
+
_e7, _r7 = _call()
|
|
136
|
+
_check("K01 空白 env(MDCG_INGEST_ROOT=" ")≡ 未配 ⇒ auto 仍放行",
|
|
137
|
+
_e7 == "" and isinstance(_r7, dict), (_e7, str(_r7)[:80]))
|
|
138
|
+
_env("")
|
|
139
|
+
_e8, _r8 = _call()
|
|
140
|
+
_check("K02 空串 env(键存在但为空)⇒ 仍视为未配、auto 放行",
|
|
141
|
+
_e8 == "" and isinstance(_r8, dict), (_e8, str(_r8)[:80]))
|
|
142
|
+
# 多根:其中一段含会话目录 ⇒ 放行(os.pathsep 多根语义未被破坏)
|
|
143
|
+
_env(_CTRL + os.pathsep + os.path.dirname(_SESS))
|
|
144
|
+
_e9, _r9 = _call()
|
|
145
|
+
_check("K03 os.pathsep 多根且有一段覆盖会话目录 ⇒ auto 放行(多根语义不变)",
|
|
146
|
+
_e9 == "" and isinstance(_r9, dict), (_e9, str(_r9)[:90]))
|
|
147
|
+
# 配了白名单但**不含**会话 ⇒ 必须拒(不得因「目录不存在」等任何理由放行)
|
|
148
|
+
_env(os.path.join(_TMP, "nowhere-not-exist"))
|
|
149
|
+
_e10, _r10 = _call()
|
|
150
|
+
_check("K04 配了不存在的受控根 ⇒ auto 拒(不因路径不存在而放行)",
|
|
151
|
+
_e10 == "PermissionError", (_e10, str(_r10)[:100]))
|
|
152
|
+
_env(_CTRL)
|
|
153
|
+
_e11, _r11 = _call(source=os.path.join(_CTRL, "sub", "..", "x.jsonl"))
|
|
154
|
+
_check("K05 realpath 语义未被绕开①:受控根内的 `..` 形态路径 ⇒ 放行",
|
|
155
|
+
_e11 == "" and isinstance(_r11, dict), (_e11, str(_r11)[:90]))
|
|
156
|
+
_e12, _r12 = _call(source=os.path.join(_CTRL, "..", "outside", "sess", "session.jsonl"))
|
|
157
|
+
_check("K06 realpath 语义未被绕开②:形似在根内、realpath 落在根外 ⇒ 拒",
|
|
158
|
+
_e12 == "PermissionError", (_e12, str(_r12)[:100]))
|
|
159
|
+
# 「已配」判据单点自洽:三态取值 与 _whitelist_roots 是否走 env 分支**逐态一致**
|
|
160
|
+
_env(None)
|
|
161
|
+
_c_unset = _sec.whitelist_root_configured("MDCG_INGEST_ROOT")
|
|
162
|
+
_r_unset = _sec._whitelist_roots("MDCG_INGEST_ROOT")
|
|
163
|
+
_env(" ")
|
|
164
|
+
_c_blank = _sec.whitelist_root_configured("MDCG_INGEST_ROOT")
|
|
165
|
+
_r_blank = _sec._whitelist_roots("MDCG_INGEST_ROOT")
|
|
166
|
+
_env(_CTRL)
|
|
167
|
+
_c_set = _sec.whitelist_root_configured("MDCG_INGEST_ROOT")
|
|
168
|
+
_r_set = _sec._whitelist_roots("MDCG_INGEST_ROOT")
|
|
169
|
+
_env(None)
|
|
170
|
+
_check("K07 判据单点自洽:已配 ⇒ _whitelist_roots 恰为 env 根;未配/空白 ⇒ 走回落链(非 env 根)",
|
|
171
|
+
_c_set is True and _r_set == [os.path.realpath(os.path.expanduser(_CTRL))]
|
|
172
|
+
and _c_unset is False and _c_blank is False
|
|
173
|
+
and _r_unset != _r_set and _r_blank != _r_set,
|
|
174
|
+
(_c_unset, _c_blank, _c_set, _r_set, _r_unset))
|
|
175
|
+
|
|
176
|
+
|
|
177
|
+
print("== E 组:判据单源(源码面) ==")
|
|
178
|
+
|
|
179
|
+
|
|
180
|
+
def _src(rel):
|
|
181
|
+
with open(os.path.join(_REPO, rel), encoding="utf-8") as f:
|
|
182
|
+
return f.read()
|
|
183
|
+
|
|
184
|
+
|
|
185
|
+
_Q = chr(34)
|
|
186
|
+
_ENV_LITERAL = "os.environ.get(" + _Q + "MDCG_INGEST_ROOT" + _Q + ")"
|
|
187
|
+
_check("E01 whitelist_root_configured 是 security 的模块级可调用单点",
|
|
188
|
+
callable(getattr(_sec, "whitelist_root_configured", None)), "")
|
|
189
|
+
_check("E02 _whitelist_roots 复用该单点(不自己再判一次「已配」)",
|
|
190
|
+
"if whitelist_root_configured(env_var):" in _src("md_cg/security.py"), "")
|
|
191
|
+
_check("E03 mdcg_ingest 的 auto 闸经该单点(源码含 whitelist_root_configured(MDCG_INGEST_ROOT))",
|
|
192
|
+
"whitelist_root_configured(" + _Q + "MDCG_INGEST_ROOT" + _Q + ")"
|
|
193
|
+
in _src("md_cg/mcp_server.py"), "")
|
|
194
|
+
_check("E04 auto 闸**不得**自己再读一次 env(字面 os.environ.get(MDCG_INGEST_ROOT) 仍只 1 处=#351 那处)",
|
|
195
|
+
_src("md_cg/mcp_server.py").count(_ENV_LITERAL) == 1,
|
|
196
|
+
_src("md_cg/mcp_server.py").count(_ENV_LITERAL))
|
|
197
|
+
|
|
198
|
+
shutil.rmtree(_TMP, ignore_errors=True)
|
|
199
|
+
print("")
|
|
200
|
+
if FAILS:
|
|
201
|
+
print("issue #326-① 结果:%d 失败" % len(FAILS))
|
|
202
|
+
else:
|
|
203
|
+
print("issue #326-① 结果:全部通过")
|
|
204
|
+
|
|
205
|
+
|
|
206
|
+
# ---------------------------------------------------------------- 定点变异表
|
|
207
|
+
# 锚点跨行用 chr(10) 拼接;_apply_text 按目标文件**实际行尾**折算(mcp_server.py 为 CRLF)。
|
|
208
|
+
_GATE = chr(10).join([
|
|
209
|
+
" # 发现到的会话路径过**同一条**白名单闸(仅在显式配置时——见上)。",
|
|
210
|
+
" if whitelist_root_configured(\"MDCG_INGEST_ROOT\"):",
|
|
211
|
+
" check_path_root(picked[0], \"MDCG_INGEST_ROOT\", \"mdcg_ingest\")",
|
|
212
|
+
])
|
|
213
|
+
_GATE_OFF = " # 变异:删掉 auto 闸(回到「auto 不经路径参数」的缺陷形态)"
|
|
214
|
+
_GATE_ALWAYS = chr(10).join([
|
|
215
|
+
" # 变异:无条件过闸(去掉「仅显式配置时」条件——报告实测的回归陷阱)",
|
|
216
|
+
" check_path_root(picked[0], \"MDCG_INGEST_ROOT\", \"mdcg_ingest\")",
|
|
217
|
+
])
|
|
218
|
+
|
|
219
|
+
_MUTATIONS = (
|
|
220
|
+
# M1 删闸(回缺陷)⇒ auto 不再过白名单:矩阵第 2 行(配受控目录仍放行)转红;
|
|
221
|
+
# E03(源码面「经单点」)同步转红;K04(配了受控根 ⇒ 必须拒)也随之转红——
|
|
222
|
+
# 闸没了,任何配置都不再拒。恒绿项如实说明:第 1 行(未配 ⇒ 放行)两态皆放行。
|
|
223
|
+
("M1 删闸(回缺陷:auto 不经路径参数)", "md_cg/mcp_server.py",
|
|
224
|
+
((_GATE, _GATE_OFF),),
|
|
225
|
+
("A02", "E03", "K04")),
|
|
226
|
+
# M2 无条件过闸(过度收紧)⇒ 未配时 ~/.dsh/sessions 不在回落根内、默认 auto 被拦死:
|
|
227
|
+
# 矩阵第 1 行与「未配/空白 env ⇒ auto 放行」项转红,E03(源码面「经单点」)同步转红。
|
|
228
|
+
# 恒绿项如实说明:A02(配受控目录 ⇒ 拒)两态皆拒;K03(多根覆盖会话目录)本就被放行。
|
|
229
|
+
("M2 无条件过闸(过度收紧:默认 auto 被拦死)", "md_cg/mcp_server.py",
|
|
230
|
+
((_GATE, _GATE_ALWAYS),),
|
|
231
|
+
("A01", "E03", "K01", "K02")),
|
|
232
|
+
)
|
|
233
|
+
|
|
234
|
+
|
|
235
|
+
def _mirror_build():
|
|
236
|
+
dst = tempfile.mkdtemp(prefix="iss326a_mut_")
|
|
237
|
+
for name in ("md_cg", "scripts"):
|
|
238
|
+
src = os.path.join(_REPO, name)
|
|
239
|
+
if os.path.isdir(src):
|
|
240
|
+
shutil.copytree(src, os.path.join(dst, name),
|
|
241
|
+
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
242
|
+
for name in sorted(os.listdir(_REPO)):
|
|
243
|
+
p = os.path.join(_REPO, name)
|
|
244
|
+
if os.path.isfile(p) and (name.endswith(".py")
|
|
245
|
+
or name in ("README.md", "pyproject.toml",
|
|
246
|
+
"package.json")):
|
|
247
|
+
shutil.copy2(p, os.path.join(dst, name))
|
|
248
|
+
return dst
|
|
249
|
+
|
|
250
|
+
|
|
251
|
+
def _apply_text(text, rel, pairs):
|
|
252
|
+
"""按目标文件实际行尾折算锚点后逐条替换;任一锚点命中数 != 1 返回 (None, 原因)。"""
|
|
253
|
+
eol = (chr(13) + chr(10)) if (chr(13) + chr(10)) in text else chr(10)
|
|
254
|
+
for old, new in pairs:
|
|
255
|
+
o = old.replace(chr(10), eol)
|
|
256
|
+
n = new.replace(chr(10), eol)
|
|
257
|
+
if text.count(o) != 1:
|
|
258
|
+
return None, "锚点在 %s 里命中 %d 次" % (rel, text.count(o))
|
|
259
|
+
text = text.replace(o, n, 1)
|
|
260
|
+
return text, ""
|
|
261
|
+
|
|
262
|
+
|
|
263
|
+
def _run_in(tree):
|
|
264
|
+
env = dict(os.environ)
|
|
265
|
+
env["PYTHONPATH"] = tree
|
|
266
|
+
env["PYTHONUTF8"] = "1"
|
|
267
|
+
env["PYTHONDONTWRITEBYTECODE"] = "1"
|
|
268
|
+
for k in ("MDCG_ROOT", "MDCG_STATE_ROOT", "MDCG_AUX_ROOT",
|
|
269
|
+
"MDCG_DATA_ROOT", "MDCG_EXPORT_ROOT", "MDCG_INGEST_ROOT"):
|
|
270
|
+
env.pop(k, None)
|
|
271
|
+
pr = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
272
|
+
"md_cg.test_issue326_ingest_auto_whitelist"],
|
|
273
|
+
capture_output=True, text=True, encoding="utf-8",
|
|
274
|
+
errors="replace", cwd=tree, env=env, timeout=1800)
|
|
275
|
+
out = (pr.stdout or "") + (pr.stderr or "")
|
|
276
|
+
reds = [ln.split("FAIL ", 1)[1].strip()
|
|
277
|
+
for ln in out.splitlines() if ln.strip().startswith("FAIL ")]
|
|
278
|
+
return pr.returncode, reds, out
|
|
279
|
+
|
|
280
|
+
|
|
281
|
+
def _mutate():
|
|
282
|
+
print("!! 定点变异自证:逐条把 auto 闸改成缺陷/过度收紧形态,守卫必须按指定项转红")
|
|
283
|
+
tree = _mirror_build()
|
|
284
|
+
bad = []
|
|
285
|
+
try:
|
|
286
|
+
rc, reds, out = _run_in(tree)
|
|
287
|
+
print(" 未变异镜像基线:rc=%d 红项=%d(必须 rc=0 且 0 红)" % (rc, len(reds)))
|
|
288
|
+
if rc != 0 or reds:
|
|
289
|
+
bad.append("未变异镜像基线即红")
|
|
290
|
+
print(chr(10).join(out.splitlines()[-25:]))
|
|
291
|
+
for desc, rel, pairs, exp in _MUTATIONS:
|
|
292
|
+
p = os.path.join(tree, rel)
|
|
293
|
+
with open(p, encoding="utf-8", newline="") as f:
|
|
294
|
+
bak = f.read()
|
|
295
|
+
mut, why = _apply_text(bak, rel, pairs)
|
|
296
|
+
if mut is None:
|
|
297
|
+
bad.append("%s —— %s" % (desc, why))
|
|
298
|
+
print(" ANCHOR-MISS " + desc + " " + why)
|
|
299
|
+
continue
|
|
300
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
301
|
+
f.write(mut)
|
|
302
|
+
for root, dd, ff in os.walk(tree):
|
|
303
|
+
if os.path.basename(root) == "__pycache__":
|
|
304
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
305
|
+
rc2, reds2, out2 = _run_in(tree)
|
|
306
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
307
|
+
f.write(bak)
|
|
308
|
+
hit = sorted({r.split(" ")[0] for r in reds2})
|
|
309
|
+
if rc2 != 0 and hit == sorted(exp):
|
|
310
|
+
print(" OK %s 红项=%d 指定命中=%s" % (desc, len(reds2), hit))
|
|
311
|
+
else:
|
|
312
|
+
bad.append(desc)
|
|
313
|
+
print(" MISMATCH %s 实际红项=%s 期望=%s rc=%d"
|
|
314
|
+
% (desc, hit, sorted(exp), rc2))
|
|
315
|
+
for r in reds2[:12]:
|
|
316
|
+
print(" FAIL " + r)
|
|
317
|
+
print("定点变异自证:%s(%d 条不合格)" % ("PASS" if not bad else "FAIL", len(bad)))
|
|
318
|
+
for b in bad:
|
|
319
|
+
print(" 不合格:" + b)
|
|
320
|
+
return len(bad)
|
|
321
|
+
finally:
|
|
322
|
+
shutil.rmtree(tree, ignore_errors=True)
|
|
323
|
+
|
|
324
|
+
|
|
325
|
+
def main():
|
|
326
|
+
_bad = _mutate() if "--mutate" in sys.argv else 0
|
|
327
|
+
return 1 if (FAILS or _bad) else 0
|
|
328
|
+
|
|
329
|
+
|
|
330
|
+
if __name__ == "__main__":
|
|
331
|
+
sys.exit(main())
|