fix: address review 414 write consent and native ownership boundaries

This commit is contained in:
阿白叔 committed 2026-11-13 17:32:14 +08:00
1 parent 1572e2d8ca
commit fee4a67ff1
19 files changed
+1008 -64

No files matched your search

@@ -0,0 +1,430 @@
{
"schema_version": 1,
"created": "2026-11-13T17:31:37.910526+08:00",
"review": "https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-414",
"base_commit": "1572e2d8cab905c28f96f562851db00ef7ea8ad6",
"environment": {
"windows": [
"11",
"10.0.26200",
"SP0",
"Multiprocessor Free"
],
"python": "3.12.10",
"mentor": "EE7.9.5"
},
"commands": [
"python -X utf8 F:/CbbReview414/run_tests.py tests --junitxml=F:/CbbReview414/full-final.xml",
"python -X utf8 F:/CbbReview414/run_tests.py tests/test_review414_write_admission.py --junitxml=F:/CbbReview414/admission-extra.xml",
"python -X utf8 -m compileall -q src tests",
"git diff --check",
"python -X utf8 F:/CbbReview414/build.py",
"python -X utf8 F:/CbbReview414/verify_bundle.py",
"python -X utf8 F:/CbbReview414/create_library.py",
"python -X utf8 F:/CbbReview414/driver7.py"
],
"full_suite": {
"path": "F:\\CbbReview414\\full-final.xml",
"sha256": "075f7b76002b451a72af65d64428c0b6c65e5fa5c8776036a5fff55584a6dc54",
"tests": 1912,
"failures": 0,
"errors": 0,
"skipped": 0,
"seconds": 520.549
},
"additional_admission_suite": {
"path": "F:\\CbbReview414\\admission-extra.xml",
"sha256": "6aa78606fc7aa4af1b3e2f8865752a60a518d9d25b5f88924f2b1d88280b2ac0",
"tests": 14,
"failures": 0,
"errors": 0,
"skipped": 0,
"seconds": 5.299
},
"focused_serial_suite": {
"path": "F:\\CbbReview414\\focused-serial-final.xml",
"sha256": "8f68dc1ffd22d41f343299ff4382157c5fcb7ce68dc5198d2755a87dc1764337",
"tests": 19,
"failures": 0,
"errors": 0,
"skipped": 0,
"seconds": 5.036
},
"concurrent_test_failure": {
"result": {
"path": "F:\\CbbReview414\\focused-final.xml",
"sha256": "6246c57aee87142dae183aa48399ff2e3f8e8afbff0c4f6f3655d02b93b535fa",
"tests": 19,
"failures": 4,
"errors": 0,
"skipped": 0,
"seconds": 7.213
},
"reason": "Coordinator ran mutex-using tests during live native acceptance; four management/recovery tests were rejected by Local\\CbbRefreshVerify795. Rerun serially after native trial."
},
"count_note": "Full suite collected 1912 before two additional tests were appended. Additional 14-test run includes both new tests and 12 already in full suite; 1914 distinct tests passed.",
"compileall_passed": true,
"diff_check_passed": true,
"bundle": {
"module_count": 66,
"source_and_frozen_code_equal": true,
"source_sha256_checked": true,
"packaged_assets_equal": true,
"exe_icon_images_equal": true,
"executable_sha256": "818decc5f0778a27affe3b047da526595007608e234b89c05d3e1c375e1c4cf8"
},
"red_reproductions": [
{
"path": "F:\\CbbReview414\\open-red.xml",
"sha256": "b33502766075ece9777ceee3f6e7dde66dfb558eff08a5f860ccc0ebd63f9500"
},
{
"path": "F:\\CbbReview414\\queue-red.xml",
"sha256": "a5bbad8641c7851a5fa3a4bdd15b17784c9c90c92ee4f8c8fc7e51b62ae25f40"
},
{
"path": "F:\\CbbReview414\\write-red.xml",
"sha256": "4d0b0c6ebb0382955470ecb6072126b1d4f0708e6f77c49060c5be6b592220d7"
},
{
"path": "F:\\CbbReview414\\query-batch-red.xml",
"sha256": "6299777fd6d3c87849b0b7069afb0d238d4f4f20f84d7cdea59b81f4a479694f"
},
{
"path": "F:\\CbbReview414\\export-red.xml",
"sha256": "16724c8a015b5cb1c2d304abe6f5678716a4b4d40fd29880cb6f8a2ade451462"
},
{
"path": "F:\\CbbReview414\\restore-consent-red.xml",
"sha256": "e9e2edad0c3481bea26c00c14253c9fa9b2e2bbcb3679583e52489ac3072f571"
},
{
"path": "F:\\CbbReview414\\default-cancel-red.xml",
"sha256": "2e4b9b64d9a7fe8c719b08db407b78e6c866a647040761c1be36d566b86dca36"
}
],
"native_trial": {
"records": [
{
"operation": "add",
"name": "1GPHY_RTL8211F_A",
"status": "CANCELLED",
"safe_to_continue": true,
"detail": "已取消本批次,未提交后续写入。",
"evidence_path": "F:\\CbbReview414\\d7\\management\\management-00175f4d987f48da80bb7821017e7617\\checkpoint.json"
},
{
"operation": "add",
"name": "1GPHY_RTL8211F_A",
"status": "SKIPPED",
"safe_to_continue": true,
"detail": "用户跳过本项,未确认未知程序与目标库无关。",
"evidence_path": "F:\\CbbReview414\\d7\\management\\management-26da6781691c47c7a8172b5947db7191\\checkpoint.json"
},
{
"operation": "add",
"name": "1GPHY_RTL8211F",
"status": "UPLOADED",
"safe_to_continue": true,
"detail": "上传已确认;本批次未启用自动校验。\n原生注册、工程关联、顶层块和 Layout 已确认;未核验原理图语义。其他工程文件有差异,已记录供核对。",
"evidence_path": "F:\\CbbReview414\\d7\\management\\management-2a587eeb2919405d9b570df82ff75a2a\\checkpoint.json"
}
],
"choices": [
"cancel",
"skip",
"continue"
],
"catalog": {
"library": "F:\\CbbReview414\\library\\native-add\\fixture\\mentor_lib.lmc",
"flow": 1,
"safe_to_continue": true,
"names": [
"1GPHY_RTL8211F"
]
},
"sources_unchanged": true,
"parked_untouched_until_explicit_user_close": true,
"user_closed_owned_empty_client_before_continue": true,
"evidence": {
"path": "F:\\CbbReview414\\native-trial.json",
"sha256": "ecb21df8fd56755dd3bdc6374fa82b5623c523c396314a1c049c225fc82559df"
}
},
"native_action_log": {
"path": "F:\\CbbReview414\\actions7.jsonl",
"sha256": "4ee465d2750b826de428693f89fe0cd9d19f67e5ad08c0fb11451184a883faf2"
},
"superseded_drivers": {
"reason": "UIA traversal of disabled parent during modal prompt stalled the driver. Native windows were cancelled normally; no forced native termination.",
"logs": [
{
"path": "F:\\CbbReview414\\accept4.log",
"sha256": "f551539adec4e38072a58eff9e1a8c7589d926f2f120342a101f8476450b4b12"
},
{
"path": "F:\\CbbReview414\\accept5.log",
"sha256": "d2db6fa91df459d367900832a10c15459ba1ea8fb2a3773c29593c875597a03e"
}
]
},
"rejected_native_trial": {
"log": {
"path": "F:\\CbbReview414\\accept6.log",
"sha256": "73cf87c9328d2e4104077f36ecfbdc383ef67d5d5e54674f640d88d8e5a9de16"
},
"statuses": [
"CANCELLED",
"SKIPPED",
"UPLOAD_FAILED"
],
"reason": "Existing native _catalog_com refuses any preexisting LibraryManager even after write consent.",
"no_force_termination": true,
"foreign_client_untouched": true
},
"interaction_method": "Private desktop Win32 keyboard messages for modal owner decisions; UIA for idle dialogs only. Skip/Continue key routing separately verified against actual Qt dialog.",
"history_provenance": [
{
"tests": 1775,
"record_commit": "fdd07224aac99bee8d1f29e8e82d6a2c49964c87",
"record": "2026-11-09-full-review-followup-validation.json",
"manifest": null,
"recorded_manifest_checked_files": 27,
"manifest_mismatches": [],
"exact_historical_tree_available": false,
"collection_exit": 0,
"collection_summary": "1775 tests collected in 12.12s"
},
{
"tests": 1851,
"record_commit": "42d0cebc54191681b53dcecb120f53236c1963bb",
"record": "2026-11-12-native-acceptance-validation.json",
"manifest": "F:/CbbAccept-20261112/candidate-release4/source-sha256.json",
"recorded_manifest_checked_files": 70,
"manifest_mismatches": [],
"exact_historical_tree_available": false,
"collection_exit": 0,
"collection_summary": "1851 tests collected in 11.38s"
},
{
"tests": 1880,
"record_commit": "466f400514acc8531a219db8e75641be35304a3f",
"record": "2026-11-12-scoped-release-validation.json",
"manifest": "F:/CbbAccept-20261112/candidate-scoped10/source-sha256.json",
"recorded_manifest_checked_files": 72,
"manifest_mismatches": [],
"exact_historical_tree_available": false,
"collection_exit": 0,
"collection_summary": "1880 tests collected in 13.05s"
}
],
"independent_review": "Both findings fixed; final static review reported no additional actionable findings.",
"tested_files_sha256": {
"src/cbb_refresh_verify/application.py": "62b9b013563a216d020c8366cccb8f949b02afa72dc63c26940804441cc23057",
"src/cbb_refresh_verify/backup_recovery.py": "08ca467304f8ce34185212a92de0ebd0b83455302fe9351d09874b180222b523",
"src/cbb_refresh_verify/batch_status.py": "55a4007cf54491ca8e045a5bf86aa4353ac8437cca5a76cd79304962e3d3fa0a",
"src/cbb_refresh_verify/close_failed_block.vbs": "e5f0d9678e07a239e96e634b90cdc761de52fc136311fae31484fa38d6fd9781",
"src/cbb_refresh_verify/com_runtime.py": "f0f3802d16c791a8bf9dfef44a94917072bfbe8fb3a927d76be8ef0341c7ed35",
"src/cbb_refresh_verify/content_check.py": "8239c17b6e2452917ed573a7deb3e4c8583eaef91bf3630eff5f424d2e398aa9",
"src/cbb_refresh_verify/defaults.py": "a1c03192f4a61ad0924b24bb635705b1ee4811d35483a02864200f95edbbebe3",
"src/cbb_refresh_verify/desktop_worker.py": "27d751816552d215dd8ee9cd67941d824f7b4493120ead7c3f87e5eba5ec4a92",
"src/cbb_refresh_verify/diagnostic_open.py": "d6c49ffe5a9969d95edbbc896d47a7e100f248380a287f99ba7bb8b92dbb3072",
"src/cbb_refresh_verify/dialog_agent.py": "5acb6e5cf1350a7ca20a6fe480668435fac785835874f266881973010db6504b",
"src/cbb_refresh_verify/dialog_models.py": "f68cee01d927b48364276d3c1f79e63ce8af231878db0b907d292780cfbafb56",
"src/cbb_refresh_verify/dialog_probe.py": "d61f0c955c961980c9635940eefb9c7947c1fe90b4b6fd844720df41ddb0aa0e",
"src/cbb_refresh_verify/dialog_rules.py": "3189b476f7ff4678b59212ed7b4081164e038a7cf7662cd895f9019cb3c1edc5",
"src/cbb_refresh_verify/dialog_supervisor.py": "15c415c2d2e916f0b64ba04416164ff3b50996d70b22d3b4ac2226b5547ac247",
"src/cbb_refresh_verify/failed_session.py": "7e6f7fa5ebcf2d49f00c5efc5f5d26412704b68e9122e476ac1f672009a98c09",
"src/cbb_refresh_verify/icdb_maintenance.py": "e81d253d8b4d3e7c1000c45335a392c72b110748675c2c3324ebe524a7252e98",
"src/cbb_refresh_verify/icdb_ownership.py": "7bf2342c1efa34a2ebcbf27964a40a490220f7146fbb6ef957b8d8dd1e511f03",
"src/cbb_refresh_verify/icdb_recovery.py": "358c0e9a004f1e0b2127513286e1dffd94b0180a8b7314aa9655462f570b6360",
"src/cbb_refresh_verify/integration.py": "f188856af69ba25e265988c51db7a6d4263326440d972ca78378b733b891c1ed",
"src/cbb_refresh_verify/library_lock.py": "6836ec8ac21e788eb75326ff44cb31ad4bdfb5f381bd35cdf33e6b34c7fca89e",
"src/cbb_refresh_verify/library_manager_verify.py": "71e16a8581ad44b646be78b480f9812d596a6d162b3eec03d078bf4ea4503195",
"src/cbb_refresh_verify/library_reader.py": "d4007caa361edd467773e49f721e02671d5a9bcb30741769a57349850b12c438",
"src/cbb_refresh_verify/maintenance_entry.py": "3b93c25f69d7a961facd8004e20e155a84cc18f06d57b741a9055786ed058990",
"src/cbb_refresh_verify/management.py": "7ead9bfffeb44201e44f73d9f039590f091e9a456982f2110dca8ec3695f8803",
"src/cbb_refresh_verify/management_transaction.py": "32c53caaead05d5db3a31d3e30721e65434e5837095dc0a7812f825603aa37a0",
"src/cbb_refresh_verify/mentor_adapter.py": "1fc8c98d5508120e03bf001a42dd3e0da7b165eb18c90f1aed83147d17db8638",
"src/cbb_refresh_verify/mentor_paths.py": "ba48c0003b3eacc88906497b2e43b299ca4536a9f7dae44bbacf6a6ec694c116",
"src/cbb_refresh_verify/models.py": "9e8209a8b006df923f1d07ccab64bbcfe5d674c4fc5f5426bfbc9b11da4ee105",
"src/cbb_refresh_verify/native_add_failures.py": "192202732423dc624c5548c75e80bb20973e5087c21d4798c9637f25b6de7e94",
"src/cbb_refresh_verify/native_backup.py": "7276fa3d9298e85550151cf0c7191d84bd08a18a72df5d854a3c38f1a88b001d",
"src/cbb_refresh_verify/native_engineering_identity.py": "e704e8f56c43629a1593d490776af328bb032208ee2f5ffd1d1be6c3114f5412",
"src/cbb_refresh_verify/native_export_guard.py": "523cdf44db8e1665634feadba963ccf26777dc8942fb2eb604d2c30bbe92cbb6",
"src/cbb_refresh_verify/native_management.py": "1e8a298aac8c63aef68b1e799d1f06e43de7abdc165be5086e7089a61e643e88",
"src/cbb_refresh_verify/native_occupancy.py": "7d686079d12217382adace6361cd343d977b91075e3b157cf410ca92d07ffc49",
"src/cbb_refresh_verify/native_repair.py": "9f024dcb5e3a76369191033474fefd30787b6ae350c315f3cf38e92e5a1f3e98",
"src/cbb_refresh_verify/native_repair_ui.py": "3eb2af181befea94af8b3b3131edff09589f340bcba777abbe3b67fd31b80393",
"src/cbb_refresh_verify/network_path.py": "6b5b159502d42a46bf4ee26d5698fd2c6498b359088e2138eae46e9065b13c6f",
"src/cbb_refresh_verify/operation_lifecycle.py": "3838c5a501711d16f578c45ebbc6f960872b0c3ba6bbda9a597f994ef746cef6",
"src/cbb_refresh_verify/operation_queue.py": "a6932d8bc68ac436091f6d362557c66d274ec52d0f295a22f014a3396845c79f",
"src/cbb_refresh_verify/owner_probe.py": "8dcfd60246cb2979db34d02e0a2d605c334b6f7e2666f22daa2f50c0408bc903",
"src/cbb_refresh_verify/pcb_bridge.py": "2f6c2b09642100468814500569dbfc6695fc2a46b9a3b8333daa8e1530cdeef5",
"src/cbb_refresh_verify/pcb_open_consent.py": "2680930acc4daa314529c435337915333c05a8594ec28bc053c930054602590f",
"src/cbb_refresh_verify/pcb_restore_prompt.py": "39e0b8623a838911eff61066f3e9c8ede4364dbf73efc5a8994197ec72a96488",
"src/cbb_refresh_verify/post_repair_consent.py": "3b1eaff1db58fd311a9dbc5fdcd850911b04cc5afd4e747f70a62b721b8fafa4",
"src/cbb_refresh_verify/post_verify_diagnostics.py": "2442de485bc0d6a34c4b2d9b10bc5f323ea38f9ff66674119a50f5c6043bac63",
"src/cbb_refresh_verify/reimport_recovery.py": "ef148549751fa47518f5f2ca8f32ba25794ec5f22e0de545476ea33f89a3f0bf",
"src/cbb_refresh_verify/residual_sessions.py": "4ac500b33b209611d54eb496c6c30727ba159742d625431ceea84471a5fc3442",
"src/cbb_refresh_verify/runtime_logging.py": "44ac25430a89c5ffc9e48e88c227e88052f4c815365e8556f67918f3edaba39e",
"src/cbb_refresh_verify/runtime_timing.py": "c4ed4057b5000e0b86ccc7dd1fe2004d6e0dae29f397fec77b01ad41a81c6367",
"src/cbb_refresh_verify/save_verified_block.vbs": "926175562ef82bb2e732231dbc18d8a88059c7e6143c9f4e502cabfd0d170bcd",
"src/cbb_refresh_verify/scoped_manifest.py": "9318bf0f929d23c18466a25d83a4a9903822093c123aae10510061788c6d0ab7",
"src/cbb_refresh_verify/session_record.py": "2bc3cff365008864584138a4ff13538bb6b2f90d981e7d008a1300f9102c6e7e",
"src/cbb_refresh_verify/status_bridge.py": "05d627d02934a14f5de409472c291d37565a95b836f9c130111aae80612e9196",
"src/cbb_refresh_verify/verify_diagnostics.py": "041b77d7d49e4c86338ed5e5741d0d27a2c42bc358f4da54b3efe64af847e9b8",
"src/cbb_refresh_verify/verify_probe.py": "3ed743df49d195c74f5045985ab23491d103ee2c42c07b558c1e037176402ed2",
"src/cbb_refresh_verify/verify_runner.py": "3027ef7fc1ef6365ff36ae0c83389d869b92ffcd96985d10275bca4dc9483e3f",
"src/cbb_refresh_verify/write_admission.py": "e38b460370596f49499fbda3033b2962dda125aa62862fd2327bf6d376d192b9",
"src/cbb_refresh_verify/__init__.py": "dd960394d88657820dba858792abf0de258e05efceb08ae2f0b39c6ad78bc469",
"src/cbb_refresh_verify/__main__.py": "dc4be034a0e43d4b659a9300137c29a6a6b7a32b7eaef02b6dff9a88c41305c0",
"src/cbb_refresh_verify/assets/cbb_refresh_verify.ico": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6",
"src/cbb_refresh_verify/assets/cbb_refresh_verify.png": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8",
"src/cbb_refresh_verify/assets/cbb_refresh_verify.svg": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328",
"src/cbb_refresh_verify/assets/dialog_rules.v1.json": "3911080fc799a819662e225a7ad73e883abd8dcc9936cc30ec1b2d6d51a03c6e",
"src/cbb_refresh_verify/ui/backup_notice.py": "1a3fa5ac18a267907faf95f36d61b9f08bcbb939eef4d480dd06af1391a81599",
"src/cbb_refresh_verify/ui/backup_recovery_dialog.py": "ba30b79cd652b74b6e8f438d6bd5f0fc0229594ff4be2358f81c6dd3cb82e77a",
"src/cbb_refresh_verify/ui/icdb_check_task.py": "ade3bf414aa29b42f4c1535c613b2cacb2735f6abc7900e6da25999390a5891d",
"src/cbb_refresh_verify/ui/main_window.py": "2c919badeeee0280e49387b88b058555a9fa6ace04835c094fccd782bf0af9c0",
"src/cbb_refresh_verify/ui/management_dialog.py": "8e2024957be874905685167c7eab440ecee9320170c1553340025b10fa1754d6",
"src/cbb_refresh_verify/ui/pcb_open_dialog.py": "3cabdc15f1b2abaeb919a7f29f32d4b053186701fd514646d9bdd3ea32f364f6",
"src/cbb_refresh_verify/ui/pcb_restore_dialog.py": "b7228d828df235ac51502dc68760d28c4896af02c780e9806e11c32dba7f62da",
"src/cbb_refresh_verify/ui/residual_release_dialog.py": "1d2a26bfc7ee21b11d7edbc3074b4c525e8c9fb628bca45b08bd06fc672586c8",
"src/cbb_refresh_verify/ui/workers.py": "4cc9360a4820ded27a7d5ef709fc9f04b1d4804cb1e7a614f6c357ed547da888",
"src/cbb_refresh_verify/ui/write_owner_dialog.py": "c77f4d57e683fa397a39a573171198922f6158e19a8a96ca3627af60b5a8963f",
"src/cbb_refresh_verify/ui/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"tests/button_simulation.py": "3278868565853001103557d5f7ada42b11b05c03feb9032deed0327b6609de2b",
"tests/CBBRefresh.Core.Tests.ps1": "e90774cde77189bc577ee374b50a8cc951740d2d3c36c786c73abbd128181a59",
"tests/ContentCheck.ExitCode.Tests.ps1": "efa0d1e8a77715932670ab8ac299984e023867d07ff57b09fc7da6d68c4d6fd9",
"tests/test_abnormal_shutdown.py": "0abdeaf51e2ffc3f771e09aefa9ec647a72b7f64757c9f3851926fbd392cbbcd",
"tests/test_all_buttons.py": "897ae449a15fe36fb6198a947575609346d5ce1a22c0a8c4d2950b9f00035d4f",
"tests/test_application.py": "bba12187fca6fee0f4f8862182bb40d939e2995016af2cdbb3fd756f6a99135d",
"tests/test_automation_license.py": "45e9c75d0d3e1a76f997f7da4cc87b5eb1b05a4ea2356408725742eac8a09ffb",
"tests/test_background_icdb.py": "df9bd9e8252e0dee4527dc6a740c0c33e76d1fb06a79b816cc15809d95716e44",
"tests/test_background_queue_regressions.py": "132866bfccc9a7ac5cb234f97aaf6a290e2e4ef949f31e2f70b0f3eafeb99046",
"tests/test_backup_recovery.py": "efd88c0c00440ac915b147c2e6dee8044ca805b03f90ab9f171cbde1db11cb9b",
"tests/test_backup_recovery_dialog.py": "b2f65864b861d95e99d5efb61ada915ae41973d2b49d08f2d536781997dd00cb",
"tests/test_batch_blockers.py": "4387293d3a5820fab630e3c5fe1b424f61ba6947773e5a61125d840433c5c62a",
"tests/test_batch_item_yield.py": "ed4be6d1e854b18d054a75c92171cd46b6b64411c2f74e9a3caf31fba3c7366b",
"tests/test_batch_status.py": "c1f9af0c7c6f3171b3726fb53346f480b13b8d9cd88111a9c12e2fae2392bbff",
"tests/test_batch_status_faults.py": "314e890c9aee439c8a75b4dfd605685240c74f6212da975fd50526bd70b4a0ff",
"tests/test_desktop_worker.py": "671d616f04a01d74508b328e3b6fc8f6c7191a91de0dcaa486aa98a3718353ff",
"tests/test_diagnostic_open.py": "b44f8f7b171602ad2691ea2e064ac9fe94f2fabb9fcc2eb6760cc1dd365b9423",
"tests/test_dialog_agent.py": "8c746e47d55637ca18d7cc998f324a0c2e0a5214dcfe8fcb6458c060619c211c",
"tests/test_dialog_models.py": "6902cf5c292458340fb48241b34875e111a0113d706cd82775934a7f72bab7b9",
"tests/test_dialog_probe.py": "55c98f6102957a27a96dcfd4f4bf3af499b5055225b77ef93b7b332dfd4ac472",
"tests/test_dialog_rules.py": "96bf36493da770679e9207e96b3088ef7f471aea22e17c254f33326ffef0d7f9",
"tests/test_dialog_startup_budget.py": "6f23c01836e4894ae82c3345a2383c4f8eb0517056c5b953c43100acd0fc3739",
"tests/test_dialog_supervisor.py": "4c1b00050127a65b0a8cf1c7a94fd673431ea3f04b76033a463804d0468ad2d9",
"tests/test_extended_safety.py": "7450816abba89aba1f4739f819f43631def82701fe07481279db2b3f3ed96cf6",
"tests/test_external_owner_release.py": "675ddbab4a97e86febac3003b9083c259295534941aa0463488a5a1206cfaf92",
"tests/test_failed_startup.py": "eca757ea46a4c0aa4fb0368ff53f26822af71612d251ecd87132686fe3c3794b",
"tests/test_failure_lifecycle.py": "dfeac56744a44e6f4c7898516749ca478f53d7c7f08b3843a05ef7f448c469a7",
"tests/test_icdb_address.py": "cbdc07e5043349c796a4ea1ce3d4989062094cd28929a9ef7d42c5ba75b77907",
"tests/test_icdb_batch_check.py": "e83982e0fd0b3744bdc62965b26970ded31aacfedea94283d9e321ef70a8232f",
"tests/test_icdb_open_check.py": "1f3750169755d0553bac3e0f8bec244038b84f9cd970e17c9f6eb67dee0e3dba",
"tests/test_icdb_recovery.py": "298ddac4b79b4400efc99ff27c58ca49fffea1f401a31071451b2fdaca59036e",
"tests/test_import_without_export_gate.py": "ae3dd0fb41c41773ce2d54aa9f9be83bbb56a0d09c59d600b10575fa8f0d2cd4",
"tests/test_incident_safety.py": "52f3ccb04db8971bf38628c2bd334d4fd79795e97de6538f6f66cb35f7123ece",
"tests/test_independent_operations.py": "4ba5798df3346bce74c3703c158f1dce1d1ba14df748606fcaf900c8568753e0",
"tests/test_integration.py": "9e9d30692607c889e1e3744a63c79c68e3af7d4c86804e0bcebe48e68765086c",
"tests/test_late_release_continuation.py": "34c62a628cbc08f4e8b9a1919c13f17772a2d26d1996fae34a35f814725b00e2",
"tests/test_library_lock.py": "3d65bd941faa441404045ce0140ea3ea5e58fb7d410b7b76bb9f03a9ea03d3af",
"tests/test_library_reader.py": "b39a1dc9d99c2463b744141e3c3489cd49ac4a637e7835559a9c3fe9cbafbb58",
"tests/test_lifecycle_supervision.py": "cfe29f1e73c6ef38d11e185e211b6e2fb60247f53a44e99dd1e2f8cf7a009faa",
"tests/test_maintenance_diagnosis.py": "0849aef555475a03b061eacf499f261fb75f2e727f35dba3cbceafac92e2a638",
"tests/test_maintenance_entry.py": "5ed3cda8e0c829fb2964e27f1bdc6fa8ee8dcde93ec63338959bf754b62d6a0b",
"tests/test_maintenance_owner_scope.py": "7cf64dc7f2b126684dcac6e619cbd87eca3d85ec2fc1f70f057154679dad6026",
"tests/test_maintenance_review.py": "ba807fd8c25c1b52cf2443d8bcf2f57539819715c0bc6c358d31d8542c2e7ce5",
"tests/test_maintenance_startup_gate.py": "4f69d33218483a658b51b2012ae8bfa83aff8a787152a38b19dadc4c0d3ffe36",
"tests/test_maintenance_ui.py": "2a640ba5e979a3fead81f0a38603b6105ffcb883dbb8484ccc42c99ee8c311db",
"tests/test_management.py": "cad0fb43eca9e7022a33a5e9ff0a408465b262fd304b146cdc85c28265f2e74f",
"tests/test_management_diagnostics.py": "671a9d7c112ededbee332db9b6fbab786fb37e9367d992f902f3ab2c9f60880b",
"tests/test_management_native_transaction.py": "7ca227aae6426c4d0d998edfd8620ec18905aaf212f0be20ceba97b1cde3a9a4",
"tests/test_management_probe_guards.py": "ae9be3dbd7c6a616478b7d4ea3498c428ff94a985089fe798463c5cab456f151",
"tests/test_management_retry_blockers.py": "124dbef291dbe331ba0c3e7de1665c910ea43e37b1563429b387f0f2233953ee",
"tests/test_management_source.py": "16e608ed9c8b0aa81cf08d49f165a33a1403c4ea7f2a5be44e8cfc8cb49850ad",
"tests/test_management_supervision.py": "2dcadd6551a94c52e5d4e74285959f10144a89c48af87e508abaea945652d1f6",
"tests/test_management_ui.py": "da3e2bc0b5c73926324a539edfa2f718ae1b585df96324a928a0c1a909e48083",
"tests/test_manual_backup_ui.py": "927e42ec4a1e0139c71a41b0cad1389ad47b0881381203c18b307cd2d137983a",
"tests/test_mentor_paths.py": "a05a91812a74b58e76f36d581216ee43969d2576b8a8e7d1cde3e301c52cf4c1",
"tests/test_native_add_failures.py": "ceedd60e030628b1af149d08d16216d5f7158a63686729bb357c148da86fb0ec",
"tests/test_native_backup.py": "43ec0c6b14b53864553feaf5d9fb498b37866f24edc486c0749160d3f803db5f",
"tests/test_native_engineering_identity.py": "a1adcf6883a9b55c2c37d9f491faf40dd4928f4d8db675419fd288dd31552c69",
"tests/test_native_export_guard.py": "f8ec4fa1058af55008e9628f79f2dc70b6e551f36815a812d10bfdf955cada51",
"tests/test_native_inspection_release_regressions.py": "8f7bb0b2b641d437872f1dd1d0c2547c2522c81e3c0351c31a7125f751d91927",
"tests/test_native_management.py": "badf33d4d00104c7e96e336777fb3e49690cc9db5ce1b071f98520aa5b6668f1",
"tests/test_native_management_fields.py": "9917ca0910e19bd809c86d0120c652145261528ace33c3b805f5663442c4a973",
"tests/test_native_occupancy.py": "56293dbe24bd3cd4f74cf8208e933faab7d737e5a5684a5d38838d063c3aef6d",
"tests/test_native_repair.py": "113185ced72d8f4f4eafca99054d97fe80a504d1c6cc91aaf86f55cea1b7e138",
"tests/test_navigation_tabs.py": "d7d5bbfc752f73c1b1d4615ffafc1266e772d96f3f3ba3d82c4b4baf678b292d",
"tests/test_network_path.py": "f52624391ae78e9b913dace2b1a9a2875a5855f86dc9e12c324ef493e6c7817b",
"tests/test_network_release_safety.py": "caef536d0a40b2eb848c1b8ab095ab374af247c03dd44acf8a70f0f500db6dac",
"tests/test_operation_lifecycle.py": "c0ce6c86b73021a8b162ae9e67a10aeec8a27a98e382fd82e1449a451a9a8c3c",
"tests/test_operation_queue.py": "8137528603f015695ed4d60a0c8fa8e7bf0a1c4659f8dc2a181291f5d500e6a1",
"tests/test_owner_probe.py": "deb757e022980f11ef48e57a2fd002ee3e90ec647a4666a0c4d4427313b6f725",
"tests/test_packaging.py": "87a6d04419775c0c5c806e0e569a48d7ef199a0bff8736b211443a1f471e7e8a",
"tests/test_packaging_status_bridge.py": "cbfaeac070a1494a1d8609fc25e9a779a63354c8914b4c6c57fdc7c31b70d472",
"tests/test_pcb_bridge.py": "527fb63147a203a2e9419da989aff600d3e461580989e39e8ede3a8cc57b901a",
"tests/test_pcb_open_consent.py": "5bf9ef6276d221b73ebe0dd14cff4fe5dc11bfec7b8be3266ae4a6b6a588d354",
"tests/test_pcb_restore_prompt.py": "a005691d0296587e520e20c4430e9e55227d767c8e910e950a9f2e93aeccb2c7",
"tests/test_pcb_version_choice.py": "0825c28333e4ed4f5a63847b6f5bb11143e922c7203d2770ce9c78fc8edec20f",
"tests/test_post_repair_consent.py": "bf417b378255386dc97ad8efdf5003b0691aa5d69da9d9256aa367dc16a2d4bb",
"tests/test_post_verify_diagnostics.py": "212857e56581998a3a3cd53635030b68a089fc4d630a8b0ee7ef3f137090dcc4",
"tests/test_private_desktop_discovery.py": "5361493313ae6864e252cdb9f2c72e71b39264a1c022beb4cf0c04c143cdd91e",
"tests/test_readonly_status_policy.py": "3ed40d7bdf2d3e6f70b38803b89a8b982336556444b45c6ba6b0a7c6df52a97f",
"tests/test_reimport_recovery.py": "875e5e2a0f6251ec5a251457848c7eac5dfd1674fcbb4745155f6d5d8bf4a4be",
"tests/test_residual_release_dialog.py": "10b23d009703d542e5ce8ecb35a4833e0135bb8852b4116e49eedc7010397a1e",
"tests/test_residual_sessions.py": "2c51ed1dc95a3afa7ebb24027963dfa9d13aba9c407e508e22ccc6e9f762dfeb",
"tests/test_review313_residual_isolation.py": "52a8024ed4e2a7fed219fe46cacdf76fa971166feedd557206716ef7f6d3c914",
"tests/test_review326_dispatch_and_receipts.py": "ce4d529246da1c4d53c3dec70ef49542165064404301dec3e32851df62492ecf",
"tests/test_review326_queue_guidance.py": "c2c97aceddd9713618afdd5f2a7be4764b56a1b62fc672282fb8c218b4969c74",
"tests/test_review345_ui_cli.py": "795e7e4f9bda8874c6a65a08863cab19f4adb3412287276ee2960588f0fd2fa8",
"tests/test_review348_release_comparison.py": "ceccdb3d6f7bc6cb65562c059f13aa2bc5d89d98c6f64b0f11d9b943ebbde165",
"tests/test_review381_queue_release.py": "e0d62424cbf70ec9573db78ede0a4c6534775399194eed4c6b28ba8d468307be",
"tests/test_review391.py": "304d46d63af87ea4a9bca83834b77cc44c5c9addf7b0f3752431304ee612568c",
"tests/test_review414_export_and_audit.py": "ec785c2656bed97de6c8467885f2ad0877b55ee872b02928744d399e8767d8a0",
"tests/test_review414_open_and_queue.py": "db065207dacaccd0bd80af52c1f1edaf36a278e7cf2dce7c9b44bc51dd0e1cec",
"tests/test_review414_write_admission.py": "604ee7429053d408943a1d74b18c6bbf2de817e9e0b76c82abe7a1faceafdf9f",
"tests/test_review_319.py": "831fd34d426abb4436b9132bfb7ed754994155a34ac60a59378dee0964b54d28",
"tests/test_review_backend_followup.py": "2f3f51a72ecd05fc33c6b5a8dddaecfd12d2b50df423c87b4c18d1e52b2609bd",
"tests/test_review_foreign_release_evidence.py": "cbf2af02418f6bd3ec720a7a7658cf97f06d1a6e12009fdff2a99f465711591e",
"tests/test_review_management_ui_followup.py": "746602a84c3ba9cb041c5dd354b39d344355b71a3666b27a47eb9aee231e171c",
"tests/test_review_release_followup.py": "ab375f67e63cf3f33fa67ce19058be442c2ec56f810d4fc58ef5484272cbda49",
"tests/test_runtime_timing.py": "7152cd8fedfe165e769dadc1238c347d9f4d3e93cd57f6ed991e14d959e720f7",
"tests/test_safety.py": "ccf5febaf0a974d5e5357398a6946d3f121e07a6247c2f0dc5b71d86b39cac52",
"tests/test_save_helper_identity.py": "178a68c4a9a8c618dad3d8393e816dd1d2a16aef8d1fb9984117fe9dc8d06add",
"tests/test_save_helper_runtime.py": "00b092ec799da4bca424e1ee63a83bee783c81dbcdc20b7526fda8b45bb4b72a",
"tests/test_scan_isolation.py": "cab02bfe55ed515f889d3fcba6e6880344f482cc3a78a072b543b7a871cf92ab",
"tests/test_scoped_manifest.py": "fe9b2047d2c43812e851dd89ff250a2e5907dda89b3f5d9ae0a4dc4c5f452eac",
"tests/test_session_record.py": "6b51b19adfb232275195da7ff1ba91a5ce5e296f9424a7a1a29fc67ecfdfb108",
"tests/test_status_bridge.py": "fe1c0632d4d5fd5a1caf221903d4cfe38eda62aaa4298e3438735e31b8459ab2",
"tests/test_status_bridge_server.py": "7d8cd72d69afae0f96ebbd9bb3be2ae3c222f01108e45ab51a09e54d4d8527cc",
"tests/test_ui.py": "306a66698296a050744869b0756ddd0eefee5019618ff90b684da136a9787854",
"tests/test_ui_batch_safety.py": "12a8d82d4aedbeee315a02a49ec0e9888547ad4abd63e181e7f392b2a39e26dc",
"tests/test_ui_filters.py": "155e8f72d18c5c76b353d4b99f3828339c80908a9910f01641ba5c32a3929c75",
"tests/test_ui_lease_lifecycle.py": "18ea8af868373fa795a4911754be55068fe75833ce35579c1212fd7f4713f149",
"tests/test_verify_diagnostics.py": "b6431194e9f4c86a42110cac0d5f712c27b063f43b4ce820327aded81602908c",
"tests/test_verify_probe.py": "aeb65b5bd2df14e8a8f3ba5501855b5946e6f8a22f0d26960c00ff1b0daea56b",
"tests/test_verify_runner.py": "e58619f55873302c39129ce50e50fb25173a96ab309d975aa4f47f0bd3459fbb",
"tests/test_verify_worker_stability.py": "eae03400c2e3c8a0bc339c8dc05d890403c6bfb4c6d70d0361bc1b882b47d618",
"tests/fixtures/icdb-repair-startup-windows-sanitized.json": "a7fe3a34d47fb36d7f98ca8c1df4bb9a50d5faa9aee5bf76db5dbc3f3d06d03d",
"tests/fixtures/issue2-lost-session-sanitized.json": "7ed4b567acabb38ff643ebd2c5b3d90b4fd9f33368f67ce3f436ba93ccf24519",
"tests/fixtures/pcb-version-choice-sanitized.json": "ce0cb6d9135970cb4fbfa31fa057271b174dc37e57d90a5d4ac9ecf3ebabddfd",
"tests/support/runtime_lifecycle_frozen_boundaries.py": "bf98533a1c06ccf4453d20b3804323779719e697141b8dc64fa679960a979cfd",
"tests/support/runtime_lifecycle_frozen_fixture.py": "b87761c06a300f0d93bce864d3d31e045f2135324b2a9a42f8682ccbff09ad22",
"tests/support/runtime_lifecycle_frozen_smoke.py": "b11e0aac71c1079625ac9832dc5c38197bc80110478c4d9e02c2a3bc58a2a2d0"
},
"automatic_icdb_repair": false,
"merged": false,
"published": false,
"limitations": [
"Real field lost-server-session recovery is not accepted.",
"Windows 10 and cross-machine SMB not tested.",
"PCB sharing-violation regression uses real Win32 handles with controlled callback; no claim of field popup repair acceptance.",
"Long native Add waits remain undiagnosed.",
"Preexisting LibraryManager still prevents native catalog activation; user must close it normally before continuing. Multi-client COM ownership is not verified.",
"Unknown-client consent is user attestation, not proof of future native ownership."
]
}
+64
View File
@@ -0,0 +1,64 @@
# PR #13 评论 414 修复与验证
审查基准为 main `cbc57238496bc84f4228aa44929208a9516dff1b`;本轮修改基于
`1572e2d`,保留正常导入与可选导出诊断解耦。审查链接:
https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-414
## 审查意见处理
| 意见 | 处理及验证 |
| --- | --- |
| P2-1 未知原生进程在写前被忽略 | 仅在中心库写入和备份替换时要求明确选择继续、跳过本项或取消批次。许可限定本批次、目标库、PID/创建时间/映像/用户/会话,先落盘后生效。实际目标进程、数据库句柄冲突和地址记录不能用此确认绕过。确认后重新查询进程及资源。 |
| P2-2 独占探测句柄跨越原生“读写打开”点击 | 退出 resource_guard、释放句柄并重核原生进程身份后才派发点击;保留实时窗口身份核对及单次回答。真实 Windows CreateFile 回归试验在原实现产生 sharing violation,修复后读写打开成功。 |
| 后台读 QWidget / 使用当前库 | 队列、批次结束刷新及备份会话读取使用请求绑定的库;后台缺少显式库参数直接拒绝,避免从控件推导。Qt 工作线程回归试验验证不再读取 lmc_edit.text。 |
| 导出预存进程豁免偏宽 | 需要最新快照的创建时间与完整映像匹配;当前绑定副本或归属未知的原生客户端不豁免。相同创建时间但映像冲突不能解释为原进程已退出。内存和磁盘释放路径均有测试。 |
| 非 checkpoint 租约不落盘 | 此描述不准确:已有 LibraryLock 会写入并 flush `.lock` 审计文本(机器/PID/时间/库),原生校验另有 session 记录。增加实测断言;审计不是占用证明,不增加新阻塞记录。 |
| 历史测试数字缺少复现信息 | 见下表及命令;区分记录提交和精确被测树,不用单个旧提交冒充混合工作树。 |
整批校验和 ICDB 检查仍独立。未知进程确认不会关闭这些进程。用户需要确认它们在本批次完成前不使用目标库;程序仍无法仅凭命令行证明另一个客户端未来不会打开此库。
独立复核另发现两个集成缺陷:确认记录创建恢复目录后,恢复再次以独占方式创建同名目录;以及调用方未传 Event 时“取消本批次”仍执行下一项。均先以回归测试复现,再修复;跳过继续、取消停止,新出现进程和记录写盘失败也有覆盖。
## 历史测试数字的来源与复现边界
| 数字 | 保存记录的提交 | 原始证据 |
| --- | --- | --- |
| 1775 | `fdd07224aac99bee8d1f29e8e82d6a2c49964c87` | `2026-11-09-full-review-followup-validation.json`:四个分支 head、27 个被测文件散列、XML 路径与散列。 |
| 1851 | `42d0cebc54191681b53dcecb120f53236c1963bb` | `2026-11-12-native-acceptance-validation.json`:baseline `b86e4e3`、XML 结果、candidate-release4/source-sha256.json。 |
| 1880 | `466f400514acc8531a219db8e75641be35304a3f` | `2026-11-12-scoped-release-validation.json`:full-scoped-final10.xml、冻结包散列。 |
本轮从以上三个提交分别导出干净快照,设置各自 PYTHONPATH 后运行
`python -X utf8 -m pytest --collect-only -q tests`,实际分别收集到
1775 / 1851 / 1880 项;对应记录的 27 / 70 / 72 个文件散列均与这些提交一致。
以上提交可作为复现入口,但本轮没有重跑三份历史全套测试,收集数量不等于重新验证通过。
历史记录未覆盖的测试文件及外部环境不能靠这项散列核对证明完全相同。
当前版本可从本修复提交干净检出后运行以下命令。必须显式设置 PYTHONPATH,避免可编辑安装及测试子进程加载到另一份工作区:
```powershell
$env:PYTHONPATH = (Resolve-Path ./src).Path
python -X utf8 -m pytest -q tests --junitxml=full-suite.xml
python -X utf8 -m pytest -q tests/test_review414_open_and_queue.py tests/test_review414_write_admission.py tests/test_review414_export_and_audit.py --junitxml=review414.xml
python -X utf8 -m compileall -q src tests
git diff --check
```
本轮实际命令、XML、源码散列、冻结包核对及隔离原生操作结果见相邻
`2026-11-13-review-414-validation.json`。
全量 1912 项通过后新增两个边界用例,追加的 14 项测试全部通过(其中 12 项与全量重合,合计 1914 个不同用例)。
冻结包 66 个模块与当前源码一致,图标及资源一致。隔离空库的实际按钮操作得到:
取消仅产生一个 CANCELLED;新批次第一项 SKIPPED、第二项 UPLOADED,独立读取只确认第二个工程。
两个来源目录的工程内容清单保持一致,程序与原生任务正常退出。
“继续”之前由测试用户正常关闭本任务创建的空 LibraryManager;没有强制终止外部软件。
两轮旧驱动卡在模态窗的 UIA 读取、一次保留 LibraryManager 导致原生拒绝,以及一次回归测试与原生试验并行造成互斥拒绝,均保留原记录,不计为通过。
## 验收边界
本轮不启用自动 ICDB Repair,不关闭现场工单。Windows 10、跨机器 SMB、现场服务器会话失联完整修复未验收。原生 Add 长等待的原因尚未定位;这轮不以缩短超时掩盖它。当前云端发布包保持不变。
冻结包实测额外确认一项既有边界:原生 `_catalog_com` 仍要求启动前没有其他
LibraryManager,避免将其他客户端错误登记为本次所有者。因此当未知客户端恰为
LibraryManager 时,选择继续仍可能得到“已有 Library Manager 运行”;确认不会绕过该原生入口限制。
并行 LibraryManager 的隔离接入需要单独验证 COM 返回对象与窗口/PID 的精确归属,
本轮没有直接删除检查。该失败试验及正常关闭测试会话后重试的结果分别保留。
+43 -23
View File
@@ -28,32 +28,44 @@ def _paths(root):
return list(_scan(root))
def _idle_check(library, project, pcb):
from .mentor_adapter import _process_details
def _idle_check(library, project, pcb, *, confirmation=None, evidence=None, block=''):
from .owner_probe import query_owners
from .icdb_ownership import database_directories, unreleased_addresses
from contextlib import ExitStack
import win32con, win32file
directories = database_directories(library, project, pcb)
scope = (Path(project).parent, *directories)
for name in ('ExpeditionPCB.exe', 'LibraryManager.exe', 'viewdraw.exe',
'iCDBProjectBackup.exe', 'ReuseBlockImporter.exe'):
for pid, executable, command, parent in _process_details(name):
match = _native_scope_match(command, roots=scope, files=(library, project, pcb))
def owners():
unknown=[]
names=('ExpeditionPCB.exe','LibraryManager.exe','viewdraw.exe','iCDBProjectBackup.exe','ReuseBlockImporter.exe')
for row in query_owners(names):
match=_native_scope_match(row['command'],roots=scope,files=(library,project,pcb))
if match is True:
raise ValueError(f'TARGET_NATIVE_OWNER_ACTIVE: 目标工程或共享库有原生会话,PID={pid}')
# Pathless clients do not identify this target. The address and
# exclusive file probes below still reject actual target occupancy.
addresses = unreleased_addresses(library, project, pcb)
if addresses:
raise ValueError(f'TARGET_DATABASE_ADDRESS_UNCONFIRMED: 地址记录需原生确认;未据此判定正在占用:{addresses}')
with ExitStack() as stack:
paths = [Path(library), Path(pcb).parent/'Layout/LayoutDB.lyt',
*(directory/'icdb.dat' for directory in directories)]
for path in dict.fromkeys(paths):
if path.is_file():
handle = win32file.CreateFile(str(path), win32con.GENERIC_READ, 0, None,
win32con.OPEN_EXISTING, 0, None)
stack.callback(handle.Close)
raise ValueError(f'TARGET_NATIVE_OWNER_ACTIVE: 目标工程或共享库有原生会话,PID={row["pid"]}')
if match is None:unknown.append(row)
return unknown
def resources():
addresses=unreleased_addresses(library,project,pcb)
if addresses:
raise ValueError(f'TARGET_DATABASE_ADDRESS_UNCONFIRMED: 地址记录需原生确认;未据此判定正在占用:{addresses}')
with ExitStack() as stack:
paths=[Path(library),Path(pcb).parent/'Layout/LayoutDB.lyt',
*(directory/'icdb.dat' for directory in directories)]
for path in dict.fromkeys(paths):
if path.is_file():
handle=win32file.CreateFile(str(path),win32con.GENERIC_READ,0,None,
win32con.OPEN_EXISTING,0,None)
stack.callback(handle.Close)
unknown=owners()
resources() # Never hold exclusive probe handles while waiting for a user.
if unknown:
if confirmation is None:
raise ValueError('TARGET_NATIVE_OWNER_UNCONFIRMED: 原生程序的工程归属未知,写入前需要确认。')
confirmation.confirm(library,unknown,evidence=evidence,block=block)
unknown=owners()
if unknown and (confirmation is None or not confirmation.confirmed(library,unknown)):
raise ValueError('TARGET_NATIVE_OWNER_UNCONFIRMED: 占用确认后出现新的未知进程,请重新检查。')
resources()
def _native_scope_match(command, *, roots=(), files=()):
@@ -142,17 +154,21 @@ def _align_library(project, pcb, library):
ensure_project_central_library(path, library)
def recover_from_backup(request, source, *, progress=None, verifier=None, idle_check=None, version_prompt=None):
def recover_from_backup(request, source, *, progress=None, verifier=None, idle_check=None, version_prompt=None,stop=None):
"""Validate in copies before changing Work; preserve all recovery evidence."""
import pythoncom, win32con, win32event
from .network_path import absolute_preserving_drive
from .verify_runner import run_verify, read_library_flag_if_available
verifier = verifier or run_verify
idle_check = idle_check or _idle_check
source = Path(source).resolve()
library = absolute_preserving_drive(request.lmc_file)
library_root = library.parent.resolve()
root = Path(request.evidence_dir).resolve() / ('backup-restore-' + uuid4().hex[:12])
if idle_check is None:
from .write_admission import WriteAdmission
admission=WriteAdmission(prompt=version_prompt,stop=stop)
idle_check=lambda library,project,pcb:_idle_check(library,project,pcb,
confirmation=admission,evidence=root,block=request.block_name)
# Packaged desktop apps can redirect AppData to a very deep MSIX path.
# Keep native EE7.9 files in a genuinely short, user-owned directory.
validation_base = Path.home() / '.cbb-restore'
@@ -203,9 +219,9 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
raise ValueError('请选择目标中心库之外的独立备份工程。')
project, pcb = preflight(replace(request, lmc_file=library))
source_pcb = _source_check(source, request.block_name, project)
root.mkdir(parents=True, exist_ok=False)
idle_check(library, project, pcb)
idle_check(library, source, source_pcb)
root.mkdir(parents=True, exist_ok=False)
validation_base.mkdir(parents=True, exist_ok=True)
library_size = sum(info.st_size for info in _scan(library_root).values() if stat.S_ISREG(info.st_mode))
source_size = sum(info.st_size for info in _scan(source.parent).values() if stat.S_ISREG(info.st_mode))
@@ -242,6 +258,7 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
emit('validate_source', '正在副本中打开备份工程并执行原生校验…')
release_confirmed = False
choice_options = {'version_prompt': version_prompt} if version_prompt is not None else {}
if stop is not None:choice_options['stop']=stop
source_result = verifier(validation, progress=progress, flag_reader=read_library_flag_if_available, **choice_options)
release_confirmed = source_result.safe_to_continue
record['source_validation'] = asdict(source_result)
@@ -284,6 +301,9 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
final = replace(final, stderr=(final.stderr + '\n原 Work 已改名保留;应用未创建完整库备份,请查看恢复记录并使用手动备份。').strip())
return save(final)
except Exception as error:
from .write_admission import WriteAdmissionDeclined
if isinstance(error,WriteAdmissionDeclined) and error.decision=='cancel' and not installed:
return save(VerifyResult('CANCELLED',stderr=str(error),safe_to_continue=release_confirmed))
return save(VerifyResult('FAIL' if installed else 'BLOCKED', stderr=str(error),
safe_to_continue=release_confirmed))
finally:
+21 -2
View File
@@ -169,7 +169,8 @@ def _may_have_mutated(record):
or any(not isinstance(item, dict) or item.get('stage') not in prewrite for item in history))
def run_management(request, *, adapter=None, verifier=None, idle_check=None, progress=None, stop=None, version_prompt=None):
def run_management(request, *, adapter=None, verifier=None, idle_check=None, progress=None, stop=None, version_prompt=None,
write_admission=None):
from .verify_runner import VerifyRequest, run_verify
from .backup_recovery import _idle_check
import win32con, win32event
@@ -178,8 +179,13 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
from .native_management import NativeManagementAdapter
adapter = NativeManagementAdapter()
verifier = verifier or run_verify
idle_check = idle_check or _idle_check
root = report = None
native_idle_check = idle_check is None
if native_idle_check:
from .write_admission import WriteAdmission
write_admission=write_admission or WriteAdmission(prompt=version_prompt,stop=stop)
idle_check=lambda library,project,pcb:_idle_check(library,project,pcb,
confirmation=write_admission,evidence=root,block=request.name)
stage = 'preflight'
history = []
mutated = uploaded = removed = False
@@ -300,6 +306,8 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
return finish('BLOCKED', f'存在未完成/需恢复任务,禁止自动重放:{unfinished_target["evidence_path"]}')
if hasattr(adapter, 'bind_library_mapping'):
adapter.bind_library_mapping(request.mapped_drive, request.mapped_remote_root)
if hasattr(adapter,'bind_write_admission'):
adapter.bind_write_admission(write_admission if native_idle_check else None)
with LibraryLock(library, block_name=request.name, safe_to_release=lambda: owner_safe or (
callable(getattr(adapter, 'release_confirmed', None)) and adapter.release_confirmed(library))):
work = library.parent/'ReusableBlocksLP'/request.name/'Work'
@@ -420,6 +428,10 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
return finish('UPLOADED_VERIFIED' if good else 'UPLOADED_VERIFY_FAILED',
'\n'.join(filter(None, (native.detail, verified.stderr or verified.library_flag_detail))), owner_safe)
except Exception as error:
from .write_admission import WriteAdmissionDeclined
if isinstance(error,WriteAdmissionDeclined):
return finish('RECOVERY_REQUIRED' if mutated else
'CANCELLED' if error.decision=='cancel' else 'SKIPPED',str(error),owner_safe)
if uploaded:
return finish('UPLOADED_VERIFY_FAILED', str(error), owner_safe)
status = 'RECOVERY_REQUIRED' if mutated else ('UPLOAD_FAILED' if request.operation in ('add', 'update') else 'BLOCKED')
@@ -438,6 +450,11 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
def run_management_batch(requests, *, stop=None, progress=None, item_executor=None, **kwargs):
from threading import Event
from .write_admission import WriteAdmission
if stop is None:
stop = Event()
kwargs.setdefault('write_admission',WriteAdmission(prompt=kwargs.get('version_prompt'),stop=stop))
results = []
retained_libraries = set()
for request in requests:
@@ -471,4 +488,6 @@ def run_management_batch(requests, *, stop=None, progress=None, item_executor=No
'evidence_path': str(result.evidence_path or '')})
if not result.safe_to_continue:
retained_libraries.add(key)
if result.status == 'CANCELLED':
break
return results
+29 -7
View File
@@ -8,7 +8,7 @@ from uuid import uuid4
from .management import _write_json
def _preexisting_export_pids(record):
def _preexisting_export_pids(record, snapshot=None, *, project_root=None):
from datetime import datetime
from .native_engineering_identity import _process_birth
identities = record.get('process_identities', [])
@@ -16,9 +16,28 @@ def _preexisting_export_pids(record):
birth = _process_birth(record.get('root_created') or root.get('created'))
if not isinstance(birth, datetime):
return set()
return {p['pid'] for p in identities if p.get('pid') != record.get('pid')
earlier = [p for p in identities if p.get('pid') != record.get('pid')
and isinstance(_process_birth(p.get('created')), datetime)
and _process_birth(p['created']) < birth}
and _process_birth(p['created']) < birth]
if not earlier:return set()
from .native_engineering_identity import _process_snapshot,_OWNER_NAMES
from .backup_recovery import _native_scope_match
import ntpath
current={p['pid']:p for p in (_process_snapshot() if snapshot is None else snapshot)}
native_names=_OWNER_NAMES|{'viewdraw.exe','expeditionpcb.exe','librarymanager.exe',
'icdbprojectbackup.exe','reuseblockimporter.exe'}
excluded=set()
for recorded in earlier:
actual=current.get(recorded['pid'])
if (actual is None or _process_birth(actual.get('created'))!=_process_birth(recorded['created'])
or not recorded.get('executable') or not actual.get('executable')
or ntpath.normcase(actual['executable'])!=ntpath.normcase(recorded['executable'])):
continue
match=_native_scope_match(actual.get('command',''),roots=(project_root,)) if project_root is not None else None
if match is True or match is None and actual.get('name','').casefold() in native_names:
continue
excluded.add(recorded['pid'])
return excluded
def assert_retained_exports_idle(library=None):
@@ -44,7 +63,7 @@ def assert_retained_exports_idle(library=None):
raise ValueError('Export process evidence must be a JSON object')
if record.get('pid') == process.pid:
matched = True
excluded.update(_preexisting_export_pids(record))
excluded.update(_preexisting_export_pids(record,project_root=Path(scope['analysis_root'])/'project'))
if not matched:
raise ValueError(f'No process evidence matches exporter PID {process.pid}')
except (OSError, ValueError, KeyError, TypeError) as error:
@@ -156,15 +175,18 @@ def prove_export_copies_released(library, *, allow_unknown_checkpoint=False, uns
if any(not isinstance(pid, int) or pid <= 0 for pid in pids):
raise ValueError('Invalid export process identity.')
identities = {p['pid']: p for p in process.get('process_identities', [])}
excluded = _preexisting_export_pids(process)
excluded = _preexisting_export_pids(process,snapshot,project_root=project.parent)
def original_alive(pid):
if pid in excluded:
return False
recorded = identities.get(pid, {})
current = next((p for p in snapshot if p['pid'] == pid), None)
if recorded.get('created') and current and current.get('created'):
return (recorded['created'] == current['created']
and recorded.get('executable') == current.get('executable'))
from datetime import datetime
from .native_engineering_identity import _process_birth
before,now=_process_birth(recorded['created']),_process_birth(current['created'])
if isinstance(before,datetime) and isinstance(now,datetime):
return before==now
return any(p['pid'] == pid for p in snapshot) or _supervisor_alive(pid)
if any(original_alive(pid) for pid in pids):
raise LibraryBusy('A recorded export process or descendant remains alive.')
+9 -1
View File
@@ -71,10 +71,14 @@ class NativeManagementAdapter:
self._pending_workers = {}
self.stop = None
self.session_progress = None
self.write_admission = None
def bind_stop(self, stop):
self.stop = stop
def bind_write_admission(self, admission):
self.write_admission=admission
def release_confirmed(self, library):
"""Worker exit/result files do not replace independent resource proof."""
key = str(Path(library).resolve()).casefold()
@@ -379,7 +383,11 @@ class NativeManagementAdapter:
return NativeOutcome(True, owner_safe, 'Registered engineering project is not unique.',
identity_matches=False, evidence_path=evidence)
target, pcb, _ = source_project(projects[0])
_idle_check(request.library, target, pcb)
if self.write_admission is None:
_idle_check(request.library,target,pcb)
else:
_idle_check(request.library,target,pcb,confirmation=self.write_admission,
evidence=evidence,block=request.name)
from .maintenance_entry import maintenance_project_files
project_files = maintenance_project_files(target, pcb)
before_refs = {str(p): hash_file(p) for p in project_files}
+6 -2
View File
@@ -107,15 +107,19 @@ class OpenController:
'target': {'control_id': control}, 'desktop': self.job['desktop'],
'pid': target_pid, 'owner': owner, 'choice': self.choice.decision}
def send():
self.sent, self.sent_at = True, time.monotonic()
_write_json(Path(self.job['root'])/'pcb-open-user-choice.json', dict(
choice=self.choice.decision, project=self.job['project'], pcb=self.job['pcb'],
library=self.job['lmc_file'], owner=owner, snapshot=snapshot.to_record()))
self.sent, self.sent_at = True, time.monotonic()
return perform(snapshot, action, snapshot.phase)
if control == 6:
allowed = {target_pid, launcher_pid, worker_pid, self.job.get('supervisor_pid')}
with resource_guard(self.job, allowed):
result = send()
pass
# Mentor must acquire these files itself when it receives Yes.
if validate_owner(self.job, target_pid, launcher_pid, worker_pid) != owner:
raise ValueError('PCB_OPEN_IDENTITY_CHANGED')
result = send()
else:
result = send()
error = result.error_code
+3 -2
View File
@@ -12,7 +12,7 @@ def offers_reimport(result):
def run_reimport_recovery(requests, *, previous_evidence, evidence_dir,
adapter=None, stop=None, progress=None):
adapter=None, stop=None, progress=None,version_prompt=None):
from .management import ManagementResult, _write_json, source_project, run_management_batch
from .library_lock import release_retained_library
requests = tuple(requests)
@@ -62,7 +62,8 @@ def run_reimport_recovery(requests, *, previous_evidence, evidence_dir,
if cancelled(): return []
stage = 'management'
save(stage, management_started=True)
results = run_management_batch(requests, adapter=adapter, stop=stop, progress=progress)
results = run_management_batch(requests, adapter=adapter, stop=stop, progress=progress,
version_prompt=version_prompt)
save('complete', results=[asdict(result) for result in results],
version_review_required=True)
return results
@@ -99,7 +99,7 @@ class BackupRecoveryDialog(QDialog):
self.status_label.setText('正在准备恢复…')
self.started.emit(name)
def execute():
options = {'version_prompt': self.signals.choice.emit} if self.recoverer is None else {}
options = {'version_prompt': self.signals.choice.emit,'stop':self.stop} if self.recoverer is None else {}
action = lambda: recoverer(request, source, progress=self.signals.progress.emit, **options)
if self.native_queue is None: return action()
from ..operation_queue import QueueCancelled
+23 -12
View File
@@ -843,9 +843,13 @@ class MainWindow(QWidget):
self.worker.signals.finished.connect(self._finished)
self.pool.start(self.worker)
def _queued_action(self, action, *, label=''):
def _queued_action(self, action, *, label='', library=None):
from cbb_refresh_verify.session_record import library_available, library_wait_reason
library = getattr(self, 'mentor_lmc_path', None) or self.lmc_edit.text()
if library is None:
from PySide6.QtCore import QThread
if QThread.currentThread() != self.thread():
raise RuntimeError('后台入队必须传入任务绑定的中心库路径')
library = getattr(self, 'mentor_lmc_path', None) or self.lmc_edit.text()
def execute():
event = {'stage': 'native_slot_acquired', 'library': str(library)}
if label:
@@ -1247,7 +1251,7 @@ class MainWindow(QWidget):
if (not self._native_backup_matches_library(result['library'], getattr(session, 'path_lease', None))
or result['block'] != session.block):
raise ValueError('原生会话返回的工程身份不一致。')
refresh = (self._read_affected_records((session.block,))
refresh = (self._read_affected_records((session.block,), library=session.library)
if result.get('safe_to_continue') is True and same_library else None)
return result, refresh
def completed(payload):
@@ -1269,7 +1273,7 @@ class MainWindow(QWidget):
self.output.append(f'{session.block} · 退出尚未确认:{error}\n{session.job}')
self.busy = True; self._update()
self.stop.clear()
self.worker = ServiceWorker(self._queued_action(read_result))
self.worker = ServiceWorker(self._queued_action(read_result, library=session.library))
self.worker.signals.succeeded.connect(completed)
self.worker.signals.failed.connect(unconfirmed)
self.worker.signals.finished.connect(self._finished)
@@ -1348,6 +1352,7 @@ class MainWindow(QWidget):
self._update()
return
requests = [replace(self._request(name), maintenance=maintenance, auto_repair=False) for name in names]
library = requests[0].lmc_file
self._batch_requests = tuple(requests)
self._batch_records = {name: self._records_by_name[name] for name in names}
self._reimport_offers = ()
@@ -1375,7 +1380,7 @@ class MainWindow(QWidget):
self.signals.event.emit({'block': req.block_name, 'stage': 'icdb_check_start'})
return verify(req)
results = run_batch(requests, verifier=verifier, stop=self.stop,
item_executor=lambda req, action: self._queued_action(action)(),
item_executor=lambda req, action: self._queued_action(action, library=req.lmc_file)(),
progress=lambda name, result: self.signals.event.emit({'block': name, 'stage': result.status,
'error_category': result.error_category, 'evidence': str(result.evidence_path or ''),
'detail': result.stderr or result.stdout}))
@@ -1394,19 +1399,19 @@ class MainWindow(QWidget):
if safe and not self.stop.is_set():
from cbb_refresh_verify.operation_queue import QueueCancelled
try:
refresh = self._queued_action(lambda: self._read_affected_records(affected),
label='批次已结束,状态刷新')()
refresh = self._queued_action(lambda: self._read_affected_records(affected, library=library),
label='批次已结束,状态刷新', library=library)()
except QueueCancelled:
pass # Cancelling the refresh must not erase completed item results.
return results, report, affected, refresh
self._start(action, self._batch_refreshed, queued=False)
def _read_affected_records(self, names):
def _read_affected_records(self, names, *, library):
"""Worker-only read; never derive library state from action outcomes."""
import pythoncom
pythoncom.CoInitialize()
try:
path = Path(self.mentor_lmc_path or self.loaded_path)
path = Path(library)
try:
statuses = self.status_refresher(tuple(names), path)
# Publish before yielding the native queue, ahead of Qt callbacks.
@@ -1484,7 +1489,8 @@ class MainWindow(QWidget):
self._refreshing_records = False
if callback:
callback(records)
self._start(lambda: self._read_affected_records(targets), refreshed)
library = self.mentor_lmc_path or self.loaded_path
self._start(lambda: self._read_affected_records(targets, library=library), refreshed)
return True
def _progress(self, event):
@@ -1680,13 +1686,18 @@ class MainWindow(QWidget):
return
from ..pcb_open_consent import OpenChoice
from .pcb_open_dialog import PcbOpenDialog
from ..write_admission import WriteOwnerChoice
from .write_owner_dialog import WriteOwnerDialog
parent = self
backup = getattr(self, 'backup_dialog', None)
if backup is not None and backup.isVisible(): parent = backup
management = getattr(self, 'management_dialog', None)
if management is not None and management.isVisible(): parent = management
self.version_dialog = (PcbOpenDialog if isinstance(choice, OpenChoice) else PcbRestoreDialog)(choice, parent)
detail = '等待读写打开确认' if isinstance(choice, OpenChoice) else '等待选择 PCB 恢复版本'
dialog_class = (WriteOwnerDialog if isinstance(choice,WriteOwnerChoice) else
PcbOpenDialog if isinstance(choice,OpenChoice) else PcbRestoreDialog)
self.version_dialog = dialog_class(choice,parent)
detail = ('等待确认库未被其他程序使用' if isinstance(choice,WriteOwnerChoice) else
'等待读写打开确认' if isinstance(choice,OpenChoice) else '等待选择 PCB 恢复版本')
self.status_label.setText(f'{choice.block}:{detail}。')
self.icdb_phase.setText(f'{choice.block} · {detail}')
self.version_dialog.show()
@@ -16,6 +16,7 @@ RESULT_LABELS = {
'UPLOADED_VERIFIED': '已上传且校验通过', 'UPLOADED_VERIFY_FAILED': '已上传但校验未通过',
'UPLOAD_FAILED': '上传失败', 'RECOVERY_REQUIRED': '需要人工恢复',
'BLOCKED': '操作被阻止', 'UNSUPPORTED': '当前环境不支持',
'SKIPPED': '已跳过 / 未执行', 'CANCELLED': '已取消',
}
STAGE_LABELS = {
'prepare_identity': '正在检查来源工程文件',
@@ -172,8 +173,9 @@ class ManagementDialog(QDialog):
self._enabled(False)
self.before_execute.emit([r.name for r in requests])
def execute():
choices={'version_prompt':self.signals.choice.emit} if self.runner is run_management_batch or self.recovery_from else {}
action = lambda: self.runner(requests, adapter=self.adapter, stop=self.stop,
progress=self.signals.progress.emit)
progress=self.signals.progress.emit,**choices)
if self.native_queue is None: return action()
from ..operation_queue import QueueCancelled
from ..session_record import library_available, library_wait_reason
@@ -0,0 +1,22 @@
from PySide6.QtWidgets import QMessageBox
class WriteOwnerDialog(QMessageBox):
def __init__(self,choice,parent=None):
super().__init__(parent)
self.choice=choice
self.setWindowTitle('确认中心库未被占用')
self.setIcon(QMessageBox.Question)
owners='\n'.join(f'{row["name"]} · PID {row["pid"]}' for row in choice.owners)
self.setText(f'中心库:{choice.library}\n当前 CBB:{choice.block}\n\n'
f'无法确认下列程序是否打开了此库:\n{owners}\n\n'
'请确认这些程序在本批次完成前都不使用此库,再继续。')
self.setDetailedText('\n'.join(f'PID {row["pid"]}:{row["image"]}' for row in choice.owners))
self.continue_button=self.addButton('已确认未使用此库,继续',QMessageBox.ActionRole)
self.skip_button=self.addButton('跳过本项',QMessageBox.ActionRole)
self.cancel_button=self.addButton('取消本批次',QMessageBox.RejectRole)
self.setDefaultButton(self.cancel_button);self.setEscapeButton(self.cancel_button)
self.setModal(True)
self.buttonClicked.connect(lambda b:choice.choose('continue' if b is self.continue_button else
'skip' if b is self.skip_button else 'cancel'))
self.finished.connect(lambda _:choice.choose('cancel'))
+69
View File
@@ -0,0 +1,69 @@
"""Batch-local user confirmation for native clients with unknown target paths."""
from pathlib import Path
import time
from uuid import uuid4
from .pcb_open_consent import OpenChoice
from .session_record import process_identity
class WriteOwnerChoice(OpenChoice):
def __init__(self, block, library, owners):
super().__init__(block, library)
self.owners=tuple(dict(row) for row in owners)
class WriteAdmissionDeclined(ValueError):
def __init__(self, decision):
self.decision=decision
super().__init__('已取消本批次,未提交后续写入。' if decision=='cancel' else '用户跳过本项,未确认未知程序与目标库无关。')
class WriteAdmission:
def __init__(self, *, prompt=None, stop=None):
self.prompt,self.stop=prompt,stop
self._grants={}
def _identities(self, owners):
rows=[]
for row in owners:
try:identity=process_identity(row['pid'])
except Exception as error:
if getattr(error,'winerror',None)==87:continue
raise
if Path(identity['image']).name.casefold()!=row['name'].casefold():
raise ValueError('TARGET_NATIVE_OWNER_UNCONFIRMED: PID 已被其他程序复用,请重新检查。')
if row.get('executable') and Path(row['executable']).resolve()!=Path(identity['image']).resolve():
raise ValueError('TARGET_NATIVE_OWNER_UNCONFIRMED: 原生程序身份已变化,请重新检查。')
rows.append({**identity,'name':row['name']})
return tuple(sorted((row['pid'],row['created_handle'],row['image'],row['owner_sid'],row['session_id'])
for row in rows)),rows
def confirmed(self, library, owners):
key=str(Path(library).resolve()).casefold()
identities,_=self._identities(owners)
return set(identities).issubset(self._grants.get(key,set()))
def confirm(self, library, owners, *, evidence, block):
key=str(Path(library).resolve()).casefold()
identities,rows=self._identities(owners)
if set(identities).issubset(self._grants.get(key,set())):return
if self.prompt is None:
raise ValueError('TARGET_NATIVE_OWNER_UNCONFIRMED: 无法确认原生程序是否使用目标库,请通过界面核对后选择。')
choice=WriteOwnerChoice(block,str(Path(library)),rows)
self.prompt(choice)
while choice.decision is None and not (self.stop is not None and self.stop.is_set()):time.sleep(.05)
decision=choice.decision or 'cancel'
if decision!='continue':
if decision=='cancel' and self.stop is not None:self.stop.set()
raise WriteAdmissionDeclined(decision)
current,_=self._identities(owners)
if not set(current).issubset(identities):
raise ValueError('TARGET_NATIVE_OWNER_UNCONFIRMED: 确认期间进程身份已变化,请重新检查。')
from .management import _write_json
root=Path(evidence);root.mkdir(parents=True,exist_ok=True)
_write_json(root/('write-owner-consent-'+uuid4().hex+'.json'),dict(
intent='user_confirmed_unknown_clients_do_not_use_target_library',library=str(Path(library).resolve()),
block=block,scope='current_batch_library',owners=rows,choice='continue',
proves_native_ownership=False,requires_fresh_resource_checks=True))
self._grants.setdefault(key,set()).update(current)
+2 -1
View File
@@ -83,7 +83,8 @@ def test_worker_refresh_excludes_ready_before_any_gui_result_callback(qtbot,tmp_
status_refresher=lambda names,path:{name:'READY' for name in names})
release,calls=background(window,qtbot)
try:
window._start(lambda:window._read_affected_records(('Gamma',)),lambda payload:None)
library=window.mentor_lmc_path or window.loaded_path
window._start(lambda:window._read_affected_records(('Gamma',),library=library),lambda payload:None)
qtbot.waitUntil(lambda:bool(window.native_queue.pending))
release.set()
qtbot.waitUntil(lambda:not window._icdb_active() and not window.busy)
+11 -10
View File
@@ -183,9 +183,9 @@ def test_idle_guard_ignores_unrelated_project_and_prefix_sibling(recovery_files,
request, original, _ = recovery_files
unrelated = original.parent.with_name(original.parent.name+'Old')/'PCB/A.pcb'
monkeypatch.setattr(mentor_adapter, 'pcb_processes', lambda: [(123, '', str(unrelated))])
monkeypatch.setattr(mentor_adapter, '_process_details', lambda name:
[(123, 'ExpeditionPCB.exe', f'ExpeditionPCB.exe "{unrelated}" -ReusableCircuit', 0)]
if name == 'ExpeditionPCB.exe' else [])
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda names:[
dict(pid=123,name='ExpeditionPCB.exe',executable='ExpeditionPCB.exe',
command=f'ExpeditionPCB.exe "{unrelated}" -ReusableCircuit',parent=0)])
_idle_check(request.lmc_file, original, original.parent/'PCB/A.pcb')
@@ -195,23 +195,23 @@ def test_idle_guard_rejects_exact_target_process(recovery_files, monkeypatch):
request, original, _ = recovery_files
target = original.parent/'PCB/A.pcb'
monkeypatch.setattr(mentor_adapter, 'pcb_processes', lambda: [])
monkeypatch.setattr(mentor_adapter, '_process_details', lambda name:
[(123, 'ExpeditionPCB.exe', f'ExpeditionPCB.exe "{target}" -ReusableCircuit', 0)]
if name == 'ExpeditionPCB.exe' else [])
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda names:[
dict(pid=123,name='ExpeditionPCB.exe',executable='ExpeditionPCB.exe',
command=f'ExpeditionPCB.exe "{target}" -ReusableCircuit',parent=0)])
with pytest.raises(ValueError, match='TARGET_NATIVE_OWNER_ACTIVE'):
_idle_check(request.lmc_file, original, target)
@pytest.mark.parametrize('target_state', ['idle', 'open_file', 'address'])
def test_pathless_external_client_uses_target_resource_proof(recovery_files, monkeypatch, target_state):
def test_pathless_external_client_requires_resource_proof_and_confirmation(recovery_files, monkeypatch, target_state):
import pywintypes
import win32con
import win32file
from cbb_refresh_verify import mentor_adapter
from cbb_refresh_verify.backup_recovery import _idle_check
request, original, _ = recovery_files
monkeypatch.setattr(mentor_adapter, '_process_details', lambda name:
[(123, 'viewdraw.exe', 'viewdraw.exe', 0)] if name == 'viewdraw.exe' else [])
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda names:[
dict(pid=123,name='viewdraw.exe',executable='viewdraw.exe',command='viewdraw.exe',parent=0)])
address = original.parent/'database/cdbsvr/sAddress.adr'
handle = None
try:
@@ -228,7 +228,8 @@ def test_pathless_external_client_uses_target_resource_proof(recovery_files, mon
_idle_check(request.lmc_file, original, original.parent/'PCB/A.pcb')
assert address.read_bytes() == b'live or unconfirmed native address'
else:
_idle_check(request.lmc_file, original, original.parent/'PCB/A.pcb')
with pytest.raises(ValueError,match='TARGET_NATIVE_OWNER_UNCONFIRMED'):
_idle_check(request.lmc_file, original, original.parent/'PCB/A.pcb')
finally:
if handle is not None: handle.Close()
+2 -2
View File
@@ -140,7 +140,7 @@ def test_retained_export_registry_is_scoped_to_its_library(tmp_path, monkeypatch
with pytest.raises(LibraryBusy): assert_retained_exports_idle(library_a)
@pytest.mark.parametrize('created,blocked', [('new-process', False), ('original-process', True)])
@pytest.mark.parametrize('created,blocked', [('20261113120000.000000+480', False), ('20261112120000.000000+480', True)])
def test_recorded_export_pid_reuse_requires_matching_creation_identity(export_case, monkeypatch, created, blocked):
import cbb_refresh_verify.native_engineering_identity as identity
import cbb_refresh_verify.library_lock as locks
@@ -148,7 +148,7 @@ def test_recorded_export_pid_reuse_requires_matching_creation_identity(export_ca
library, root, *_ = export_case
path = root/'ascii-process.json'
record = json.loads(path.read_text('utf-8'))
record['process_identities'] = [{'pid': 123456, 'created': 'original-process', 'executable': 'native'}]
record['process_identities'] = [{'pid': 123456, 'created': '20261112120000.000000+480', 'executable': 'native'}]
path.write_text(json.dumps(record), encoding='utf-8')
monkeypatch.setattr(locks, '_supervisor_alive', lambda _: True)
monkeypatch.setattr(identity, '_process_snapshot', lambda: [
+38
View File
@@ -0,0 +1,38 @@
import json,os
from types import SimpleNamespace
import pytest
from test_native_export_guard import export_case
@pytest.mark.parametrize('in_memory',[False,True])
def test_preexisting_exclusion_does_not_hide_a_changed_process_identity(export_case,monkeypatch,in_memory):
import win32api,win32con
from cbb_refresh_verify import native_engineering_identity as identity
from cbb_refresh_verify.native_export_guard import prove_export_copies_released
from cbb_refresh_verify.library_lock import LibraryBusy
library,root,*_=export_case
record=dict(pid=123456,observed_pids=[123456,os.getpid()],process_identities=[
dict(pid=123456,created='20261112120000.000000+480',executable='native'),
dict(pid=os.getpid(),created='20261111120000.000000+480',executable='old-client')])
(root/'ascii-process.json').write_text(json.dumps(record),encoding='utf-8')
monkeypatch.setattr(identity,'_process_snapshot',lambda:[dict(pid=os.getpid(),name='viewdraw.exe',parent=0,
created='20261111120000.000000+480',executable='different-client',command='')])
handle=win32api.OpenProcess(win32con.SYNCHRONIZE,False,os.getpid())
try:
if in_memory:
monkeypatch.setattr(identity,'_retained_exports',[(SimpleNamespace(pid=123456,poll=lambda:0),
{os.getpid():handle},dict(library=str(library),analysis_root=str(root)))])
with pytest.raises(LibraryBusy):
with prove_export_copies_released(library):pass
finally:handle.Close()
def test_noncheckpoint_lease_still_has_a_non_authoritative_disk_audit(tmp_path):
from cbb_refresh_verify.library_lock import LibraryLock,blocker_path
library=tmp_path/'lib.lmc';library.touch()
lease=LibraryLock(library,checkpoint=False)
with lease:
assert not blocker_path(library).exists()
text=lease.path.read_text(encoding='utf-8')
assert f'pid={os.getpid()}' in text and str(library) in text and 'startedUtc=' in text
assert not blocker_path(library).exists()
+51
View File
@@ -0,0 +1,51 @@
"""Review #414: native clicks and queue binding must outlive only their proofs."""
from contextlib import contextmanager
from types import SimpleNamespace
from test_post_repair_consent import snapshot
def test_readwrite_click_can_open_files_after_exclusive_probe_closes(tmp_path, monkeypatch):
import win32con, win32file
from cbb_refresh_verify import pcb_open_consent as consent
path=tmp_path/'icdb.dat'; path.write_bytes(b'database')
monkeypatch.setattr(consent,'validate_owner',lambda *_: {'target':'owned'})
@contextmanager
def guard(*_):
handle=win32file.CreateFile(str(path),win32con.GENERIC_READ,0,None,win32con.OPEN_EXISTING,0,None)
try:yield
finally:handle.Close()
monkeypatch.setattr(consent,'resource_guard',guard)
controller=consent.OpenController(dict(root=str(tmp_path),block_name='A',lmc_file='lib.lmc',
project='A.prj',pcb='A.pcb',desktop='CbbVerify_test'))
shown=[]; accepted=[]
def perform(*_):
handle=win32file.CreateFile(str(path),win32con.GENERIC_READ|win32con.GENERIC_WRITE,
0,None,win32con.OPEN_EXISTING,0,None)
handle.Close(); accepted.append(True)
return SimpleNamespace(error_code='',accepted_controls=(6,),detail='',channel='win32_button_click')
options=dict(target_pid=20,launcher_pid=10,worker_pid=5,show=shown.append,perform=perform)
controller.handle(snapshot(),(snapshot(),),**options)
shown[0].choose('continue')
result=controller.handle(snapshot(),(snapshot(),),**options)
assert not result.error_code,result.detail
assert accepted==[True]
def test_batch_queue_never_reads_library_widget_from_worker(qtbot, tmp_path, monkeypatch):
from threading import get_ident
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
gui_thread=get_ident(); violations=[]; calls=[]
window=load_window(qtbot,tmp_path,monkeypatch,
verifier=lambda req: calls.append(req.lmc_file) or VerifyResult('FAIL',safe_to_continue=True))
window.mentor_lmc_path=None
original=window.lmc_edit.text
def text():
if get_ident()!=gui_thread:violations.append('lmc_edit.text')
return original()
monkeypatch.setattr(window.lmc_edit,'text',text)
window._run(['Beta'])
qtbot.waitUntil(lambda:not window.busy,timeout=10000)
assert calls
assert not violations
+181
View File
@@ -0,0 +1,181 @@
from pathlib import Path
from threading import Event
import pytest
from test_backup_recovery import recovery_files
def fixture_paths(tmp_path, monkeypatch):
from test_management import project
source=project(tmp_path/'source')
library=tmp_path/'target/lib.lmc'; library.parent.mkdir(); library.touch()
row=dict(pid=99111,name='viewdraw.exe',executable='viewdraw.exe',command='',parent=0)
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners',lambda names:[row])
return library,source,source.parent/'PCB/main.pcb'
def test_pathless_native_cannot_silently_authorize_a_write(tmp_path,monkeypatch):
from cbb_refresh_verify.backup_recovery import _idle_check
paths=fixture_paths(tmp_path,monkeypatch)
with pytest.raises(ValueError,match='TARGET_NATIVE_OWNER_UNCONFIRMED'):
_idle_check(*paths)
def test_explicit_batch_confirmation_is_bound_to_library_and_process_identity(tmp_path,monkeypatch):
from cbb_refresh_verify.write_admission import WriteAdmission
from cbb_refresh_verify.backup_recovery import _idle_check
paths=fixture_paths(tmp_path,monkeypatch)
identity={'pid':99111,'created_handle':'one','image':'viewdraw.exe','owner_sid':'user','session_id':1}
monkeypatch.setattr('cbb_refresh_verify.write_admission.process_identity',lambda pid:dict(identity))
choices=[]
def prompt(choice):choices.append(choice);choice.choose('continue')
admission=WriteAdmission(prompt=prompt,stop=Event())
check=lambda:_idle_check(*paths,confirmation=admission,evidence=tmp_path/'evidence',block='Block')
check();check()
assert len(choices)==1
identity['created_handle']='reused-pid'
check()
assert len(choices)==2
other=tmp_path/'other/lib.lmc';other.parent.mkdir();other.touch()
_idle_check(other,*paths[1:],confirmation=admission,evidence=tmp_path/'other-evidence',block='Other')
assert len(choices)==3
@pytest.mark.parametrize('decision',['skip','cancel'])
def test_decline_has_no_grant_and_only_cancel_stops_batch(tmp_path,monkeypatch,decision):
from cbb_refresh_verify.write_admission import WriteAdmission,WriteAdmissionDeclined
from cbb_refresh_verify.backup_recovery import _idle_check
paths=fixture_paths(tmp_path,monkeypatch);stop=Event()
monkeypatch.setattr('cbb_refresh_verify.write_admission.process_identity',lambda pid:
dict(pid=pid,created_handle='one',image='viewdraw.exe',owner_sid='user',session_id=1))
admission=WriteAdmission(prompt=lambda choice:choice.choose(decision),stop=stop)
with pytest.raises(WriteAdmissionDeclined):
_idle_check(*paths,confirmation=admission,evidence=tmp_path/'evidence',block='Block')
assert stop.is_set() is (decision=='cancel')
def test_confirmation_cannot_override_actual_database_occupancy(tmp_path,monkeypatch):
import win32con,win32file
from cbb_refresh_verify.write_admission import WriteAdmission
from cbb_refresh_verify.backup_recovery import _idle_check
paths=fixture_paths(tmp_path,monkeypatch);asked=[]
admission=WriteAdmission(prompt=lambda choice:asked.append(choice),stop=Event())
handle=win32file.CreateFile(str(paths[0]),win32con.GENERIC_READ,0,None,win32con.OPEN_EXISTING,0,None)
try:
with pytest.raises(Exception):
_idle_check(*paths,confirmation=admission,evidence=tmp_path/'evidence',block='Block')
assert not asked
finally:handle.Close()
def test_write_probe_batches_native_owner_queries(tmp_path,monkeypatch):
from test_management import project
from cbb_refresh_verify.backup_recovery import _idle_check
source=project(tmp_path/'source'); library=tmp_path/'lib.lmc';library.touch();queries=[]
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners',lambda names:
queries.append(tuple(names)) or [])
_idle_check(library,source,source.parent/'PCB/main.pcb')
assert len(queries)==2
assert all(len(names)==5 for names in queries)
def test_user_can_close_unknown_client_before_confirming(tmp_path,monkeypatch):
from cbb_refresh_verify import write_admission as admission_module
from cbb_refresh_verify.write_admission import WriteAdmission
from cbb_refresh_verify.backup_recovery import _idle_check
paths=fixture_paths(tmp_path,monkeypatch);ended=[]
def identity(pid):
if ended:
error=OSError('already exited');error.winerror=87;raise error
return dict(pid=pid,created_handle='one',image='viewdraw.exe',owner_sid='user',session_id=1)
monkeypatch.setattr(admission_module,'process_identity',identity)
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners',lambda names: [] if ended else
[dict(pid=99111,name='viewdraw.exe',executable='viewdraw.exe',command='',parent=0)])
def prompt(choice):ended.append(True);choice.choose('continue')
_idle_check(*paths,confirmation=WriteAdmission(prompt=prompt),evidence=tmp_path/'evidence',block='Block')
@pytest.mark.parametrize('first,expected',[('skip',['SKIPPED','UPLOADED']),('cancel',['CANCELLED'])])
def test_batch_continues_only_after_skip_or_confirmed_release(tmp_path,monkeypatch,first,expected):
from dataclasses import replace
from test_management import FileAdapter,project
from cbb_refresh_verify.management import ManagementRequest,run_management_batch
library,source,_=fixture_paths(tmp_path,monkeypatch)
monkeypatch.setattr('cbb_refresh_verify.write_admission.process_identity',lambda pid:
dict(pid=pid,created_handle='one',image='viewdraw.exe',owner_sid='user',session_id=1))
choices=[]
def prompt(choice):choices.append(choice);choice.choose(first if len(choices)==1 else 'continue')
request=ManagementRequest('add',library,'One',source=source,auto_verify=False,evidence_dir=tmp_path/'evidence')
adapter=FileAdapter();stop=Event()
results=run_management_batch([request,replace(request,name='Two')],adapter=adapter,stop=stop,version_prompt=prompt)
assert [r.status for r in results]==expected
assert all(r.safe_to_continue for r in results)
assert len(adapter.calls)==(1 if first=='skip' else 0)
def test_write_confirmation_dialog_defaults_cancel_and_cannot_overwrite_choice(qtbot):
from cbb_refresh_verify.write_admission import WriteOwnerChoice
from cbb_refresh_verify.ui.write_owner_dialog import WriteOwnerDialog
choice=WriteOwnerChoice('Block','target.lmc',[dict(pid=12,name='viewdraw.exe',image='viewdraw.exe')])
dialog=WriteOwnerDialog(choice);qtbot.addWidget(dialog)
assert dialog.defaultButton() is dialog.cancel_button
dialog.skip_button.click();dialog.reject()
assert choice.decision=='skip'
def test_restore_confirmation_evidence_does_not_collide_with_owned_recovery_directory(recovery_files,monkeypatch):
from cbb_refresh_verify.backup_recovery import recover_from_backup
from cbb_refresh_verify.verify_runner import VerifyResult
request,original,source=recovery_files
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners',lambda names:[
dict(pid=99111,name='viewdraw.exe',executable='viewdraw.exe',command='',parent=0)])
monkeypatch.setattr('cbb_refresh_verify.write_admission.process_identity',lambda pid:
dict(pid=pid,created_handle='one',image='viewdraw.exe',owner_sid='user',session_id=1))
result=recover_from_backup(request,source,version_prompt=lambda c:c.choose('continue'),
verifier=lambda *_a,**_kw:VerifyResult('PASS',library_flag='GREEN'))
assert result.status=='PASS',result.stderr
assert (original.parent/'database/icdb.dat').read_bytes()==b'healthy'
assert list(result.evidence_path.parent.glob('write-owner-consent-*.json'))
def test_cancel_batch_also_stops_default_api_without_a_caller_event(tmp_path,monkeypatch):
from dataclasses import replace
from test_management import FileAdapter
from cbb_refresh_verify.management import ManagementRequest,run_management_batch
library,source,_=fixture_paths(tmp_path,monkeypatch)
monkeypatch.setattr('cbb_refresh_verify.write_admission.process_identity',lambda pid:
dict(pid=pid,created_handle='one',image='viewdraw.exe',owner_sid='user',session_id=1))
choices=[]
def prompt(choice):choices.append(choice);choice.choose('cancel' if len(choices)==1 else 'continue')
request=ManagementRequest('add',library,'One',source=source,auto_verify=False,evidence_dir=tmp_path/'evidence')
adapter=FileAdapter()
results=run_management_batch([request,replace(request,name='Two')],adapter=adapter,version_prompt=prompt)
assert [r.status for r in results]==['CANCELLED']
assert len(choices)==1 and not adapter.calls
def test_new_unknown_client_during_confirmation_requires_new_confirmation(tmp_path,monkeypatch):
from cbb_refresh_verify.write_admission import WriteAdmission
from cbb_refresh_verify.backup_recovery import _idle_check
paths=fixture_paths(tmp_path,monkeypatch);added=[]
first=dict(pid=99111,name='viewdraw.exe',executable='viewdraw.exe',command='',parent=0)
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners',lambda names:
[first,dict(first,pid=99112)] if added else [first])
monkeypatch.setattr('cbb_refresh_verify.write_admission.process_identity',lambda pid:
dict(pid=pid,created_handle='one',image='viewdraw.exe',owner_sid='user',session_id=1))
def prompt(choice):added.append(True);choice.choose('continue')
with pytest.raises(ValueError,match='出现新的未知进程'):
_idle_check(*paths,confirmation=WriteAdmission(prompt=prompt),evidence=tmp_path/'evidence',block='Block')
def test_evidence_write_failure_never_grants_future_writes(tmp_path,monkeypatch):
from cbb_refresh_verify.write_admission import WriteAdmission
paths=fixture_paths(tmp_path,monkeypatch)
owner=dict(pid=99111,name='viewdraw.exe',executable='viewdraw.exe',command='',parent=0)
monkeypatch.setattr('cbb_refresh_verify.write_admission.process_identity',lambda pid:
dict(pid=pid,created_handle='one',image='viewdraw.exe',owner_sid='user',session_id=1))
def fail(*args,**kwargs):raise OSError('disk full')
monkeypatch.setattr('cbb_refresh_verify.management._write_json',fail)
admission=WriteAdmission(prompt=lambda choice:choice.choose('continue'))
with pytest.raises(OSError,match='disk full'):
admission.confirm(paths[0],[owner],evidence=tmp_path/'evidence',block='Block')
assert not admission.confirmed(paths[0],[owner])