@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,384 +1,384 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
"""证据层 node_id 路径穿越守卫(issue #277)。
|
|
3
|
-
|
|
4
|
-
【守什么】
|
|
5
|
-
#277 报:MDCG_NODE_ID(或 node_id(explicit=...))零校验,而 publish_card
|
|
6
|
-
把它直接拼进 os.path.join(peers_dir(swarm), nid + ".json") ⇒ **任意文件写**,
|
|
7
|
-
且落点可越出 swarm 目录(实测 "../../../evil_pwned")。
|
|
8
|
-
|
|
9
|
-
【修法】
|
|
10
|
-
复用仓内既有范式(#147 的「汇点兜底」+ mdcos._restore_id_ok 的「先拦后读」):
|
|
11
|
-
· 入口 node_id() **先拦后返回**——非法即 EvidenceError,不返回可拼路径的值;
|
|
12
|
-
· 汇点 publish_card() **再拦一次** + realpath 包含性判定——即使调用方绕过
|
|
13
|
-
node_id() 直接构造 card,也 fail-closed;
|
|
14
|
-
· 判据与写面 MdCG.add() 的 P0-1 白名单**同源**(同一 _NODE_ID_RE、同一
|
|
15
|
-
".." 禁令、同一 _NODE_ID_FORBIDDEN),不是第二份判据。
|
|
16
|
-
|
|
17
|
-
判据:
|
|
18
|
-
P1 ".." 形态一律拒(../x、..反斜杠evil、a/../../b、has%2e%2e 等)
|
|
19
|
-
P1b 环境变量腿:MDCG_NODE_ID 同样被拦
|
|
20
|
-
P2 绝对路径 / 盘符 / UNC 拒
|
|
21
|
-
P3 含分隔符(斜杠/反斜杠)拒
|
|
22
|
-
P4 保留字(None / null)拒——空语义值的字符串化污染形态
|
|
23
|
-
P5 超长(>128)拒;非字符串拒
|
|
24
|
-
P6 **反向**:合法 id(字母数字 _ . @ - 与中文、逗号)行为不变
|
|
25
|
-
P7 **端到端**:恶意 MDCG_NODE_ID 下 publish_card 抛 EvidenceError,
|
|
26
|
-
且**盘上不产生任何越界文件**(真写盘腿,不是只看返回值)
|
|
27
|
-
P8 **汇点兜底**:绕过 node_id()(直接构造 card)也拒
|
|
28
|
-
P9 **缺陷曾真实存在**:从 git HEAD 取**修复前**源码逐字核对原形 ——
|
|
29
|
-
证明本守卫守的是真缺陷,不是自证同义反复
|
|
30
|
-
P10 判据同源:_node_id_error 的通过集 == MdCG.add() 白名单的通过集
|
|
31
|
-
|
|
32
|
-
运行:python -X utf8 -m md_cg.test_issue277_node_id_traversal
|
|
33
|
-
python -X utf8 -m md_cg.test_issue277_node_id_traversal --mutate
|
|
34
|
-
|
|
35
|
-
退出码(fail-closed):0 = 全绿;1 = 有断言失败 / 变异未按预期转红。
|
|
36
|
-
|
|
37
|
-
沙箱纪律:swarm 根落守卫临时目录,绝不碰在役库与 ~/.mdcg。
|
|
38
|
-
"""
|
|
39
|
-
from __future__ import annotations
|
|
40
|
-
|
|
41
|
-
import io
|
|
42
|
-
import os
|
|
43
|
-
import subprocess
|
|
44
|
-
import sys
|
|
45
|
-
import tempfile
|
|
46
|
-
|
|
47
|
-
from . import evidence as E
|
|
48
|
-
from .evidence import EvidenceError
|
|
49
|
-
|
|
50
|
-
_HERE = os.path.dirname(os.path.abspath(__file__))
|
|
51
|
-
_REPO = os.path.dirname(_HERE)
|
|
52
|
-
|
|
53
|
-
_PASS: list = []
|
|
54
|
-
_FAIL: list = []
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
def ok(cond, msg, extra=""):
|
|
58
|
-
(_PASS if cond else _FAIL).append(msg)
|
|
59
|
-
print((" PASS " if cond else " FAIL ") + msg
|
|
60
|
-
+ ((" -> " + str(extra)) if (extra and not cond) else ""))
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
def _raises(fn, *a, **kw):
|
|
64
|
-
try:
|
|
65
|
-
fn(*a, **kw)
|
|
66
|
-
return "OK"
|
|
67
|
-
except EvidenceError:
|
|
68
|
-
return "EvidenceError"
|
|
69
|
-
except Exception as exc: # noqa: BLE001
|
|
70
|
-
return type(exc).__name__
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
def _envname():
|
|
74
|
-
return getattr(E, "NODE_ID_ENV", "MDCG_NODE_ID")
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
_BAD = (
|
|
78
|
-
"../../../evil_pwned",
|
|
79
|
-
"../evil",
|
|
80
|
-
r"..\evil",
|
|
81
|
-
"a/../../b",
|
|
82
|
-
"..",
|
|
83
|
-
"a..b/../c",
|
|
84
|
-
"/etc/passwd",
|
|
85
|
-
r"C:\Windows\evil",
|
|
86
|
-
r"\\server\share\evil",
|
|
87
|
-
"sub/dir",
|
|
88
|
-
r"sub\dir",
|
|
89
|
-
"has:colon",
|
|
90
|
-
"has%2e%2e",
|
|
91
|
-
"None",
|
|
92
|
-
"null",
|
|
93
|
-
"x" * 129,
|
|
94
|
-
)
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
def p1():
|
|
98
|
-
print("== P1/P2/P3/P4/P5 非法形态一律拒 ==")
|
|
99
|
-
for bad in _BAD:
|
|
100
|
-
r = _raises(E.node_id, "R", explicit=bad)
|
|
101
|
-
ok(r == "EvidenceError", "P 拒 node_id(explicit=%r)" % (bad[:34],), r)
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
def p1b():
|
|
105
|
-
print("== P1b 环境变量腿:MDCG_NODE_ID 同样被拦 ==")
|
|
106
|
-
k = _envname()
|
|
107
|
-
old = os.environ.get(k)
|
|
108
|
-
try:
|
|
109
|
-
os.environ[k] = "../../../evil_env"
|
|
110
|
-
r = _raises(E.node_id, "R")
|
|
111
|
-
ok(r == "EvidenceError", "P1b MDCG_NODE_ID 穿越形态被拦", r)
|
|
112
|
-
os.environ[k] = "node-legit"
|
|
113
|
-
ok(E.node_id("R") == "node-legit", "P1b2 合法环境值仍正常返回")
|
|
114
|
-
finally:
|
|
115
|
-
if old is None:
|
|
116
|
-
os.environ.pop(k, None)
|
|
117
|
-
else:
|
|
118
|
-
os.environ[k] = old
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
def p5b():
|
|
122
|
-
print("== P5b 非字符串拒 ==")
|
|
123
|
-
for v in (123, 1.5, True, ["x"], {"a": 1}, ("x",)):
|
|
124
|
-
r = _raises(E.node_id, "R", explicit=v)
|
|
125
|
-
ok(r == "EvidenceError", "P5b 拒 node_id(explicit=%r)" % (v,), r)
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
def p6():
|
|
129
|
-
print("== P6 反向:合法 id 行为不变 ==")
|
|
130
|
-
for good in ("node-0123456789ab", "mem_1791909293720_48076f",
|
|
131
|
-
"中文节点", "a.b@c", "a,b", "a-b_c"):
|
|
132
|
-
try:
|
|
133
|
-
got = E.node_id("R", explicit=good)
|
|
134
|
-
except Exception as exc: # noqa: BLE001
|
|
135
|
-
got = "RAISED:%s" % type(exc).__name__
|
|
136
|
-
ok(got == good, "P6 合法 id 原样返回:%r" % (good,), got)
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
def _purge(paths):
|
|
140
|
-
"""清掉上一轮(或历史跑)可能残留的同名文件——判据只认**本次**是否写出。"""
|
|
141
|
-
for p in paths:
|
|
142
|
-
try:
|
|
143
|
-
if os.path.exists(p):
|
|
144
|
-
os.remove(p)
|
|
145
|
-
except OSError:
|
|
146
|
-
pass
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
def _outside_candidates(tmp):
|
|
150
|
-
d1 = os.path.dirname(tmp)
|
|
151
|
-
d2 = os.path.dirname(d1)
|
|
152
|
-
return [os.path.join(tmp, n) for n in ("evil_pwned.json", "evil_bypass.json")] + \
|
|
153
|
-
[os.path.join(d1, n) for n in ("evil_pwned.json", "evil_bypass.json")] + \
|
|
154
|
-
[os.path.join(d2, n) for n in ("evil_pwned.json", "evil_bypass.json")]
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
def p7():
|
|
158
|
-
print("== P7 端到端:恶意 MDCG_NODE_ID 下不产生越界文件 ==")
|
|
159
|
-
tmp = tempfile.mkdtemp(prefix="p277_")
|
|
160
|
-
swarm = os.path.join(tmp, "swarm")
|
|
161
|
-
os.makedirs(swarm, exist_ok=True)
|
|
162
|
-
_purge(_outside_candidates(tmp))
|
|
163
|
-
k = _envname()
|
|
164
|
-
old = os.environ.get(k)
|
|
165
|
-
try:
|
|
166
|
-
os.environ[k] = "../../../evil_pwned"
|
|
167
|
-
r = _raises(E.publish_card, "R", swarm=swarm)
|
|
168
|
-
ok(r == "EvidenceError", "P7a publish_card 抛 EvidenceError", r)
|
|
169
|
-
finally:
|
|
170
|
-
if old is None:
|
|
171
|
-
os.environ.pop(k, None)
|
|
172
|
-
else:
|
|
173
|
-
os.environ[k] = old
|
|
174
|
-
hits = [p for p in _outside_candidates(tmp) if os.path.exists(p)]
|
|
175
|
-
ok(not hits, "P7b 盘上无越界文件(真写盘腿)", hits[:3])
|
|
176
|
-
inner = []
|
|
177
|
-
for dp, _dn, fns in os.walk(swarm):
|
|
178
|
-
inner += [os.path.join(dp, f) for f in fns]
|
|
179
|
-
ok(inner == [], "P7c swarm 内无任何落盘", inner[:4])
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
def p8():
|
|
183
|
-
print("== P8 汇点兜底:绕过 node_id() 也拒 ==")
|
|
184
|
-
tmp = tempfile.mkdtemp(prefix="p277b_")
|
|
185
|
-
swarm = os.path.join(tmp, "swarm")
|
|
186
|
-
os.makedirs(swarm, exist_ok=True)
|
|
187
|
-
_purge(_outside_candidates(tmp))
|
|
188
|
-
orig = E.card
|
|
189
|
-
try:
|
|
190
|
-
E.card = lambda *a, **kw: {"node_id": "../../../evil_bypass"}
|
|
191
|
-
r = _raises(E.publish_card, "R", swarm=swarm)
|
|
192
|
-
finally:
|
|
193
|
-
E.card = orig
|
|
194
|
-
ok(r == "EvidenceError", "P8a 汇点兜底拦下绕过 node_id() 的恶意 card", r)
|
|
195
|
-
hits = [p for p in _outside_candidates(tmp) if os.path.exists(p)]
|
|
196
|
-
ok(not hits, "P8b 盘上无越界文件(兜底真生效)", hits[:3])
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
def _prepatch_src():
|
|
200
|
-
"""取**引入本修复的那个提交**的父版本 evidence.py。
|
|
201
|
-
|
|
202
|
-
★ 不能用 HEAD:本修复提交后 HEAD **就是**修复本身,"HEAD 无 _node_id_error"
|
|
203
|
-
会恒假(实测:提交后全量门禁里本守卫必红,而提交前独立跑是绿的)。
|
|
204
|
-
改为用 git log -S 定位引入提交,再看它的父提交——该断言因此**跨提交稳定**。
|
|
205
|
-
"""
|
|
206
|
-
def _g(*a):
|
|
207
|
-
return subprocess.run(list(a), cwd=_REPO, capture_output=True, text=True,
|
|
208
|
-
encoding="utf-8", errors="replace", timeout=60)
|
|
209
|
-
try:
|
|
210
|
-
lg = _g("git", "log", "-S_node_id_error", "--format=%H", "--",
|
|
211
|
-
"md_cg/evidence.py")
|
|
212
|
-
except Exception as exc: # noqa: BLE001
|
|
213
|
-
return None, "git 调用失败:%r" % (exc,)
|
|
214
|
-
if lg.returncode != 0:
|
|
215
|
-
return None, "git log rc=%s" % lg.returncode
|
|
216
|
-
shas = [x.strip() for x in (lg.stdout or "").splitlines() if x.strip()]
|
|
217
|
-
if not shas:
|
|
218
|
-
return None, "git log -S 未找到引入提交(历史过浅?)"
|
|
219
|
-
intro = shas[-1] # 最早那次引入
|
|
220
|
-
src = _g("git", "show", intro + "^:md_cg/evidence.py")
|
|
221
|
-
if src.returncode != 0:
|
|
222
|
-
return None, "git show %s^ rc=%s(根提交?)" % (intro[:8], src.returncode)
|
|
223
|
-
return src.stdout, ""
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
def p9():
|
|
227
|
-
print("== P9 缺陷曾真实存在(核对修复前源码原形)==")
|
|
228
|
-
t, err = _prepatch_src()
|
|
229
|
-
if t is None:
|
|
230
|
-
ok(False, "P9 取修复前源失败:%s" % err)
|
|
231
|
-
return
|
|
232
|
-
ok("_node_id_error" not in t,
|
|
233
|
-
"P9a 引入提交的**父版本**无 _node_id_error —— 判据由本修复引入")
|
|
234
|
-
ok("explicit or os.environ.get(NODE_ID_ENV)" in t,
|
|
235
|
-
"P9b 修复前的 node_id() 确为「只 strip、零校验」原形")
|
|
236
|
-
ok("c[\"node_id\"] + \".json\"" in t,
|
|
237
|
-
"P9c 修复前的 publish_card 确为「直接拼路径」原形")
|
|
238
|
-
ok("os.path.realpath(p)" not in t,
|
|
239
|
-
"P9d 修复前无 realpath 包含性判定 —— 越界无第二道防线")
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
def p9b():
|
|
243
|
-
print("== P9b 空串语义:= 未提供 ⇒ 回落派生(不是穿越形态)==")
|
|
244
|
-
got = E.node_id("R", explicit="")
|
|
245
|
-
ok(isinstance(got, str) and got.startswith("node-"),
|
|
246
|
-
"P9b explicit='' ⇒ 回落派生 node-<hex>(旧行为保持)", got)
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
def p11():
|
|
250
|
-
print("== P11 汇点纵深防御:两道独立防线都在场 ==")
|
|
251
|
-
with io.open(os.path.join(_REPO, "md_cg", "evidence.py"),
|
|
252
|
-
encoding="utf-8", errors="replace") as f:
|
|
253
|
-
src = f.read()
|
|
254
|
-
# **必须收窄到 publish_card 函数体**:write_pack 里有逐字同形的
|
|
255
|
-
# realpath 包含性判定(#147 引入),全文件 in 匹配会读到那一份而假绿。
|
|
256
|
-
i0 = src.index("def publish_card(")
|
|
257
|
-
i1 = src.index("def peers(")
|
|
258
|
-
body = src[i0:i1]
|
|
259
|
-
ok('_node_id_error(c.get("node_id"))' in body,
|
|
260
|
-
"P11a 第一道:汇点白名单(同 add() 判据)")
|
|
261
|
-
ok("os.path.realpath(p)" in body and "startswith(base + os.sep)" in body,
|
|
262
|
-
"P11b 第二道:realpath 包含性判定")
|
|
263
|
-
# 单去一道不足以转红 P8 —— 这正是「纵深」的含义,如实记录而非隐藏:
|
|
264
|
-
# 变异 V2 必须同时去掉两道才转红;本组保证两道**都**在场。
|
|
265
|
-
print(" 注:单去任一道 P8 仍绿(另一道兜住)——V2 故须同时去掉两道")
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
def p10():
|
|
269
|
-
print("== P10 判据同源:与写面 add() 白名单一致 ==")
|
|
270
|
-
from .mdcg import _NODE_ID_RE, _NODE_ID_FORBIDDEN
|
|
271
|
-
sample = ("node-abc", "mem_1_a", "中文", "a.b@c", "a,b", "a-b_c",
|
|
272
|
-
"a/b", "..", "x" * 129, "None", "null", "a\b", "C:x")
|
|
273
|
-
mism = []
|
|
274
|
-
for s in sample:
|
|
275
|
-
try:
|
|
276
|
-
E.node_id("R", explicit=s)
|
|
277
|
-
mine = True
|
|
278
|
-
except Exception: # noqa: BLE001
|
|
279
|
-
mine = False
|
|
280
|
-
theirs = bool(isinstance(s, str) and s and len(s) <= 128
|
|
281
|
-
and ".." not in s and s not in _NODE_ID_FORBIDDEN
|
|
282
|
-
and _NODE_ID_RE.match(s))
|
|
283
|
-
if mine != theirs:
|
|
284
|
-
mism.append((s[:20], mine, theirs))
|
|
285
|
-
ok(not mism, "P10 通过集 == add() 白名单通过集(抽样 %d)" % len(sample), mism)
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
_GROUPS = (p1, p1b, p5b, p6, p7, p8, p9, p9b, p10, p11)
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
def _run_groups() -> int:
|
|
292
|
-
_PASS.clear()
|
|
293
|
-
_FAIL.clear()
|
|
294
|
-
for g in _GROUPS:
|
|
295
|
-
try:
|
|
296
|
-
g()
|
|
297
|
-
except Exception as exc: # noqa: BLE001
|
|
298
|
-
ok(False, "断言组 %s 抛异常:%s" % (g.__name__, exc))
|
|
299
|
-
import traceback
|
|
300
|
-
print(traceback.format_exc()[-700:])
|
|
301
|
-
return len(_FAIL)
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
def main() -> int:
|
|
305
|
-
n = _run_groups()
|
|
306
|
-
print("\n证据层 node_id 穿越守卫:%d 通过,%d 失败" % (len(_PASS), n))
|
|
307
|
-
return 1 if n else 0
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
_MUTATIONS = (
|
|
311
|
-
('V1 去掉入口闸(node_id 恢复零校验)',
|
|
312
|
-
' err = _node_id_error(nid)',
|
|
313
|
-
' err = ""', 'P'),
|
|
314
|
-
('V2 去掉汇点白名单(第一道防线)',
|
|
315
|
-
' err = _node_id_error(c.get("node_id"))',
|
|
316
|
-
' err = ""', 'P11'),
|
|
317
|
-
('V5 去掉 realpath 包含性(第二道防线)',
|
|
318
|
-
' if real != base and not real.startswith(base + os.sep):',
|
|
319
|
-
' if False:', 'P11'),
|
|
320
|
-
('V3 放宽判据(去掉 .. 禁令)',
|
|
321
|
-
' if ".." in nid:',
|
|
322
|
-
' if False:', 'P'),
|
|
323
|
-
('V4 放宽判据(去掉字符白名单)',
|
|
324
|
-
' if not _NODE_ID_RE.match(nid):',
|
|
325
|
-
' if False:', 'P'),
|
|
326
|
-
)
|
|
327
|
-
|
|
328
|
-
def _reload():
|
|
329
|
-
import importlib
|
|
330
|
-
from . import evidence as _m
|
|
331
|
-
importlib.reload(_m)
|
|
332
|
-
globals()["E"] = _m
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
def _mutate() -> int:
|
|
336
|
-
bad = []
|
|
337
|
-
src_p = os.path.join(_REPO, "md_cg", "evidence.py")
|
|
338
|
-
with io.open(src_p, encoding="utf-8", newline="") as f:
|
|
339
|
-
pristine = f.read()
|
|
340
|
-
# 前置自检:源码必须处于**未变异**态,否则上一轮变异没收干净,本轮判据无意义
|
|
341
|
-
if " err = _node_id_error(nid)" not in pristine:
|
|
342
|
-
print(" SOURCE-ALREADY-MUTATED:evidence.py 入口闸缺失,请先恢复源码再跑 --mutate")
|
|
343
|
-
return 1
|
|
344
|
-
for name, anchor, repl, want in _MUTATIONS:
|
|
345
|
-
with io.open(src_p, encoding="utf-8", newline="") as f:
|
|
346
|
-
orig = f.read()
|
|
347
|
-
NL = "\r\n" if "\r\n" in orig else "\n"
|
|
348
|
-
a_ = anchor.replace("\n", NL)
|
|
349
|
-
r_ = repl.replace("\n", NL)
|
|
350
|
-
try:
|
|
351
|
-
if a_ not in orig:
|
|
352
|
-
print(" ANCHOR-MISS %s" % name)
|
|
353
|
-
bad.append(name)
|
|
354
|
-
continue
|
|
355
|
-
with io.open(src_p, "w", encoding="utf-8", newline="") as f:
|
|
356
|
-
f.write(orig.replace(a_, r_, 1))
|
|
357
|
-
_reload()
|
|
358
|
-
_run_groups()
|
|
359
|
-
reds = list(_FAIL)
|
|
360
|
-
hit = any(r.startswith(want) for r in reds)
|
|
361
|
-
print(" %-4s %-46s 红项=%-3d" % ("OK" if hit else "BAD", name, len(reds)))
|
|
362
|
-
if not hit:
|
|
363
|
-
bad.append(name)
|
|
364
|
-
finally:
|
|
365
|
-
# 从**开头备份**恢复(不是从本轮 orig——那会把上一轮的变异当成基线,
|
|
366
|
-
# 一旦某轮恢复失败,变异态就会被后续每轮"恢复"成新常态)。
|
|
367
|
-
with io.open(src_p, "w", encoding="utf-8", newline="") as f:
|
|
368
|
-
f.write(pristine)
|
|
369
|
-
with io.open(src_p, encoding="utf-8", newline="") as f:
|
|
370
|
-
if f.read() != pristine:
|
|
371
|
-
print(" RESTORE-FAILED %s" % name)
|
|
372
|
-
bad.append(name + "(恢复失败)")
|
|
373
|
-
_reload()
|
|
374
|
-
if bad:
|
|
375
|
-
print("\n定点变异自证:FAIL -- %s" % "、".join(bad))
|
|
376
|
-
return 1
|
|
377
|
-
print("\n定点变异自证:PASS(每处判据都被打红)")
|
|
378
|
-
return 0
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
if __name__ == "__main__":
|
|
382
|
-
if "--mutate" in sys.argv:
|
|
383
|
-
sys.exit(_mutate())
|
|
384
|
-
sys.exit(main())
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""证据层 node_id 路径穿越守卫(issue #277)。
|
|
3
|
+
|
|
4
|
+
【守什么】
|
|
5
|
+
#277 报:MDCG_NODE_ID(或 node_id(explicit=...))零校验,而 publish_card
|
|
6
|
+
把它直接拼进 os.path.join(peers_dir(swarm), nid + ".json") ⇒ **任意文件写**,
|
|
7
|
+
且落点可越出 swarm 目录(实测 "../../../evil_pwned")。
|
|
8
|
+
|
|
9
|
+
【修法】
|
|
10
|
+
复用仓内既有范式(#147 的「汇点兜底」+ mdcos._restore_id_ok 的「先拦后读」):
|
|
11
|
+
· 入口 node_id() **先拦后返回**——非法即 EvidenceError,不返回可拼路径的值;
|
|
12
|
+
· 汇点 publish_card() **再拦一次** + realpath 包含性判定——即使调用方绕过
|
|
13
|
+
node_id() 直接构造 card,也 fail-closed;
|
|
14
|
+
· 判据与写面 MdCG.add() 的 P0-1 白名单**同源**(同一 _NODE_ID_RE、同一
|
|
15
|
+
".." 禁令、同一 _NODE_ID_FORBIDDEN),不是第二份判据。
|
|
16
|
+
|
|
17
|
+
判据:
|
|
18
|
+
P1 ".." 形态一律拒(../x、..反斜杠evil、a/../../b、has%2e%2e 等)
|
|
19
|
+
P1b 环境变量腿:MDCG_NODE_ID 同样被拦
|
|
20
|
+
P2 绝对路径 / 盘符 / UNC 拒
|
|
21
|
+
P3 含分隔符(斜杠/反斜杠)拒
|
|
22
|
+
P4 保留字(None / null)拒——空语义值的字符串化污染形态
|
|
23
|
+
P5 超长(>128)拒;非字符串拒
|
|
24
|
+
P6 **反向**:合法 id(字母数字 _ . @ - 与中文、逗号)行为不变
|
|
25
|
+
P7 **端到端**:恶意 MDCG_NODE_ID 下 publish_card 抛 EvidenceError,
|
|
26
|
+
且**盘上不产生任何越界文件**(真写盘腿,不是只看返回值)
|
|
27
|
+
P8 **汇点兜底**:绕过 node_id()(直接构造 card)也拒
|
|
28
|
+
P9 **缺陷曾真实存在**:从 git HEAD 取**修复前**源码逐字核对原形 ——
|
|
29
|
+
证明本守卫守的是真缺陷,不是自证同义反复
|
|
30
|
+
P10 判据同源:_node_id_error 的通过集 == MdCG.add() 白名单的通过集
|
|
31
|
+
|
|
32
|
+
运行:python -X utf8 -m md_cg.test_issue277_node_id_traversal
|
|
33
|
+
python -X utf8 -m md_cg.test_issue277_node_id_traversal --mutate
|
|
34
|
+
|
|
35
|
+
退出码(fail-closed):0 = 全绿;1 = 有断言失败 / 变异未按预期转红。
|
|
36
|
+
|
|
37
|
+
沙箱纪律:swarm 根落守卫临时目录,绝不碰在役库与 ~/.mdcg。
|
|
38
|
+
"""
|
|
39
|
+
from __future__ import annotations
|
|
40
|
+
|
|
41
|
+
import io
|
|
42
|
+
import os
|
|
43
|
+
import subprocess
|
|
44
|
+
import sys
|
|
45
|
+
import tempfile
|
|
46
|
+
|
|
47
|
+
from . import evidence as E
|
|
48
|
+
from .evidence import EvidenceError
|
|
49
|
+
|
|
50
|
+
_HERE = os.path.dirname(os.path.abspath(__file__))
|
|
51
|
+
_REPO = os.path.dirname(_HERE)
|
|
52
|
+
|
|
53
|
+
_PASS: list = []
|
|
54
|
+
_FAIL: list = []
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
def ok(cond, msg, extra=""):
|
|
58
|
+
(_PASS if cond else _FAIL).append(msg)
|
|
59
|
+
print((" PASS " if cond else " FAIL ") + msg
|
|
60
|
+
+ ((" -> " + str(extra)) if (extra and not cond) else ""))
|
|
61
|
+
|
|
62
|
+
|
|
63
|
+
def _raises(fn, *a, **kw):
|
|
64
|
+
try:
|
|
65
|
+
fn(*a, **kw)
|
|
66
|
+
return "OK"
|
|
67
|
+
except EvidenceError:
|
|
68
|
+
return "EvidenceError"
|
|
69
|
+
except Exception as exc: # noqa: BLE001
|
|
70
|
+
return type(exc).__name__
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
def _envname():
|
|
74
|
+
return getattr(E, "NODE_ID_ENV", "MDCG_NODE_ID")
|
|
75
|
+
|
|
76
|
+
|
|
77
|
+
_BAD = (
|
|
78
|
+
"../../../evil_pwned",
|
|
79
|
+
"../evil",
|
|
80
|
+
r"..\evil",
|
|
81
|
+
"a/../../b",
|
|
82
|
+
"..",
|
|
83
|
+
"a..b/../c",
|
|
84
|
+
"/etc/passwd",
|
|
85
|
+
r"C:\Windows\evil",
|
|
86
|
+
r"\\server\share\evil",
|
|
87
|
+
"sub/dir",
|
|
88
|
+
r"sub\dir",
|
|
89
|
+
"has:colon",
|
|
90
|
+
"has%2e%2e",
|
|
91
|
+
"None",
|
|
92
|
+
"null",
|
|
93
|
+
"x" * 129,
|
|
94
|
+
)
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
def p1():
|
|
98
|
+
print("== P1/P2/P3/P4/P5 非法形态一律拒 ==")
|
|
99
|
+
for bad in _BAD:
|
|
100
|
+
r = _raises(E.node_id, "R", explicit=bad)
|
|
101
|
+
ok(r == "EvidenceError", "P 拒 node_id(explicit=%r)" % (bad[:34],), r)
|
|
102
|
+
|
|
103
|
+
|
|
104
|
+
def p1b():
|
|
105
|
+
print("== P1b 环境变量腿:MDCG_NODE_ID 同样被拦 ==")
|
|
106
|
+
k = _envname()
|
|
107
|
+
old = os.environ.get(k)
|
|
108
|
+
try:
|
|
109
|
+
os.environ[k] = "../../../evil_env"
|
|
110
|
+
r = _raises(E.node_id, "R")
|
|
111
|
+
ok(r == "EvidenceError", "P1b MDCG_NODE_ID 穿越形态被拦", r)
|
|
112
|
+
os.environ[k] = "node-legit"
|
|
113
|
+
ok(E.node_id("R") == "node-legit", "P1b2 合法环境值仍正常返回")
|
|
114
|
+
finally:
|
|
115
|
+
if old is None:
|
|
116
|
+
os.environ.pop(k, None)
|
|
117
|
+
else:
|
|
118
|
+
os.environ[k] = old
|
|
119
|
+
|
|
120
|
+
|
|
121
|
+
def p5b():
|
|
122
|
+
print("== P5b 非字符串拒 ==")
|
|
123
|
+
for v in (123, 1.5, True, ["x"], {"a": 1}, ("x",)):
|
|
124
|
+
r = _raises(E.node_id, "R", explicit=v)
|
|
125
|
+
ok(r == "EvidenceError", "P5b 拒 node_id(explicit=%r)" % (v,), r)
|
|
126
|
+
|
|
127
|
+
|
|
128
|
+
def p6():
|
|
129
|
+
print("== P6 反向:合法 id 行为不变 ==")
|
|
130
|
+
for good in ("node-0123456789ab", "mem_1791909293720_48076f",
|
|
131
|
+
"中文节点", "a.b@c", "a,b", "a-b_c"):
|
|
132
|
+
try:
|
|
133
|
+
got = E.node_id("R", explicit=good)
|
|
134
|
+
except Exception as exc: # noqa: BLE001
|
|
135
|
+
got = "RAISED:%s" % type(exc).__name__
|
|
136
|
+
ok(got == good, "P6 合法 id 原样返回:%r" % (good,), got)
|
|
137
|
+
|
|
138
|
+
|
|
139
|
+
def _purge(paths):
|
|
140
|
+
"""清掉上一轮(或历史跑)可能残留的同名文件——判据只认**本次**是否写出。"""
|
|
141
|
+
for p in paths:
|
|
142
|
+
try:
|
|
143
|
+
if os.path.exists(p):
|
|
144
|
+
os.remove(p)
|
|
145
|
+
except OSError:
|
|
146
|
+
pass
|
|
147
|
+
|
|
148
|
+
|
|
149
|
+
def _outside_candidates(tmp):
|
|
150
|
+
d1 = os.path.dirname(tmp)
|
|
151
|
+
d2 = os.path.dirname(d1)
|
|
152
|
+
return [os.path.join(tmp, n) for n in ("evil_pwned.json", "evil_bypass.json")] + \
|
|
153
|
+
[os.path.join(d1, n) for n in ("evil_pwned.json", "evil_bypass.json")] + \
|
|
154
|
+
[os.path.join(d2, n) for n in ("evil_pwned.json", "evil_bypass.json")]
|
|
155
|
+
|
|
156
|
+
|
|
157
|
+
def p7():
|
|
158
|
+
print("== P7 端到端:恶意 MDCG_NODE_ID 下不产生越界文件 ==")
|
|
159
|
+
tmp = tempfile.mkdtemp(prefix="p277_")
|
|
160
|
+
swarm = os.path.join(tmp, "swarm")
|
|
161
|
+
os.makedirs(swarm, exist_ok=True)
|
|
162
|
+
_purge(_outside_candidates(tmp))
|
|
163
|
+
k = _envname()
|
|
164
|
+
old = os.environ.get(k)
|
|
165
|
+
try:
|
|
166
|
+
os.environ[k] = "../../../evil_pwned"
|
|
167
|
+
r = _raises(E.publish_card, "R", swarm=swarm)
|
|
168
|
+
ok(r == "EvidenceError", "P7a publish_card 抛 EvidenceError", r)
|
|
169
|
+
finally:
|
|
170
|
+
if old is None:
|
|
171
|
+
os.environ.pop(k, None)
|
|
172
|
+
else:
|
|
173
|
+
os.environ[k] = old
|
|
174
|
+
hits = [p for p in _outside_candidates(tmp) if os.path.exists(p)]
|
|
175
|
+
ok(not hits, "P7b 盘上无越界文件(真写盘腿)", hits[:3])
|
|
176
|
+
inner = []
|
|
177
|
+
for dp, _dn, fns in os.walk(swarm):
|
|
178
|
+
inner += [os.path.join(dp, f) for f in fns]
|
|
179
|
+
ok(inner == [], "P7c swarm 内无任何落盘", inner[:4])
|
|
180
|
+
|
|
181
|
+
|
|
182
|
+
def p8():
|
|
183
|
+
print("== P8 汇点兜底:绕过 node_id() 也拒 ==")
|
|
184
|
+
tmp = tempfile.mkdtemp(prefix="p277b_")
|
|
185
|
+
swarm = os.path.join(tmp, "swarm")
|
|
186
|
+
os.makedirs(swarm, exist_ok=True)
|
|
187
|
+
_purge(_outside_candidates(tmp))
|
|
188
|
+
orig = E.card
|
|
189
|
+
try:
|
|
190
|
+
E.card = lambda *a, **kw: {"node_id": "../../../evil_bypass"}
|
|
191
|
+
r = _raises(E.publish_card, "R", swarm=swarm)
|
|
192
|
+
finally:
|
|
193
|
+
E.card = orig
|
|
194
|
+
ok(r == "EvidenceError", "P8a 汇点兜底拦下绕过 node_id() 的恶意 card", r)
|
|
195
|
+
hits = [p for p in _outside_candidates(tmp) if os.path.exists(p)]
|
|
196
|
+
ok(not hits, "P8b 盘上无越界文件(兜底真生效)", hits[:3])
|
|
197
|
+
|
|
198
|
+
|
|
199
|
+
def _prepatch_src():
|
|
200
|
+
"""取**引入本修复的那个提交**的父版本 evidence.py。
|
|
201
|
+
|
|
202
|
+
★ 不能用 HEAD:本修复提交后 HEAD **就是**修复本身,"HEAD 无 _node_id_error"
|
|
203
|
+
会恒假(实测:提交后全量门禁里本守卫必红,而提交前独立跑是绿的)。
|
|
204
|
+
改为用 git log -S 定位引入提交,再看它的父提交——该断言因此**跨提交稳定**。
|
|
205
|
+
"""
|
|
206
|
+
def _g(*a):
|
|
207
|
+
return subprocess.run(list(a), cwd=_REPO, capture_output=True, text=True,
|
|
208
|
+
encoding="utf-8", errors="replace", timeout=60)
|
|
209
|
+
try:
|
|
210
|
+
lg = _g("git", "log", "-S_node_id_error", "--format=%H", "--",
|
|
211
|
+
"md_cg/evidence.py")
|
|
212
|
+
except Exception as exc: # noqa: BLE001
|
|
213
|
+
return None, "git 调用失败:%r" % (exc,)
|
|
214
|
+
if lg.returncode != 0:
|
|
215
|
+
return None, "git log rc=%s" % lg.returncode
|
|
216
|
+
shas = [x.strip() for x in (lg.stdout or "").splitlines() if x.strip()]
|
|
217
|
+
if not shas:
|
|
218
|
+
return None, "git log -S 未找到引入提交(历史过浅?)"
|
|
219
|
+
intro = shas[-1] # 最早那次引入
|
|
220
|
+
src = _g("git", "show", intro + "^:md_cg/evidence.py")
|
|
221
|
+
if src.returncode != 0:
|
|
222
|
+
return None, "git show %s^ rc=%s(根提交?)" % (intro[:8], src.returncode)
|
|
223
|
+
return src.stdout, ""
|
|
224
|
+
|
|
225
|
+
|
|
226
|
+
def p9():
|
|
227
|
+
print("== P9 缺陷曾真实存在(核对修复前源码原形)==")
|
|
228
|
+
t, err = _prepatch_src()
|
|
229
|
+
if t is None:
|
|
230
|
+
ok(False, "P9 取修复前源失败:%s" % err)
|
|
231
|
+
return
|
|
232
|
+
ok("_node_id_error" not in t,
|
|
233
|
+
"P9a 引入提交的**父版本**无 _node_id_error —— 判据由本修复引入")
|
|
234
|
+
ok("explicit or os.environ.get(NODE_ID_ENV)" in t,
|
|
235
|
+
"P9b 修复前的 node_id() 确为「只 strip、零校验」原形")
|
|
236
|
+
ok("c[\"node_id\"] + \".json\"" in t,
|
|
237
|
+
"P9c 修复前的 publish_card 确为「直接拼路径」原形")
|
|
238
|
+
ok("os.path.realpath(p)" not in t,
|
|
239
|
+
"P9d 修复前无 realpath 包含性判定 —— 越界无第二道防线")
|
|
240
|
+
|
|
241
|
+
|
|
242
|
+
def p9b():
|
|
243
|
+
print("== P9b 空串语义:= 未提供 ⇒ 回落派生(不是穿越形态)==")
|
|
244
|
+
got = E.node_id("R", explicit="")
|
|
245
|
+
ok(isinstance(got, str) and got.startswith("node-"),
|
|
246
|
+
"P9b explicit='' ⇒ 回落派生 node-<hex>(旧行为保持)", got)
|
|
247
|
+
|
|
248
|
+
|
|
249
|
+
def p11():
|
|
250
|
+
print("== P11 汇点纵深防御:两道独立防线都在场 ==")
|
|
251
|
+
with io.open(os.path.join(_REPO, "md_cg", "evidence.py"),
|
|
252
|
+
encoding="utf-8", errors="replace") as f:
|
|
253
|
+
src = f.read()
|
|
254
|
+
# **必须收窄到 publish_card 函数体**:write_pack 里有逐字同形的
|
|
255
|
+
# realpath 包含性判定(#147 引入),全文件 in 匹配会读到那一份而假绿。
|
|
256
|
+
i0 = src.index("def publish_card(")
|
|
257
|
+
i1 = src.index("def peers(")
|
|
258
|
+
body = src[i0:i1]
|
|
259
|
+
ok('_node_id_error(c.get("node_id"))' in body,
|
|
260
|
+
"P11a 第一道:汇点白名单(同 add() 判据)")
|
|
261
|
+
ok("os.path.realpath(p)" in body and "startswith(base + os.sep)" in body,
|
|
262
|
+
"P11b 第二道:realpath 包含性判定")
|
|
263
|
+
# 单去一道不足以转红 P8 —— 这正是「纵深」的含义,如实记录而非隐藏:
|
|
264
|
+
# 变异 V2 必须同时去掉两道才转红;本组保证两道**都**在场。
|
|
265
|
+
print(" 注:单去任一道 P8 仍绿(另一道兜住)——V2 故须同时去掉两道")
|
|
266
|
+
|
|
267
|
+
|
|
268
|
+
def p10():
|
|
269
|
+
print("== P10 判据同源:与写面 add() 白名单一致 ==")
|
|
270
|
+
from .mdcg import _NODE_ID_RE, _NODE_ID_FORBIDDEN
|
|
271
|
+
sample = ("node-abc", "mem_1_a", "中文", "a.b@c", "a,b", "a-b_c",
|
|
272
|
+
"a/b", "..", "x" * 129, "None", "null", "a\b", "C:x")
|
|
273
|
+
mism = []
|
|
274
|
+
for s in sample:
|
|
275
|
+
try:
|
|
276
|
+
E.node_id("R", explicit=s)
|
|
277
|
+
mine = True
|
|
278
|
+
except Exception: # noqa: BLE001
|
|
279
|
+
mine = False
|
|
280
|
+
theirs = bool(isinstance(s, str) and s and len(s) <= 128
|
|
281
|
+
and ".." not in s and s not in _NODE_ID_FORBIDDEN
|
|
282
|
+
and _NODE_ID_RE.match(s))
|
|
283
|
+
if mine != theirs:
|
|
284
|
+
mism.append((s[:20], mine, theirs))
|
|
285
|
+
ok(not mism, "P10 通过集 == add() 白名单通过集(抽样 %d)" % len(sample), mism)
|
|
286
|
+
|
|
287
|
+
|
|
288
|
+
_GROUPS = (p1, p1b, p5b, p6, p7, p8, p9, p9b, p10, p11)
|
|
289
|
+
|
|
290
|
+
|
|
291
|
+
def _run_groups() -> int:
|
|
292
|
+
_PASS.clear()
|
|
293
|
+
_FAIL.clear()
|
|
294
|
+
for g in _GROUPS:
|
|
295
|
+
try:
|
|
296
|
+
g()
|
|
297
|
+
except Exception as exc: # noqa: BLE001
|
|
298
|
+
ok(False, "断言组 %s 抛异常:%s" % (g.__name__, exc))
|
|
299
|
+
import traceback
|
|
300
|
+
print(traceback.format_exc()[-700:])
|
|
301
|
+
return len(_FAIL)
|
|
302
|
+
|
|
303
|
+
|
|
304
|
+
def main() -> int:
|
|
305
|
+
n = _run_groups()
|
|
306
|
+
print("\n证据层 node_id 穿越守卫:%d 通过,%d 失败" % (len(_PASS), n))
|
|
307
|
+
return 1 if n else 0
|
|
308
|
+
|
|
309
|
+
|
|
310
|
+
_MUTATIONS = (
|
|
311
|
+
('V1 去掉入口闸(node_id 恢复零校验)',
|
|
312
|
+
' err = _node_id_error(nid)',
|
|
313
|
+
' err = ""', 'P'),
|
|
314
|
+
('V2 去掉汇点白名单(第一道防线)',
|
|
315
|
+
' err = _node_id_error(c.get("node_id"))',
|
|
316
|
+
' err = ""', 'P11'),
|
|
317
|
+
('V5 去掉 realpath 包含性(第二道防线)',
|
|
318
|
+
' if real != base and not real.startswith(base + os.sep):',
|
|
319
|
+
' if False:', 'P11'),
|
|
320
|
+
('V3 放宽判据(去掉 .. 禁令)',
|
|
321
|
+
' if ".." in nid:',
|
|
322
|
+
' if False:', 'P'),
|
|
323
|
+
('V4 放宽判据(去掉字符白名单)',
|
|
324
|
+
' if not _NODE_ID_RE.match(nid):',
|
|
325
|
+
' if False:', 'P'),
|
|
326
|
+
)
|
|
327
|
+
|
|
328
|
+
def _reload():
|
|
329
|
+
import importlib
|
|
330
|
+
from . import evidence as _m
|
|
331
|
+
importlib.reload(_m)
|
|
332
|
+
globals()["E"] = _m
|
|
333
|
+
|
|
334
|
+
|
|
335
|
+
def _mutate() -> int:
|
|
336
|
+
bad = []
|
|
337
|
+
src_p = os.path.join(_REPO, "md_cg", "evidence.py")
|
|
338
|
+
with io.open(src_p, encoding="utf-8", newline="") as f:
|
|
339
|
+
pristine = f.read()
|
|
340
|
+
# 前置自检:源码必须处于**未变异**态,否则上一轮变异没收干净,本轮判据无意义
|
|
341
|
+
if " err = _node_id_error(nid)" not in pristine:
|
|
342
|
+
print(" SOURCE-ALREADY-MUTATED:evidence.py 入口闸缺失,请先恢复源码再跑 --mutate")
|
|
343
|
+
return 1
|
|
344
|
+
for name, anchor, repl, want in _MUTATIONS:
|
|
345
|
+
with io.open(src_p, encoding="utf-8", newline="") as f:
|
|
346
|
+
orig = f.read()
|
|
347
|
+
NL = "\r\n" if "\r\n" in orig else "\n"
|
|
348
|
+
a_ = anchor.replace("\n", NL)
|
|
349
|
+
r_ = repl.replace("\n", NL)
|
|
350
|
+
try:
|
|
351
|
+
if a_ not in orig:
|
|
352
|
+
print(" ANCHOR-MISS %s" % name)
|
|
353
|
+
bad.append(name)
|
|
354
|
+
continue
|
|
355
|
+
with io.open(src_p, "w", encoding="utf-8", newline="") as f:
|
|
356
|
+
f.write(orig.replace(a_, r_, 1))
|
|
357
|
+
_reload()
|
|
358
|
+
_run_groups()
|
|
359
|
+
reds = list(_FAIL)
|
|
360
|
+
hit = any(r.startswith(want) for r in reds)
|
|
361
|
+
print(" %-4s %-46s 红项=%-3d" % ("OK" if hit else "BAD", name, len(reds)))
|
|
362
|
+
if not hit:
|
|
363
|
+
bad.append(name)
|
|
364
|
+
finally:
|
|
365
|
+
# 从**开头备份**恢复(不是从本轮 orig——那会把上一轮的变异当成基线,
|
|
366
|
+
# 一旦某轮恢复失败,变异态就会被后续每轮"恢复"成新常态)。
|
|
367
|
+
with io.open(src_p, "w", encoding="utf-8", newline="") as f:
|
|
368
|
+
f.write(pristine)
|
|
369
|
+
with io.open(src_p, encoding="utf-8", newline="") as f:
|
|
370
|
+
if f.read() != pristine:
|
|
371
|
+
print(" RESTORE-FAILED %s" % name)
|
|
372
|
+
bad.append(name + "(恢复失败)")
|
|
373
|
+
_reload()
|
|
374
|
+
if bad:
|
|
375
|
+
print("\n定点变异自证:FAIL -- %s" % "、".join(bad))
|
|
376
|
+
return 1
|
|
377
|
+
print("\n定点变异自证:PASS(每处判据都被打红)")
|
|
378
|
+
return 0
|
|
379
|
+
|
|
380
|
+
|
|
381
|
+
if __name__ == "__main__":
|
|
382
|
+
if "--mutate" in sys.argv:
|
|
383
|
+
sys.exit(_mutate())
|
|
384
|
+
sys.exit(main())
|