Add offline fallbacks for remote components #9

Merged
Dusk-92 merged 101 commits from test/remote-fallbacks into main 2026-09-04 15:03:01 +00:00
2 changed files with 46 additions and 4 deletions
Showing only changes of commit 94a613a815 - Show all commits
+8 -1
View File
@@ -129,6 +129,13 @@ def _strict_verify_mpq(path):
raise remote_packages.RemotePackageError( raise remote_packages.RemotePackageError(
"Downloaded MPQ has an invalid nested archive offset." "Downloaded MPQ has an invalid nested archive offset."
) )
if (
_user_data_size < user_header_size
or _user_data_size > header_offset
):
raise remote_packages.RemotePackageError(
"Downloaded MPQ has an invalid user-data size."
)
archive_base = header_offset archive_base = header_offset
handle.seek(archive_base) handle.seek(archive_base)
header = handle.read(32) header = handle.read(32)
@@ -179,7 +186,7 @@ def _strict_verify_mpq(path):
raise remote_packages.RemotePackageError( raise remote_packages.RemotePackageError(
f"Downloaded MPQ uses unsupported format version {format_version}." f"Downloaded MPQ uses unsupported format version {format_version}."
) )
if sector_size_shift > 16: if sector_size_shift == 0 or sector_size_shift > 16:
raise remote_packages.RemotePackageError( raise remote_packages.RemotePackageError(
"Downloaded MPQ has an invalid sector-size shift." "Downloaded MPQ has an invalid sector-size shift."
) )
+36 -1
View File
@@ -13,13 +13,14 @@ def _classic_mpq_bytes(
hash_table_offset=32, hash_table_offset=32,
block_table_offset=48, block_table_offset=48,
inner_magic=b"MPQ\x1A", inner_magic=b"MPQ\x1A",
sector_size_shift=3,
): ):
header = inner_magic + struct.pack( header = inner_magic + struct.pack(
"<IIHHIIII", "<IIHHIIII",
32, 32,
archive_size, archive_size,
0, 0,
3, sector_size_shift,
hash_table_offset, hash_table_offset,
block_table_offset, block_table_offset,
1, 1,
@@ -35,17 +36,21 @@ def _write_wrapped_mpq(
*, *,
header_offset=32, header_offset=32,
user_header_size=16, user_header_size=16,
user_data_size=None,
inner_magic=b"MPQ\x1A", inner_magic=b"MPQ\x1A",
hash_table_offset=32, hash_table_offset=32,
block_table_offset=48, block_table_offset=48,
sector_size_shift=3,
): ):
inner = _classic_mpq_bytes( inner = _classic_mpq_bytes(
inner_magic=inner_magic, inner_magic=inner_magic,
hash_table_offset=hash_table_offset, hash_table_offset=hash_table_offset,
block_table_offset=block_table_offset, block_table_offset=block_table_offset,
sector_size_shift=sector_size_shift,
) )
total_size = max(16, header_offset + len(inner)) total_size = max(16, header_offset + len(inner))
data = bytearray(total_size) data = bytearray(total_size)
if user_data_size is None:
user_data_size = max(0, header_offset - user_header_size) user_data_size = max(0, header_offset - user_header_size)
data[:16] = b"MPQ\x1B" + struct.pack( data[:16] = b"MPQ\x1B" + struct.pack(
"<III", "<III",
@@ -141,6 +146,26 @@ class WrappedMpqValidationTests(unittest.TestCase):
): ):
dynamic._strict_verify_mpq(path) dynamic._strict_verify_mpq(path)
def test_rejects_user_data_size_smaller_than_user_header(self):
with tempfile.TemporaryDirectory() as temp:
path = os.path.join(temp, "wrapped.mpq")
_write_wrapped_mpq(path, user_data_size=8)
with self.assertRaisesRegex(
remote_packages.RemotePackageError,
"invalid user-data size",
):
dynamic._strict_verify_mpq(path)
def test_rejects_user_data_size_beyond_nested_archive_offset(self):
with tempfile.TemporaryDirectory() as temp:
path = os.path.join(temp, "wrapped.mpq")
_write_wrapped_mpq(path, user_data_size=40)
with self.assertRaisesRegex(
remote_packages.RemotePackageError,
"invalid user-data size",
):
dynamic._strict_verify_mpq(path)
def test_rejects_wrapper_with_corrupt_nested_mpq(self): def test_rejects_wrapper_with_corrupt_nested_mpq(self):
with tempfile.TemporaryDirectory() as temp: with tempfile.TemporaryDirectory() as temp:
path = os.path.join(temp, "wrapped.mpq") path = os.path.join(temp, "wrapped.mpq")
@@ -161,6 +186,16 @@ class WrappedMpqValidationTests(unittest.TestCase):
): ):
dynamic._strict_verify_mpq(path) dynamic._strict_verify_mpq(path)
def test_rejects_zero_sector_size_shift(self):
with tempfile.TemporaryDirectory() as temp:
path = os.path.join(temp, "wrapped.mpq")
_write_wrapped_mpq(path, sector_size_shift=0)
with self.assertRaisesRegex(
remote_packages.RemotePackageError,
"invalid sector-size shift",
):
dynamic._strict_verify_mpq(path)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() unittest.main()