fix: address review 414 write consent and native ownership boundaries
This commit is contained in:
1 parent
1572e2d8ca
commit
fee4a67ff1
19 files changed
+1008
-64
No files matched your search
@@ -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:
|
||||
|
||||
@@ -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
|
||||
@@ -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.')
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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'))
|
||||
@@ -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)
|
||||
Reference in new issue
Block a user