@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,355 +1,355 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
# 功能名:凭据载体权限收敛「声明与实现一致 + 失败不静默」(⑤)与 unwrap_dek 的 clearance 已文档化事实(⑥)(issue #326)
|
|
3
|
-
# 生效条件:python -X utf8 -m md_cg.test_issue326_key_perms [--mutate];被测面=md_cg/crypto.py 的 _tighten_perms / load_master_key / _save_keys(⑤)与 unwrap_dek、provision_dek、envelopes(⑥)
|
|
4
|
-
# 子功能:A 组=⑤ 两处凭据载体都收敛、失败进有界告警且不上抛、成功不告警、密钥行为不变;K 组=非恒真对照(过度收紧方向:chmod 失败不得阻断密钥生成;正常路径不得恒告警;_save_keys 对账/锁定语义与 provision→unwrap 往返不受扰);E 组=源码面(静默形态退役)+ **⑥ 的三条已文档化事实钉**
|
|
5
|
-
# 执行:--mutate 时在镜像树里逐条改回「静默 chmod」(回缺陷)、「失败即上抛」(过度收紧)、「只修 master.key 不修 _keys.json」(半修),守卫必须按指定项转红
|
|
6
|
-
# 验证方式:全部 PASS 即通过(退出码 0);--mutate 下每条变异的红项集合须与预期**逐项相符**
|
|
7
|
-
# 不适用条件:**不判「是否真的实现了 0600 语义」**——Windows 上 os.chmod 只切只读位是既有事实,本批确立的是「声明与实现一致 + 失败不静默」而非「已隔离」(icacls 方案经编排侧裁定不上);不判 ⑥ 的行为改动(判为有意设计,**只记录不改**);不判 _keys.json 的加密/信封语义
|
|
8
|
-
"""issue #326-⑤⑥ 守卫。
|
|
9
|
-
|
|
10
|
-
⑤ 病象(修前):`load_master_key` 里 `try: os.chmod(path, 0o600) except OSError: pass` ——
|
|
11
|
-
**静默**;且 `_save_keys` 写 `_keys.json` 后**完全无权限收敛**(同为凭据载体,两种待遇)。
|
|
12
|
-
平台事实:Windows 上 `os.chmod` 只切只读位、不产生 POSIX 隔离(真实保护来自用户目录 ACL),
|
|
13
|
-
故本条**不宣称**「已隔离」,只消除**声明与实现不符 + 静默**。
|
|
14
|
-
|
|
15
|
-
⑥ 事实:`unwrap_dek(root, kek, tenant, actor, clearance=None)` 的 `clearance` **从不参与判定**
|
|
16
|
-
(函数体不引用);`provision_dek` 的**位置透传**仅为与签发端签名对称;信封里的 `clearance`
|
|
17
|
-
供 `envelopes()` 审计。该事实**本仓审计已留痕**(`unwrap_dek` 的「生效条件」注释明写),
|
|
18
|
-
编排侧裁定为**有意设计 ⇒ 只记录、不改**(删形参是跨 2 模块的破坏性 API 改动)。
|
|
19
|
-
本守卫的 E 组把这三条钉住:**防后来者误以为它是活鉴权位而去「修」它**。
|
|
20
|
-
|
|
21
|
-
「守卫必须能在变异态下跑完」:取数经包装折成可命名形态,不崩栈。
|
|
22
|
-
"""
|
|
23
|
-
from __future__ import annotations
|
|
24
|
-
|
|
25
|
-
import ast
|
|
26
|
-
import os
|
|
27
|
-
import shutil
|
|
28
|
-
import subprocess
|
|
29
|
-
import sys
|
|
30
|
-
import tempfile
|
|
31
|
-
|
|
32
|
-
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
33
|
-
|
|
34
|
-
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
35
|
-
if _REPO not in sys.path:
|
|
36
|
-
sys.path.insert(0, _REPO)
|
|
37
|
-
|
|
38
|
-
FAILS = []
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
def _check(name, cond, detail=""):
|
|
42
|
-
if cond:
|
|
43
|
-
print(" PASS " + name)
|
|
44
|
-
else:
|
|
45
|
-
print(" FAIL " + name + " " + str(detail)[:220])
|
|
46
|
-
FAILS.append(name)
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
_TMP = tempfile.mkdtemp(prefix="iss326e_")
|
|
50
|
-
os.environ.update({"MDCG_ROOT": _TMP + "/brain", "MDCG_STATE_ROOT": _TMP + "/state",
|
|
51
|
-
"MDCG_AUX_ROOT": _TMP + "/auxstore",
|
|
52
|
-
"MDCG_DATA_ROOT": _TMP + "/datastore",
|
|
53
|
-
"MDCG_EXPORT_ROOT": _TMP, "MDCG_SUSTAIN": "0", "MDCG_SLEEP": "0"})
|
|
54
|
-
|
|
55
|
-
from md_cg import crypto as _c # noqa: E402
|
|
56
|
-
|
|
57
|
-
_REAL_OS = _c.os
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
class _OsShim:
|
|
61
|
-
"""os 模块代理:只覆盖指定函数,其余转发(不改进程全局 os)。"""
|
|
62
|
-
|
|
63
|
-
def __init__(self, **over):
|
|
64
|
-
self._over = over
|
|
65
|
-
|
|
66
|
-
def __getattr__(self, name):
|
|
67
|
-
if name in self._over:
|
|
68
|
-
return self._over[name]
|
|
69
|
-
return getattr(os, name)
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
def _err(fn):
|
|
73
|
-
"""调 fn:正常返回 ("", 结果);抛异常(含 BaseException)返回 (类型名, 异常对象)。"""
|
|
74
|
-
try:
|
|
75
|
-
return "", fn()
|
|
76
|
-
except BaseException as exc: # noqa: BLE001 —— 变异态不得崩栈
|
|
77
|
-
return type(exc).__name__, exc
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
def _fresh_root(tag):
|
|
81
|
-
d = os.path.join(_TMP, tag)
|
|
82
|
-
os.makedirs(d, exist_ok=True)
|
|
83
|
-
return d
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
print("== A 组:⑤ 两处凭据载体都收敛、失败不静默、也不上抛 ==")
|
|
87
|
-
_calls = []
|
|
88
|
-
_c.PERM_WARNINGS.clear()
|
|
89
|
-
_r1 = _fresh_root("root1")
|
|
90
|
-
_mk = os.path.join(_r1, "master.key")
|
|
91
|
-
_real_chmod = os.chmod
|
|
92
|
-
_c.os = _OsShim(chmod=lambda p, m: _calls.append((p, m)))
|
|
93
|
-
_t1, _k1 = _err(lambda: _c.load_master_key(master_file=_mk))
|
|
94
|
-
_c.os = _REAL_OS
|
|
95
|
-
_check("A01 master.key 生成后**调用**权限收敛(path 命中、mode=0o600)",
|
|
96
|
-
_t1 == "" and any(os.path.abspath(p) == os.path.abspath(_mk) and m == 0o600
|
|
97
|
-
for p, m in _calls), (_t1, _calls))
|
|
98
|
-
_check("A02 收敛成功时**不**告警(不得恒告警)", _c.PERM_WARNINGS == [],
|
|
99
|
-
_c.PERM_WARNINGS)
|
|
100
|
-
_calls2 = []
|
|
101
|
-
_c.PERM_WARNINGS.clear()
|
|
102
|
-
_mk2 = os.path.join(_fresh_root("root2"), "master.key")
|
|
103
|
-
_c.os = _OsShim(chmod=lambda p, m: _calls2.append((p, m)))
|
|
104
|
-
_t2, _k2 = _err(lambda: _c.load_master_key(master_file=_mk2))
|
|
105
|
-
_c.os = _REAL_OS
|
|
106
|
-
_check("A03 第二次生成也是同一路径收敛(幂等,不受首次告警影响)",
|
|
107
|
-
_t2 == "" and len(_calls2) == 1 and len(_k2) == 32, (_t2, _calls2))
|
|
108
|
-
# 失败路径:chmod 抛 OSError ⇒ 不上抛 + **不静默**(进有界告警)
|
|
109
|
-
_c.PERM_WARNINGS.clear()
|
|
110
|
-
_mk3 = os.path.join(_fresh_root("root3"), "master.key")
|
|
111
|
-
_c.os = _OsShim(chmod=lambda p, m: (_ for _ in ()).throw(OSError("not permitted")))
|
|
112
|
-
_t3, _k3 = _err(lambda: _c.load_master_key(master_file=_mk3))
|
|
113
|
-
_c.os = _REAL_OS
|
|
114
|
-
_check("A04 chmod 失败**不上抛**(受限平台/只读介质不得阻断启动)且密钥照常产出",
|
|
115
|
-
_t3 == "" and len(_k3) == 32, (_t3, _k3))
|
|
116
|
-
_check("A05 chmod 失败**不静默**:告警含 (path, 异常类型, 文本) 且 path 命中",
|
|
117
|
-
len(_c.PERM_WARNINGS) == 1
|
|
118
|
-
and os.path.abspath(_c.PERM_WARNINGS[0][0]) == os.path.abspath(_mk3)
|
|
119
|
-
and _c.PERM_WARNINGS[0][1] == "OSError", _c.PERM_WARNINGS)
|
|
120
|
-
_check("A06 密钥文件确实落盘且内容非空(失败的是权限收敛,不是写入)",
|
|
121
|
-
os.path.exists(_mk3) and os.path.getsize(_mk3) > 0, "")
|
|
122
|
-
# _keys.json:同为凭据载体,同款收敛
|
|
123
|
-
_calls4 = []
|
|
124
|
-
_c.PERM_WARNINGS.clear()
|
|
125
|
-
_r4 = _fresh_root("root4")
|
|
126
|
-
_c.os = _OsShim(chmod=lambda p, m: _calls4.append((p, m)))
|
|
127
|
-
_t4, _ = _err(lambda: _c._save_keys(_r4, {"v": 1, "alg": "x", "envelopes": {}}))
|
|
128
|
-
_c.os = _REAL_OS
|
|
129
|
-
_kp = _c.keys_path(_r4)
|
|
130
|
-
_check("A07 _keys.json 写入后**也**收敛(修前完全无收敛;与 master.key 同待遇)",
|
|
131
|
-
_t4 == "" and any(os.path.abspath(p) == os.path.abspath(_kp) and m == 0o600
|
|
132
|
-
for p, m in _calls4), (_t4, _calls4, _kp))
|
|
133
|
-
_check("A08 _keys.json 落盘内容正确(收敛不改写入语义)",
|
|
134
|
-
_t4 == "" and os.path.exists(_kp) and _c._load_keys(_r4).get("v") == 1,
|
|
135
|
-
(_t4, _kp))
|
|
136
|
-
|
|
137
|
-
print("== K 组:非恒真对照(过度收紧方向——失败不得阻断、正常路径不得恒告警) ==")
|
|
138
|
-
_c.PERM_WARNINGS.clear()
|
|
139
|
-
_mk5 = os.path.join(_fresh_root("root5"), "master.key")
|
|
140
|
-
_c.os = _OsShim(chmod=lambda p, m: (_ for _ in ()).throw(OSError(13, "denied")))
|
|
141
|
-
_t5, _k5 = _err(lambda: _c.load_master_key(master_file=_mk5))
|
|
142
|
-
_c.os = _REAL_OS
|
|
143
|
-
_check("K01 chmod 失败**不得阻断**密钥生成(返回 key、文件已落盘)",
|
|
144
|
-
_t5 == "" and len(_k5) == 32 and os.path.exists(_mk5), (_t5, _k5))
|
|
145
|
-
_check("K02 失败告警**有界**(重复失败不无限增长)",
|
|
146
|
-
len(_c.PERM_WARNINGS) <= _c._PERM_WARN_LIMIT, len(_c.PERM_WARNINGS))
|
|
147
|
-
_c.PERM_WARNINGS.clear()
|
|
148
|
-
_mk6 = os.path.join(_fresh_root("root6"), "master.key")
|
|
149
|
-
_t6, _k6 = _err(lambda: _c.load_master_key(master_file=_mk6))
|
|
150
|
-
_check("K03 正常路径不告警(真实 chmod 成功时告警列表保持空)",
|
|
151
|
-
_t6 == "" and _c.PERM_WARNINGS == [], (_t6, _c.PERM_WARNINGS))
|
|
152
|
-
_r7 = _fresh_root("root7")
|
|
153
|
-
with open(_c.keys_path(_r7), "w", encoding="utf-8") as f:
|
|
154
|
-
f.write("{broken-json")
|
|
155
|
-
_t7, _e7 = _err(lambda: _c._save_keys(_r7, {"envelopes": {}}))
|
|
156
|
-
_check("K04 _save_keys 的对账契约不受扰(盘面不可解析 ⇒ LockedError,拒绝整份覆盖)",
|
|
157
|
-
_t7 == "LockedError", (_t7, str(_e7)[:80]))
|
|
158
|
-
_r8 = _fresh_root("root8")
|
|
159
|
-
_kek = b"k" * 32
|
|
160
|
-
_t8, _dek8 = _err(lambda: _c.provision_dek(_r8, _kek, "t1", "alice"))
|
|
161
|
-
_t9, _back8 = _err(lambda: _c.unwrap_dek(_r8, _kek, "t1", "alice"))
|
|
162
|
-
_check("K05 provision→unwrap 往返仍解出同一 DEK(⑤ 的收敛不触碰密钥语义)",
|
|
163
|
-
_t8 == "" and _t9 == "" and _back8 == _dek8, (_t8, _t9))
|
|
164
|
-
|
|
165
|
-
print("== E 组:源码面(⑤ 静默形态退役)+ ⑥ 三条已文档化事实钉 ==")
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
def _csrc():
|
|
169
|
-
with open(os.path.join(_REPO, "md_cg/crypto.py"), encoding="utf-8") as f:
|
|
170
|
-
return f.read()
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
_CS = _csrc()
|
|
174
|
-
_tree = ast.parse(_CS)
|
|
175
|
-
_chmod_calls = [n for n in ast.walk(_tree) if isinstance(n, ast.Call)
|
|
176
|
-
and isinstance(n.func, ast.Attribute) and n.func.attr == "chmod"]
|
|
177
|
-
_check("E01 ⑤ 静默形态已退役:全模块只有 **1 处** chmod 调用(在 _tighten_perms 内)",
|
|
178
|
-
len(_chmod_calls) == 1 and "def _tighten_perms(path):" in _CS,
|
|
179
|
-
len(_chmod_calls))
|
|
180
|
-
_check("E02 ⑤ 失败不静默:OSError 分支写入 PERM_WARNINGS(有界)且 return False(不上抛)",
|
|
181
|
-
"PERM_WARNINGS.append(" in _CS and "_PERM_WARN_LIMIT" in _CS, "")
|
|
182
|
-
_tighten_calls = sorted(ast.unparse(n) for n in ast.walk(_tree)
|
|
183
|
-
if isinstance(n, ast.Call) and isinstance(n.func, ast.Name)
|
|
184
|
-
and n.func.id == "_tighten_perms")
|
|
185
|
-
_check("E03 ⑤ 两处凭据载体同待遇:收敛调用点恰为 {master.key, _keys.json}",
|
|
186
|
-
_tighten_calls == ["_tighten_perms(keys_path(root))", "_tighten_perms(path)"],
|
|
187
|
-
_tighten_calls)
|
|
188
|
-
_check("E04 ⑤ Windows 平台事实被**如实文档化**(含 Windows + 只读位/ACL 字样)",
|
|
189
|
-
"Windows" in _CS and ("只读位" in _CS or "ACL" in _CS), "")
|
|
190
|
-
_uw = [n for n in ast.walk(_tree)
|
|
191
|
-
if isinstance(n, ast.FunctionDef) and n.name == "unwrap_dek"]
|
|
192
|
-
_uw_names = set()
|
|
193
|
-
if _uw:
|
|
194
|
-
for _n in ast.walk(_uw[0]):
|
|
195
|
-
if isinstance(_n, ast.Name):
|
|
196
|
-
_uw_names.add(_n.id)
|
|
197
|
-
elif isinstance(_n, ast.Attribute):
|
|
198
|
-
_uw_names.add(_n.attr)
|
|
199
|
-
_uw_args = [a.arg for a in _uw[0].args.args] if _uw else []
|
|
200
|
-
_check("E05 ⑥ 钉①:unwrap_dek 的 clearance **不参与条件判定**(形参在、函数体不引用)",
|
|
201
|
-
bool(_uw) and "clearance" in _uw_args
|
|
202
|
-
and "clearance" not in _uw_names, (_uw_args, sorted(_uw_names)))
|
|
203
|
-
_check("E06 ⑥ 钉②:provision_dek 对 unwrap_dek 的 clearance 仅为**位置透传**(签名对称)",
|
|
204
|
-
"return unwrap_dek(root, kek, tenant, actor, clearance)" in _CS, "")
|
|
205
|
-
_check("E07 ⑥ 钉③:信封存 clearance 供 envelopes() 审计(读方不是判定方)",
|
|
206
|
-
"def envelopes(" in _CS and _CS.count("clearance") >= 4, _CS.count("clearance"))
|
|
207
|
-
_check("E08 ⑥ 已文档化:unwrap_dek 的生效条件注释明写「clearance 形参默认 None 但源码未在条件中使用」",
|
|
208
|
-
"clearance 形参默认 None 但源码未在条件中使用" in _CS, "")
|
|
209
|
-
|
|
210
|
-
shutil.rmtree(_TMP, ignore_errors=True)
|
|
211
|
-
print("")
|
|
212
|
-
if FAILS:
|
|
213
|
-
print("issue #326-⑤⑥ 结果:%d 失败" % len(FAILS))
|
|
214
|
-
else:
|
|
215
|
-
print("issue #326-⑤⑥ 结果:全部通过")
|
|
216
|
-
|
|
217
|
-
# ---------------------------------------------------------------- 定点变异表
|
|
218
|
-
# 锚点跨行用 chr(10) 拼接;_apply_text 按目标文件**实际行尾**折算(crypto.py 为 CRLF)。
|
|
219
|
-
_TIGHTEN_CALL = " _tighten_perms(path)"
|
|
220
|
-
_SILENT = chr(10).join([
|
|
221
|
-
" try:",
|
|
222
|
-
" os.chmod(path, 0o600)",
|
|
223
|
-
" except OSError:",
|
|
224
|
-
" pass",
|
|
225
|
-
])
|
|
226
|
-
_RAISE = chr(10).join([
|
|
227
|
-
" except OSError as e:",
|
|
228
|
-
" if len(PERM_WARNINGS) < _PERM_WARN_LIMIT:",
|
|
229
|
-
" PERM_WARNINGS.append((path, type(e).__name__, str(e)[:120]))",
|
|
230
|
-
" raise",
|
|
231
|
-
])
|
|
232
|
-
_WARN_BLOCK = chr(10).join([
|
|
233
|
-
" except OSError as e:",
|
|
234
|
-
" if len(PERM_WARNINGS) < _PERM_WARN_LIMIT:",
|
|
235
|
-
" PERM_WARNINGS.append((path, type(e).__name__, str(e)[:120]))",
|
|
236
|
-
" return False",
|
|
237
|
-
])
|
|
238
|
-
_KEYS_CALL = " _tighten_perms(keys_path(root))"
|
|
239
|
-
_KEYS_OFF = " # 变异:删掉 _keys.json 的收敛(半修)"
|
|
240
|
-
|
|
241
|
-
_MUTATIONS = (
|
|
242
|
-
# M1 回缺陷(静默):失败不告警 ⇒ A05 转红;裸 chmod 回到调用点 ⇒ E01(chmod 调用数)与
|
|
243
|
-
# E03(收敛调用点集合)同步转红。A04/K01(不上抛)两态皆不抛 ⇒ 恒绿(如实)。
|
|
244
|
-
("M1 回缺陷:chmod 回到静默 try/except pass", "md_cg/crypto.py",
|
|
245
|
-
((_TIGHTEN_CALL, _SILENT),),
|
|
246
|
-
("A05", "E01", "E03")),
|
|
247
|
-
# M2 过度收紧(失败即上抛)⇒ 受限平台上密钥生成被阻断:K01/A04 转红;
|
|
248
|
-
# 告警仍在(A05/A06 绿)——告警与阻断是两件事,本腿只钉后者。
|
|
249
|
-
("M2 过度收紧:收敛失败即上抛(阻断密钥生成)", "md_cg/crypto.py",
|
|
250
|
-
((_WARN_BLOCK, _RAISE),),
|
|
251
|
-
("A04", "K01")),
|
|
252
|
-
# M3 半修(只修 master.key,_keys.json 仍无收敛)⇒ A07 与 E03 转红(两种待遇不一致)。
|
|
253
|
-
("M3 半修:_keys.json 不收敛(凭据载体两样待遇)", "md_cg/crypto.py",
|
|
254
|
-
((_KEYS_CALL, _KEYS_OFF),),
|
|
255
|
-
("A07", "E03")),
|
|
256
|
-
)
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
def _mirror_build():
|
|
260
|
-
dst = tempfile.mkdtemp(prefix="iss326e_mut_")
|
|
261
|
-
for name in ("md_cg", "scripts", "compiler"):
|
|
262
|
-
src = os.path.join(_REPO, name)
|
|
263
|
-
if os.path.isdir(src):
|
|
264
|
-
shutil.copytree(src, os.path.join(dst, name),
|
|
265
|
-
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
266
|
-
for name in sorted(os.listdir(_REPO)):
|
|
267
|
-
p = os.path.join(_REPO, name)
|
|
268
|
-
if os.path.isfile(p) and (name.endswith(".py")
|
|
269
|
-
or name in ("README.md", "pyproject.toml",
|
|
270
|
-
"package.json")):
|
|
271
|
-
shutil.copy2(p, os.path.join(dst, name))
|
|
272
|
-
return dst
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
def _apply_text(text, rel, pairs):
|
|
276
|
-
"""按目标文件实际行尾折算锚点后逐条替换;任一锚点命中数 != 1 返回 (None, 原因)。"""
|
|
277
|
-
eol = (chr(13) + chr(10)) if (chr(13) + chr(10)) in text else chr(10)
|
|
278
|
-
for old, new in pairs:
|
|
279
|
-
o = old.replace(chr(10), eol)
|
|
280
|
-
n = new.replace(chr(10), eol)
|
|
281
|
-
if text.count(o) != 1:
|
|
282
|
-
return None, "锚点在 %s 里命中 %d 次" % (rel, text.count(o))
|
|
283
|
-
text = text.replace(o, n, 1)
|
|
284
|
-
return text, ""
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
def _run_in(tree):
|
|
288
|
-
env = dict(os.environ)
|
|
289
|
-
env["PYTHONPATH"] = tree
|
|
290
|
-
env["PYTHONUTF8"] = "1"
|
|
291
|
-
env["PYTHONDONTWRITEBYTECODE"] = "1"
|
|
292
|
-
for k in ("MDCG_ROOT", "MDCG_STATE_ROOT", "MDCG_AUX_ROOT",
|
|
293
|
-
"MDCG_DATA_ROOT", "MDCG_EXPORT_ROOT"):
|
|
294
|
-
env.pop(k, None)
|
|
295
|
-
pr = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
296
|
-
"md_cg.test_issue326_key_perms"],
|
|
297
|
-
capture_output=True, text=True, encoding="utf-8",
|
|
298
|
-
errors="replace", cwd=tree, env=env, timeout=1800)
|
|
299
|
-
out = (pr.stdout or "") + (pr.stderr or "")
|
|
300
|
-
reds = [ln.split("FAIL ", 1)[1].strip()
|
|
301
|
-
for ln in out.splitlines() if ln.strip().startswith("FAIL ")]
|
|
302
|
-
return pr.returncode, reds, out
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
def _mutate():
|
|
306
|
-
print("!! 定点变异自证:逐条把权限收敛改回静默/过度收紧/半修形态,守卫必须按指定项转红")
|
|
307
|
-
tree = _mirror_build()
|
|
308
|
-
bad = []
|
|
309
|
-
try:
|
|
310
|
-
rc, reds, out = _run_in(tree)
|
|
311
|
-
print(" 未变异镜像基线:rc=%d 红项=%d(必须 rc=0 且 0 红)" % (rc, len(reds)))
|
|
312
|
-
if rc != 0 or reds:
|
|
313
|
-
bad.append("未变异镜像基线即红")
|
|
314
|
-
print(chr(10).join(out.splitlines()[-25:]))
|
|
315
|
-
for desc, rel, pairs, exp in _MUTATIONS:
|
|
316
|
-
p = os.path.join(tree, rel)
|
|
317
|
-
with open(p, encoding="utf-8", newline="") as f:
|
|
318
|
-
bak = f.read()
|
|
319
|
-
mut, why = _apply_text(bak, rel, pairs)
|
|
320
|
-
if mut is None:
|
|
321
|
-
bad.append("%s —— %s" % (desc, why))
|
|
322
|
-
print(" ANCHOR-MISS " + desc + " " + why)
|
|
323
|
-
continue
|
|
324
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
325
|
-
f.write(mut)
|
|
326
|
-
for root, dd, ff in os.walk(tree):
|
|
327
|
-
if os.path.basename(root) == "__pycache__":
|
|
328
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
329
|
-
rc2, reds2, out2 = _run_in(tree)
|
|
330
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
331
|
-
f.write(bak)
|
|
332
|
-
hit = sorted({r.split(" ")[0] for r in reds2})
|
|
333
|
-
if rc2 != 0 and hit == sorted(exp):
|
|
334
|
-
print(" OK %s 红项=%d 指定命中=%s" % (desc, len(reds2), hit))
|
|
335
|
-
else:
|
|
336
|
-
bad.append(desc)
|
|
337
|
-
print(" MISMATCH %s 实际红项=%s 期望=%s rc=%d"
|
|
338
|
-
% (desc, hit, sorted(exp), rc2))
|
|
339
|
-
for r in reds2[:12]:
|
|
340
|
-
print(" FAIL " + r)
|
|
341
|
-
print("定点变异自证:%s(%d 条不合格)" % ("PASS" if not bad else "FAIL", len(bad)))
|
|
342
|
-
for b in bad:
|
|
343
|
-
print(" 不合格:" + b)
|
|
344
|
-
return len(bad)
|
|
345
|
-
finally:
|
|
346
|
-
shutil.rmtree(tree, ignore_errors=True)
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
def main():
|
|
350
|
-
_bad = _mutate() if "--mutate" in sys.argv else 0
|
|
351
|
-
return 1 if (FAILS or _bad) else 0
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
if __name__ == "__main__":
|
|
355
|
-
sys.exit(main())
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
# 功能名:凭据载体权限收敛「声明与实现一致 + 失败不静默」(⑤)与 unwrap_dek 的 clearance 已文档化事实(⑥)(issue #326)
|
|
3
|
+
# 生效条件:python -X utf8 -m md_cg.test_issue326_key_perms [--mutate];被测面=md_cg/crypto.py 的 _tighten_perms / load_master_key / _save_keys(⑤)与 unwrap_dek、provision_dek、envelopes(⑥)
|
|
4
|
+
# 子功能:A 组=⑤ 两处凭据载体都收敛、失败进有界告警且不上抛、成功不告警、密钥行为不变;K 组=非恒真对照(过度收紧方向:chmod 失败不得阻断密钥生成;正常路径不得恒告警;_save_keys 对账/锁定语义与 provision→unwrap 往返不受扰);E 组=源码面(静默形态退役)+ **⑥ 的三条已文档化事实钉**
|
|
5
|
+
# 执行:--mutate 时在镜像树里逐条改回「静默 chmod」(回缺陷)、「失败即上抛」(过度收紧)、「只修 master.key 不修 _keys.json」(半修),守卫必须按指定项转红
|
|
6
|
+
# 验证方式:全部 PASS 即通过(退出码 0);--mutate 下每条变异的红项集合须与预期**逐项相符**
|
|
7
|
+
# 不适用条件:**不判「是否真的实现了 0600 语义」**——Windows 上 os.chmod 只切只读位是既有事实,本批确立的是「声明与实现一致 + 失败不静默」而非「已隔离」(icacls 方案经编排侧裁定不上);不判 ⑥ 的行为改动(判为有意设计,**只记录不改**);不判 _keys.json 的加密/信封语义
|
|
8
|
+
"""issue #326-⑤⑥ 守卫。
|
|
9
|
+
|
|
10
|
+
⑤ 病象(修前):`load_master_key` 里 `try: os.chmod(path, 0o600) except OSError: pass` ——
|
|
11
|
+
**静默**;且 `_save_keys` 写 `_keys.json` 后**完全无权限收敛**(同为凭据载体,两种待遇)。
|
|
12
|
+
平台事实:Windows 上 `os.chmod` 只切只读位、不产生 POSIX 隔离(真实保护来自用户目录 ACL),
|
|
13
|
+
故本条**不宣称**「已隔离」,只消除**声明与实现不符 + 静默**。
|
|
14
|
+
|
|
15
|
+
⑥ 事实:`unwrap_dek(root, kek, tenant, actor, clearance=None)` 的 `clearance` **从不参与判定**
|
|
16
|
+
(函数体不引用);`provision_dek` 的**位置透传**仅为与签发端签名对称;信封里的 `clearance`
|
|
17
|
+
供 `envelopes()` 审计。该事实**本仓审计已留痕**(`unwrap_dek` 的「生效条件」注释明写),
|
|
18
|
+
编排侧裁定为**有意设计 ⇒ 只记录、不改**(删形参是跨 2 模块的破坏性 API 改动)。
|
|
19
|
+
本守卫的 E 组把这三条钉住:**防后来者误以为它是活鉴权位而去「修」它**。
|
|
20
|
+
|
|
21
|
+
「守卫必须能在变异态下跑完」:取数经包装折成可命名形态,不崩栈。
|
|
22
|
+
"""
|
|
23
|
+
from __future__ import annotations
|
|
24
|
+
|
|
25
|
+
import ast
|
|
26
|
+
import os
|
|
27
|
+
import shutil
|
|
28
|
+
import subprocess
|
|
29
|
+
import sys
|
|
30
|
+
import tempfile
|
|
31
|
+
|
|
32
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
33
|
+
|
|
34
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
35
|
+
if _REPO not in sys.path:
|
|
36
|
+
sys.path.insert(0, _REPO)
|
|
37
|
+
|
|
38
|
+
FAILS = []
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
def _check(name, cond, detail=""):
|
|
42
|
+
if cond:
|
|
43
|
+
print(" PASS " + name)
|
|
44
|
+
else:
|
|
45
|
+
print(" FAIL " + name + " " + str(detail)[:220])
|
|
46
|
+
FAILS.append(name)
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
_TMP = tempfile.mkdtemp(prefix="iss326e_")
|
|
50
|
+
os.environ.update({"MDCG_ROOT": _TMP + "/brain", "MDCG_STATE_ROOT": _TMP + "/state",
|
|
51
|
+
"MDCG_AUX_ROOT": _TMP + "/auxstore",
|
|
52
|
+
"MDCG_DATA_ROOT": _TMP + "/datastore",
|
|
53
|
+
"MDCG_EXPORT_ROOT": _TMP, "MDCG_SUSTAIN": "0", "MDCG_SLEEP": "0"})
|
|
54
|
+
|
|
55
|
+
from md_cg import crypto as _c # noqa: E402
|
|
56
|
+
|
|
57
|
+
_REAL_OS = _c.os
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
class _OsShim:
|
|
61
|
+
"""os 模块代理:只覆盖指定函数,其余转发(不改进程全局 os)。"""
|
|
62
|
+
|
|
63
|
+
def __init__(self, **over):
|
|
64
|
+
self._over = over
|
|
65
|
+
|
|
66
|
+
def __getattr__(self, name):
|
|
67
|
+
if name in self._over:
|
|
68
|
+
return self._over[name]
|
|
69
|
+
return getattr(os, name)
|
|
70
|
+
|
|
71
|
+
|
|
72
|
+
def _err(fn):
|
|
73
|
+
"""调 fn:正常返回 ("", 结果);抛异常(含 BaseException)返回 (类型名, 异常对象)。"""
|
|
74
|
+
try:
|
|
75
|
+
return "", fn()
|
|
76
|
+
except BaseException as exc: # noqa: BLE001 —— 变异态不得崩栈
|
|
77
|
+
return type(exc).__name__, exc
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
def _fresh_root(tag):
|
|
81
|
+
d = os.path.join(_TMP, tag)
|
|
82
|
+
os.makedirs(d, exist_ok=True)
|
|
83
|
+
return d
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
print("== A 组:⑤ 两处凭据载体都收敛、失败不静默、也不上抛 ==")
|
|
87
|
+
_calls = []
|
|
88
|
+
_c.PERM_WARNINGS.clear()
|
|
89
|
+
_r1 = _fresh_root("root1")
|
|
90
|
+
_mk = os.path.join(_r1, "master.key")
|
|
91
|
+
_real_chmod = os.chmod
|
|
92
|
+
_c.os = _OsShim(chmod=lambda p, m: _calls.append((p, m)))
|
|
93
|
+
_t1, _k1 = _err(lambda: _c.load_master_key(master_file=_mk))
|
|
94
|
+
_c.os = _REAL_OS
|
|
95
|
+
_check("A01 master.key 生成后**调用**权限收敛(path 命中、mode=0o600)",
|
|
96
|
+
_t1 == "" and any(os.path.abspath(p) == os.path.abspath(_mk) and m == 0o600
|
|
97
|
+
for p, m in _calls), (_t1, _calls))
|
|
98
|
+
_check("A02 收敛成功时**不**告警(不得恒告警)", _c.PERM_WARNINGS == [],
|
|
99
|
+
_c.PERM_WARNINGS)
|
|
100
|
+
_calls2 = []
|
|
101
|
+
_c.PERM_WARNINGS.clear()
|
|
102
|
+
_mk2 = os.path.join(_fresh_root("root2"), "master.key")
|
|
103
|
+
_c.os = _OsShim(chmod=lambda p, m: _calls2.append((p, m)))
|
|
104
|
+
_t2, _k2 = _err(lambda: _c.load_master_key(master_file=_mk2))
|
|
105
|
+
_c.os = _REAL_OS
|
|
106
|
+
_check("A03 第二次生成也是同一路径收敛(幂等,不受首次告警影响)",
|
|
107
|
+
_t2 == "" and len(_calls2) == 1 and len(_k2) == 32, (_t2, _calls2))
|
|
108
|
+
# 失败路径:chmod 抛 OSError ⇒ 不上抛 + **不静默**(进有界告警)
|
|
109
|
+
_c.PERM_WARNINGS.clear()
|
|
110
|
+
_mk3 = os.path.join(_fresh_root("root3"), "master.key")
|
|
111
|
+
_c.os = _OsShim(chmod=lambda p, m: (_ for _ in ()).throw(OSError("not permitted")))
|
|
112
|
+
_t3, _k3 = _err(lambda: _c.load_master_key(master_file=_mk3))
|
|
113
|
+
_c.os = _REAL_OS
|
|
114
|
+
_check("A04 chmod 失败**不上抛**(受限平台/只读介质不得阻断启动)且密钥照常产出",
|
|
115
|
+
_t3 == "" and len(_k3) == 32, (_t3, _k3))
|
|
116
|
+
_check("A05 chmod 失败**不静默**:告警含 (path, 异常类型, 文本) 且 path 命中",
|
|
117
|
+
len(_c.PERM_WARNINGS) == 1
|
|
118
|
+
and os.path.abspath(_c.PERM_WARNINGS[0][0]) == os.path.abspath(_mk3)
|
|
119
|
+
and _c.PERM_WARNINGS[0][1] == "OSError", _c.PERM_WARNINGS)
|
|
120
|
+
_check("A06 密钥文件确实落盘且内容非空(失败的是权限收敛,不是写入)",
|
|
121
|
+
os.path.exists(_mk3) and os.path.getsize(_mk3) > 0, "")
|
|
122
|
+
# _keys.json:同为凭据载体,同款收敛
|
|
123
|
+
_calls4 = []
|
|
124
|
+
_c.PERM_WARNINGS.clear()
|
|
125
|
+
_r4 = _fresh_root("root4")
|
|
126
|
+
_c.os = _OsShim(chmod=lambda p, m: _calls4.append((p, m)))
|
|
127
|
+
_t4, _ = _err(lambda: _c._save_keys(_r4, {"v": 1, "alg": "x", "envelopes": {}}))
|
|
128
|
+
_c.os = _REAL_OS
|
|
129
|
+
_kp = _c.keys_path(_r4)
|
|
130
|
+
_check("A07 _keys.json 写入后**也**收敛(修前完全无收敛;与 master.key 同待遇)",
|
|
131
|
+
_t4 == "" and any(os.path.abspath(p) == os.path.abspath(_kp) and m == 0o600
|
|
132
|
+
for p, m in _calls4), (_t4, _calls4, _kp))
|
|
133
|
+
_check("A08 _keys.json 落盘内容正确(收敛不改写入语义)",
|
|
134
|
+
_t4 == "" and os.path.exists(_kp) and _c._load_keys(_r4).get("v") == 1,
|
|
135
|
+
(_t4, _kp))
|
|
136
|
+
|
|
137
|
+
print("== K 组:非恒真对照(过度收紧方向——失败不得阻断、正常路径不得恒告警) ==")
|
|
138
|
+
_c.PERM_WARNINGS.clear()
|
|
139
|
+
_mk5 = os.path.join(_fresh_root("root5"), "master.key")
|
|
140
|
+
_c.os = _OsShim(chmod=lambda p, m: (_ for _ in ()).throw(OSError(13, "denied")))
|
|
141
|
+
_t5, _k5 = _err(lambda: _c.load_master_key(master_file=_mk5))
|
|
142
|
+
_c.os = _REAL_OS
|
|
143
|
+
_check("K01 chmod 失败**不得阻断**密钥生成(返回 key、文件已落盘)",
|
|
144
|
+
_t5 == "" and len(_k5) == 32 and os.path.exists(_mk5), (_t5, _k5))
|
|
145
|
+
_check("K02 失败告警**有界**(重复失败不无限增长)",
|
|
146
|
+
len(_c.PERM_WARNINGS) <= _c._PERM_WARN_LIMIT, len(_c.PERM_WARNINGS))
|
|
147
|
+
_c.PERM_WARNINGS.clear()
|
|
148
|
+
_mk6 = os.path.join(_fresh_root("root6"), "master.key")
|
|
149
|
+
_t6, _k6 = _err(lambda: _c.load_master_key(master_file=_mk6))
|
|
150
|
+
_check("K03 正常路径不告警(真实 chmod 成功时告警列表保持空)",
|
|
151
|
+
_t6 == "" and _c.PERM_WARNINGS == [], (_t6, _c.PERM_WARNINGS))
|
|
152
|
+
_r7 = _fresh_root("root7")
|
|
153
|
+
with open(_c.keys_path(_r7), "w", encoding="utf-8") as f:
|
|
154
|
+
f.write("{broken-json")
|
|
155
|
+
_t7, _e7 = _err(lambda: _c._save_keys(_r7, {"envelopes": {}}))
|
|
156
|
+
_check("K04 _save_keys 的对账契约不受扰(盘面不可解析 ⇒ LockedError,拒绝整份覆盖)",
|
|
157
|
+
_t7 == "LockedError", (_t7, str(_e7)[:80]))
|
|
158
|
+
_r8 = _fresh_root("root8")
|
|
159
|
+
_kek = b"k" * 32
|
|
160
|
+
_t8, _dek8 = _err(lambda: _c.provision_dek(_r8, _kek, "t1", "alice"))
|
|
161
|
+
_t9, _back8 = _err(lambda: _c.unwrap_dek(_r8, _kek, "t1", "alice"))
|
|
162
|
+
_check("K05 provision→unwrap 往返仍解出同一 DEK(⑤ 的收敛不触碰密钥语义)",
|
|
163
|
+
_t8 == "" and _t9 == "" and _back8 == _dek8, (_t8, _t9))
|
|
164
|
+
|
|
165
|
+
print("== E 组:源码面(⑤ 静默形态退役)+ ⑥ 三条已文档化事实钉 ==")
|
|
166
|
+
|
|
167
|
+
|
|
168
|
+
def _csrc():
|
|
169
|
+
with open(os.path.join(_REPO, "md_cg/crypto.py"), encoding="utf-8") as f:
|
|
170
|
+
return f.read()
|
|
171
|
+
|
|
172
|
+
|
|
173
|
+
_CS = _csrc()
|
|
174
|
+
_tree = ast.parse(_CS)
|
|
175
|
+
_chmod_calls = [n for n in ast.walk(_tree) if isinstance(n, ast.Call)
|
|
176
|
+
and isinstance(n.func, ast.Attribute) and n.func.attr == "chmod"]
|
|
177
|
+
_check("E01 ⑤ 静默形态已退役:全模块只有 **1 处** chmod 调用(在 _tighten_perms 内)",
|
|
178
|
+
len(_chmod_calls) == 1 and "def _tighten_perms(path):" in _CS,
|
|
179
|
+
len(_chmod_calls))
|
|
180
|
+
_check("E02 ⑤ 失败不静默:OSError 分支写入 PERM_WARNINGS(有界)且 return False(不上抛)",
|
|
181
|
+
"PERM_WARNINGS.append(" in _CS and "_PERM_WARN_LIMIT" in _CS, "")
|
|
182
|
+
_tighten_calls = sorted(ast.unparse(n) for n in ast.walk(_tree)
|
|
183
|
+
if isinstance(n, ast.Call) and isinstance(n.func, ast.Name)
|
|
184
|
+
and n.func.id == "_tighten_perms")
|
|
185
|
+
_check("E03 ⑤ 两处凭据载体同待遇:收敛调用点恰为 {master.key, _keys.json}",
|
|
186
|
+
_tighten_calls == ["_tighten_perms(keys_path(root))", "_tighten_perms(path)"],
|
|
187
|
+
_tighten_calls)
|
|
188
|
+
_check("E04 ⑤ Windows 平台事实被**如实文档化**(含 Windows + 只读位/ACL 字样)",
|
|
189
|
+
"Windows" in _CS and ("只读位" in _CS or "ACL" in _CS), "")
|
|
190
|
+
_uw = [n for n in ast.walk(_tree)
|
|
191
|
+
if isinstance(n, ast.FunctionDef) and n.name == "unwrap_dek"]
|
|
192
|
+
_uw_names = set()
|
|
193
|
+
if _uw:
|
|
194
|
+
for _n in ast.walk(_uw[0]):
|
|
195
|
+
if isinstance(_n, ast.Name):
|
|
196
|
+
_uw_names.add(_n.id)
|
|
197
|
+
elif isinstance(_n, ast.Attribute):
|
|
198
|
+
_uw_names.add(_n.attr)
|
|
199
|
+
_uw_args = [a.arg for a in _uw[0].args.args] if _uw else []
|
|
200
|
+
_check("E05 ⑥ 钉①:unwrap_dek 的 clearance **不参与条件判定**(形参在、函数体不引用)",
|
|
201
|
+
bool(_uw) and "clearance" in _uw_args
|
|
202
|
+
and "clearance" not in _uw_names, (_uw_args, sorted(_uw_names)))
|
|
203
|
+
_check("E06 ⑥ 钉②:provision_dek 对 unwrap_dek 的 clearance 仅为**位置透传**(签名对称)",
|
|
204
|
+
"return unwrap_dek(root, kek, tenant, actor, clearance)" in _CS, "")
|
|
205
|
+
_check("E07 ⑥ 钉③:信封存 clearance 供 envelopes() 审计(读方不是判定方)",
|
|
206
|
+
"def envelopes(" in _CS and _CS.count("clearance") >= 4, _CS.count("clearance"))
|
|
207
|
+
_check("E08 ⑥ 已文档化:unwrap_dek 的生效条件注释明写「clearance 形参默认 None 但源码未在条件中使用」",
|
|
208
|
+
"clearance 形参默认 None 但源码未在条件中使用" in _CS, "")
|
|
209
|
+
|
|
210
|
+
shutil.rmtree(_TMP, ignore_errors=True)
|
|
211
|
+
print("")
|
|
212
|
+
if FAILS:
|
|
213
|
+
print("issue #326-⑤⑥ 结果:%d 失败" % len(FAILS))
|
|
214
|
+
else:
|
|
215
|
+
print("issue #326-⑤⑥ 结果:全部通过")
|
|
216
|
+
|
|
217
|
+
# ---------------------------------------------------------------- 定点变异表
|
|
218
|
+
# 锚点跨行用 chr(10) 拼接;_apply_text 按目标文件**实际行尾**折算(crypto.py 为 CRLF)。
|
|
219
|
+
_TIGHTEN_CALL = " _tighten_perms(path)"
|
|
220
|
+
_SILENT = chr(10).join([
|
|
221
|
+
" try:",
|
|
222
|
+
" os.chmod(path, 0o600)",
|
|
223
|
+
" except OSError:",
|
|
224
|
+
" pass",
|
|
225
|
+
])
|
|
226
|
+
_RAISE = chr(10).join([
|
|
227
|
+
" except OSError as e:",
|
|
228
|
+
" if len(PERM_WARNINGS) < _PERM_WARN_LIMIT:",
|
|
229
|
+
" PERM_WARNINGS.append((path, type(e).__name__, str(e)[:120]))",
|
|
230
|
+
" raise",
|
|
231
|
+
])
|
|
232
|
+
_WARN_BLOCK = chr(10).join([
|
|
233
|
+
" except OSError as e:",
|
|
234
|
+
" if len(PERM_WARNINGS) < _PERM_WARN_LIMIT:",
|
|
235
|
+
" PERM_WARNINGS.append((path, type(e).__name__, str(e)[:120]))",
|
|
236
|
+
" return False",
|
|
237
|
+
])
|
|
238
|
+
_KEYS_CALL = " _tighten_perms(keys_path(root))"
|
|
239
|
+
_KEYS_OFF = " # 变异:删掉 _keys.json 的收敛(半修)"
|
|
240
|
+
|
|
241
|
+
_MUTATIONS = (
|
|
242
|
+
# M1 回缺陷(静默):失败不告警 ⇒ A05 转红;裸 chmod 回到调用点 ⇒ E01(chmod 调用数)与
|
|
243
|
+
# E03(收敛调用点集合)同步转红。A04/K01(不上抛)两态皆不抛 ⇒ 恒绿(如实)。
|
|
244
|
+
("M1 回缺陷:chmod 回到静默 try/except pass", "md_cg/crypto.py",
|
|
245
|
+
((_TIGHTEN_CALL, _SILENT),),
|
|
246
|
+
("A05", "E01", "E03")),
|
|
247
|
+
# M2 过度收紧(失败即上抛)⇒ 受限平台上密钥生成被阻断:K01/A04 转红;
|
|
248
|
+
# 告警仍在(A05/A06 绿)——告警与阻断是两件事,本腿只钉后者。
|
|
249
|
+
("M2 过度收紧:收敛失败即上抛(阻断密钥生成)", "md_cg/crypto.py",
|
|
250
|
+
((_WARN_BLOCK, _RAISE),),
|
|
251
|
+
("A04", "K01")),
|
|
252
|
+
# M3 半修(只修 master.key,_keys.json 仍无收敛)⇒ A07 与 E03 转红(两种待遇不一致)。
|
|
253
|
+
("M3 半修:_keys.json 不收敛(凭据载体两样待遇)", "md_cg/crypto.py",
|
|
254
|
+
((_KEYS_CALL, _KEYS_OFF),),
|
|
255
|
+
("A07", "E03")),
|
|
256
|
+
)
|
|
257
|
+
|
|
258
|
+
|
|
259
|
+
def _mirror_build():
|
|
260
|
+
dst = tempfile.mkdtemp(prefix="iss326e_mut_")
|
|
261
|
+
for name in ("md_cg", "scripts", "compiler"):
|
|
262
|
+
src = os.path.join(_REPO, name)
|
|
263
|
+
if os.path.isdir(src):
|
|
264
|
+
shutil.copytree(src, os.path.join(dst, name),
|
|
265
|
+
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
266
|
+
for name in sorted(os.listdir(_REPO)):
|
|
267
|
+
p = os.path.join(_REPO, name)
|
|
268
|
+
if os.path.isfile(p) and (name.endswith(".py")
|
|
269
|
+
or name in ("README.md", "pyproject.toml",
|
|
270
|
+
"package.json")):
|
|
271
|
+
shutil.copy2(p, os.path.join(dst, name))
|
|
272
|
+
return dst
|
|
273
|
+
|
|
274
|
+
|
|
275
|
+
def _apply_text(text, rel, pairs):
|
|
276
|
+
"""按目标文件实际行尾折算锚点后逐条替换;任一锚点命中数 != 1 返回 (None, 原因)。"""
|
|
277
|
+
eol = (chr(13) + chr(10)) if (chr(13) + chr(10)) in text else chr(10)
|
|
278
|
+
for old, new in pairs:
|
|
279
|
+
o = old.replace(chr(10), eol)
|
|
280
|
+
n = new.replace(chr(10), eol)
|
|
281
|
+
if text.count(o) != 1:
|
|
282
|
+
return None, "锚点在 %s 里命中 %d 次" % (rel, text.count(o))
|
|
283
|
+
text = text.replace(o, n, 1)
|
|
284
|
+
return text, ""
|
|
285
|
+
|
|
286
|
+
|
|
287
|
+
def _run_in(tree):
|
|
288
|
+
env = dict(os.environ)
|
|
289
|
+
env["PYTHONPATH"] = tree
|
|
290
|
+
env["PYTHONUTF8"] = "1"
|
|
291
|
+
env["PYTHONDONTWRITEBYTECODE"] = "1"
|
|
292
|
+
for k in ("MDCG_ROOT", "MDCG_STATE_ROOT", "MDCG_AUX_ROOT",
|
|
293
|
+
"MDCG_DATA_ROOT", "MDCG_EXPORT_ROOT"):
|
|
294
|
+
env.pop(k, None)
|
|
295
|
+
pr = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
296
|
+
"md_cg.test_issue326_key_perms"],
|
|
297
|
+
capture_output=True, text=True, encoding="utf-8",
|
|
298
|
+
errors="replace", cwd=tree, env=env, timeout=1800)
|
|
299
|
+
out = (pr.stdout or "") + (pr.stderr or "")
|
|
300
|
+
reds = [ln.split("FAIL ", 1)[1].strip()
|
|
301
|
+
for ln in out.splitlines() if ln.strip().startswith("FAIL ")]
|
|
302
|
+
return pr.returncode, reds, out
|
|
303
|
+
|
|
304
|
+
|
|
305
|
+
def _mutate():
|
|
306
|
+
print("!! 定点变异自证:逐条把权限收敛改回静默/过度收紧/半修形态,守卫必须按指定项转红")
|
|
307
|
+
tree = _mirror_build()
|
|
308
|
+
bad = []
|
|
309
|
+
try:
|
|
310
|
+
rc, reds, out = _run_in(tree)
|
|
311
|
+
print(" 未变异镜像基线:rc=%d 红项=%d(必须 rc=0 且 0 红)" % (rc, len(reds)))
|
|
312
|
+
if rc != 0 or reds:
|
|
313
|
+
bad.append("未变异镜像基线即红")
|
|
314
|
+
print(chr(10).join(out.splitlines()[-25:]))
|
|
315
|
+
for desc, rel, pairs, exp in _MUTATIONS:
|
|
316
|
+
p = os.path.join(tree, rel)
|
|
317
|
+
with open(p, encoding="utf-8", newline="") as f:
|
|
318
|
+
bak = f.read()
|
|
319
|
+
mut, why = _apply_text(bak, rel, pairs)
|
|
320
|
+
if mut is None:
|
|
321
|
+
bad.append("%s —— %s" % (desc, why))
|
|
322
|
+
print(" ANCHOR-MISS " + desc + " " + why)
|
|
323
|
+
continue
|
|
324
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
325
|
+
f.write(mut)
|
|
326
|
+
for root, dd, ff in os.walk(tree):
|
|
327
|
+
if os.path.basename(root) == "__pycache__":
|
|
328
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
329
|
+
rc2, reds2, out2 = _run_in(tree)
|
|
330
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
331
|
+
f.write(bak)
|
|
332
|
+
hit = sorted({r.split(" ")[0] for r in reds2})
|
|
333
|
+
if rc2 != 0 and hit == sorted(exp):
|
|
334
|
+
print(" OK %s 红项=%d 指定命中=%s" % (desc, len(reds2), hit))
|
|
335
|
+
else:
|
|
336
|
+
bad.append(desc)
|
|
337
|
+
print(" MISMATCH %s 实际红项=%s 期望=%s rc=%d"
|
|
338
|
+
% (desc, hit, sorted(exp), rc2))
|
|
339
|
+
for r in reds2[:12]:
|
|
340
|
+
print(" FAIL " + r)
|
|
341
|
+
print("定点变异自证:%s(%d 条不合格)" % ("PASS" if not bad else "FAIL", len(bad)))
|
|
342
|
+
for b in bad:
|
|
343
|
+
print(" 不合格:" + b)
|
|
344
|
+
return len(bad)
|
|
345
|
+
finally:
|
|
346
|
+
shutil.rmtree(tree, ignore_errors=True)
|
|
347
|
+
|
|
348
|
+
|
|
349
|
+
def main():
|
|
350
|
+
_bad = _mutate() if "--mutate" in sys.argv else 0
|
|
351
|
+
return 1 if (FAILS or _bad) else 0
|
|
352
|
+
|
|
353
|
+
|
|
354
|
+
if __name__ == "__main__":
|
|
355
|
+
sys.exit(main())
|