Inspect current ZX resource envelopes in the node publisher

This commit is contained in:
waozi committed 2026-10-31 00:08:49 -03:00
1 parent f3d543afe8
commit 30e3bf7623
2 files changed
+20 -4

No files matched your search

+2 -2
View File
@@ -98,8 +98,8 @@ def course_narration_keys(data):
def bundle_assets(data):
"""Read the bounded ZX v26 resource table; never execute a bundle."""
if data[:8] != b'ZX\0\0\x1a\0\0\0' or len(data) > MAXIMUM:
"""Read the bounded ZX v26/v27 resource envelope; never execute its IR."""
if data[:8] not in (b'ZX\0\0\x1a\0\0\0', b'ZX\0\0\x1b\0\0\0') or len(data) > MAXIMUM:
raise ValueError('unsupported resource bundle')
at = 8
+18 -2
View File
@@ -13,11 +13,11 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'scripts'))
from node_app_games import required_games, stage_games
def fixture_bundle(assets):
def fixture_bundle(assets, version=26):
def text(value):
data = value.encode()
return struct.pack('<I', len(data)) + data
data = b'ZX\0\0\x1a\0\0\0' + text('collection') + text('Main')
data = b'ZX\0\0' + struct.pack('<I', version) + text('collection') + text('Main')
data += struct.pack('<IIIII', 0, 0, 0, 0, len(assets))
for name, content in assets.items():
data += text(name) + struct.pack('<I', len(content)) + content
@@ -54,6 +54,22 @@ class GameArchiveTests(unittest.TestCase):
self.bundle.write_bytes(fixture_bundle({}))
self.assertEqual(required_games(self.bundle), set())
def test_current_bundle_format_keeps_archive_validation(self):
catalog = json.dumps({'children': [self.child]}).encode()
self.bundle.write_bytes(fixture_bundle({'assets/apps/catalog.json': catalog}, version=27))
self.assertEqual(required_games(self.bundle), {self.name})
self.archive_games([(self.name, self.game)])
stage_games(self.bundle, self.archive, self.output)
self.assertEqual((self.output / self.name).read_bytes(), self.game)
self.archive_games([(self.name, b'ZX\0\0wrong bytes')])
with self.assertRaises(ValueError):
stage_games(self.bundle, self.archive, self.output)
self.assertEqual((self.output / self.name).read_bytes(), self.game)
for data in (fixture_bundle({}, version=28), self.bundle.read_bytes()[:-1],
self.bundle.read_bytes() + b'extra'):
self.bundle.write_bytes(data)
with self.assertRaises(ValueError):
required_games(self.bundle)
def test_unpacked_art_downloads_like_a_game(self):
art = b'ZX\0\0library art'
name = sha256(art).hexdigest() + '.zx'