fix: scope maintenance addresses to selected project and shared stores
This commit is contained in:
1 parent
4cbca0b5a6
commit
b635432cff
2 files changed
+33
-4
No files matched your search
@@ -43,6 +43,25 @@ def address_snapshot(paths):
|
||||
for path in paths}
|
||||
|
||||
|
||||
def _scoped_addresses(request):
|
||||
from .scoped_manifest import scan_tree
|
||||
root = Path(request.lmc_file).parent
|
||||
addresses = []
|
||||
for path in scan_tree(root):
|
||||
if path.name.casefold() != 'saddress.adr':
|
||||
continue
|
||||
parts = tuple(part.casefold() for part in path.relative_to(root).parts)
|
||||
independent = (len(parts) >= 6 and parts[0] == 'reusableblockslp'
|
||||
and parts[1] != request.block_name.casefold() and parts[2] == 'work'
|
||||
and parts[3:] in (('database', 'cdbsvr', 'saddress.adr'),
|
||||
('pcb', 'database', 'cdbsvr', 'saddress.adr')))
|
||||
if not independent:
|
||||
# Current project and shared/unknown scopes remain visible to the
|
||||
# selector; only exact independent other-CBB Work stores are omitted.
|
||||
addresses.append(path)
|
||||
return addresses
|
||||
|
||||
|
||||
def select_maintenance_target(request):
|
||||
from .verify_runner import preflight
|
||||
from .backup_recovery import _project_text
|
||||
@@ -71,8 +90,7 @@ def select_maintenance_target(request):
|
||||
if not (database/'icdb.dat').is_file():
|
||||
raise ValueError('MAINTENANCE_TARGET_UNCONFIRMED: 缺少 icdb.dat')
|
||||
candidates.append(RepairTarget(candidate, candidate.parent/'database'))
|
||||
addresses = [path for path in scan_tree(Path(request.lmc_file).parent)
|
||||
if path.name.casefold() == 'saddress.adr']
|
||||
addresses = _scoped_addresses(request)
|
||||
if len(addresses) != 1:
|
||||
raise ValueError('MAINTENANCE_TARGET_UNCONFIRMED: 需要唯一工程地址记录;共享或多个数据库不能推测修复')
|
||||
matches = [target for target in candidates
|
||||
@@ -106,8 +124,7 @@ def maintenance_target_guard(request, expected=None):
|
||||
win32con.OPEN_EXISTING, win32con.FILE_ATTRIBUTE_NORMAL, None)
|
||||
stack.callback(handle.Close)
|
||||
assert_native_idle()
|
||||
current_addresses = [p for p in scan_tree(Path(request.lmc_file).parent)
|
||||
if p.name.casefold() == 'saddress.adr']
|
||||
current_addresses = _scoped_addresses(request)
|
||||
if address_snapshot(current_addresses) != baseline:
|
||||
raise ValueError('MAINTENANCE_SOURCE_CHANGED: 地址记录在检查期间变化')
|
||||
yield {'target': target, 'context': context, 'project': project, 'pcb': pcb}
|
||||
|
||||
@@ -231,3 +231,15 @@ def test_guard_failure_keeps_takeover_checkpoint_byte_exact_when_address_changes
|
||||
with locks.LibraryLock.for_maintenance(request.lmc_file, request.evidence_dir/'takeover',
|
||||
lambda: entry.maintenance_target_guard(request)): pass
|
||||
assert marker.read_bytes() == old
|
||||
|
||||
|
||||
def test_independent_cbb_address_does_not_select_or_block_current_project(case):
|
||||
from cbb_refresh_verify.maintenance_entry import maintenance_target_guard
|
||||
request, project, address = case
|
||||
other = request.lmc_file.parent/'ReusableBlocksLP/1GPHY_8212/Work/database/cdbsvr/sAddress.adr'
|
||||
other.parent.mkdir(parents=True); other.write_bytes(b'independent CBB original address')
|
||||
with maintenance_target_guard(request) as checked:
|
||||
assert checked['target'].project == project
|
||||
assert set(checked['context']['addresses']) == {str(address.resolve())}
|
||||
assert other.read_bytes() == b'independent CBB original address'
|
||||
assert other.read_bytes() == b'independent CBB original address'
|
||||
Reference in new issue
Block a user