Reject incomplete install packages and exclude inherited guest disk

This commit is contained in:
bholman committed 2026-11-18 16:33:51 -07:00
1 parent 8088c1fbf6
commit 9b8e25d977
9 files changed
+277 -25

No files matched your search

+70 -15
View File
@@ -14,8 +14,9 @@ import shlex
import subprocess
import sys
import uuid
import xml.etree.ElementTree as ET
from release import ROOT, make_release, sha
from release import BOOT, SSC, ROOT, default_config, make_release, sha
LAUNCHER = '_Computer/Coco 3 Plus.mgl'
@@ -110,24 +111,78 @@ class OpenSshTarget:
def validated_manifest(package):
"""Require a coherent, ROM-complete local package before any target call."""
manifest = json.loads((package / 'manifest.json').read_text())
if manifest.get('public_package'):
raise RuntimeError('Public core/source package omits required ROMs. '
'Build a complete local package with your verified '
'ROM inputs; see docs/INSTALL.md.')
for name, entry in manifest['files'].items():
if not isinstance(manifest, dict) or type(manifest.get('format')) is not int or manifest['format'] != 1:
raise RuntimeError('Unsupported release manifest format')
if manifest.get('public_package') is not False or manifest.get('roms_required_separately') is not False:
raise RuntimeError('A complete local package with verified ROM inputs is required; see docs/INSTALL.md')
if type(manifest.get('ssc_included')) is not bool:
raise RuntimeError('Explicit SSC inclusion state is required')
digest = manifest.get('rbf_sha256')
if not isinstance(digest, str) or not re.fullmatch(r'[0-9a-f]{64}', digest):
raise RuntimeError('Invalid RBF SHA-256')
files = manifest.get('files')
if not isinstance(files, dict):
raise RuntimeError('Manifest file inventory is required')
for name, entry in files.items():
if not isinstance(name, str):
raise RuntimeError('Invalid manifest path')
path = PurePosixPath(name)
if path.is_absolute() or '..' in path.parts or '\\' in name:
if (not name or path.is_absolute() or '..' in path.parts or
'\\' in name or ':' in name or path.as_posix() != name):
raise RuntimeError('Unsafe manifest path')
if entry['policy'] not in ('create-if-missing', 'backup-and-replace'):
if (not isinstance(entry, dict) or type(entry.get('bytes')) is not int or
entry['bytes'] < 1 or not isinstance(entry.get('sha256'), str) or
not re.fullmatch(r'[0-9a-f]{64}', entry['sha256'])):
raise RuntimeError('Invalid file identity: ' + name)
if entry.get('policy') not in ('create-if-missing', 'backup-and-replace'):
raise RuntimeError('Unsupported install policy: ' + name)
file = package / 'fat' / name
if (not file.is_file() or file.stat().st_size != entry['bytes'] or
if (not file.is_file() or file.is_symlink() or file.stat().st_size != entry['bytes'] or
sha(file) != entry['sha256']):
raise RuntimeError('Release changed: ' + name)
if (LAUNCHER not in manifest['files'] or
manifest['files'][LAUNCHER]['policy'] != 'backup-and-replace'):
raise RuntimeError('A replaceable Coco 3 Plus launcher is required')
def require(name, identity=None, policy='backup-and-replace', content=None):
entry = files.get(name)
if entry is None or entry['policy'] != policy:
raise RuntimeError('Required package member/policy missing: ' + name)
if identity is not None and (entry['bytes'], entry['sha256']) != identity:
raise RuntimeError('Incorrect required identity: ' + name)
if content is not None and (package / 'fat' / name).read_bytes() != content:
raise RuntimeError('Incorrect required content: ' + name)
core = '_Computer/.coco3plus/' + digest[:12] + '/coco3plus.rbf'
require(core)
if files[core]['sha256'] != digest:
raise RuntimeError('RBF member contradicts top-level SHA-256')
require(LAUNCHER)
try:
launcher = ET.fromstring((package / 'fat' / LAUNCHER).read_bytes())
except ET.ParseError as error:
raise RuntimeError('Invalid Coco 3 Plus launcher XML') from error
if (launcher.tag != 'mistergamedescription' or launcher.attrib or
len(launcher) != 2 or len(launcher.findall('rbf')) != 1 or
len(launcher.findall('setname')) != 1 or
any(child.attrib or len(child) for child in launcher) or
launcher.findtext('rbf') != core[:-4] or
launcher.findtext('setname') != 'coco3plus'):
raise RuntimeError('Launcher RBF reference/setname contradicts package')
for name, identity in BOOT.items():
require('games/coco3plus/' + name, identity)
ssc = manifest['ssc_included']
require('config/coco3plus_v51.CFG', policy='create-if-missing',
content=default_config(ssc))
ssc_members = {'games/coco3plus/' + name for name in SSC}
ssc_members.update(('config/coco3plus.f4', 'config/coco3plus.f5'))
if ssc:
for name, identity in SSC.items():
require('games/coco3plus/' + name, identity)
for index, name in ((4, 'pic-7040-510.bin'), (5, 'sp0256-al2.bin')):
content = ('/media/fat/games/coco3plus/' + name).encode().ljust(1024, b'\0')
require('config/coco3plus.f' + str(index), content=content)
elif ssc_members.intersection(files):
raise RuntimeError('SSC files contradict disabled SSC package state')
return manifest
@@ -167,7 +222,7 @@ def install_release(package, host, user='root', load=False, *, target=None, stam
launcher='/media/fat/' + LAUNCHER,
launcher_temporary='/media/fat/' + LAUNCHER + '.install-' + stamp + '.tmp',
activation_attempted=False, launcher_activated=False, load_requested=load,
loaded=False, planned_files=plans, active_file=None,
load_command_sent=False, startup_observed=False, planned_files=plans, active_file=None,
completed_files=[], history=['planned'],
recovery='Preserve stage and backup. Before activation the old launcher '
'remains, but supporting files may already have changed. Restore '
@@ -234,10 +289,10 @@ def install_release(package, host, user='root', load=False, *, target=None, stam
client.sync()
if load:
phase('loading')
receipt['loaded'] = None
receipt['load_command_sent'] = None
save()
client.load()
receipt['loaded'] = True
receipt['load_command_sent'] = True
receipt['status'] = 'complete'
receipt['phase'] = 'complete'
receipt['history'].append('complete')
+1 -1
View File
@@ -10,7 +10,7 @@ SOURCE_ROOT_FILES={'.gitattributes','.gitignore','AGENTS.md','CHANGELOG.md',
'CoCo3.sv','CoCo3FPGA.sdc','build_id_num.v','changes.txt','external-io.sdc',
'files.qip','pll.xml','reset-cpu.sdc','uart-reset.sdc'}
SOURCE_SUFFIXES={
'docs':{'.md','.vhd'},'roms':{'.md'},
'docs':{'.md'},'roms':{'.md'},
'rtl':{'.sv','.v','.vh','.vhd','.mif','.hex','.qip','.qsys','.ip','.tcl','.sdc',
'.ppf','.sip','.spd'},
'sys':{'.sv','.v','.vh','.vhd','.mif','.hex','.qip','.qsys','.ip','.tcl','.sdc'},