starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-24 23:03:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_remote.py: better detection of invalid snaps (#10741)

Browse Source 
Another attempt at fixing #10617. Seems the recent armhf builds resulted
in slightly different HTML output, so instead of checking if the output
matches a specific failure case, just check if we've actually got a
SquashFS lookin file. According to
https://dr-emann.github.io/squashfs/squashfs.html#_the_superblock, a
SquashFS file starts with the magic number "hsqs".
This commit is contained in:
Will Greenberg
2026-07-22 16:41:40 -07:00
committed by GitHub
parent 289a3826c0
commit e378490c60
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/snap/build_remote.py
+9 -6
View File
@@ -144,14 +144,17 @@ def _build_snap(
for arch in archs:
snap_path_list = glob.glob(join(workspace, f'{target}_*_{arch}.snap'))
assert len(snap_path_list) == 1
with open(snap_path_list[0], 'r') as f:
with open(snap_path_list[0], 'rb') as f:
first_block = f.read(10)
# 'hsqs' is the magic number that SquashFS files start with
if first_block.startswith(b'hsqs'):
continue
failed_archs.add(arch)
try:
first_line = f.readline().rstrip()
first_block_str = first_block.decode()
except UnicodeDecodeError:
first_line = ''
if first_line == "<!DOCTYPE html>":
failed_archs.add(arch)
print(f'The {target} {arch} snap file contains html instead of a snap')
first_block_str = first_block.hex(sep=',')
print(f'The {target} {arch} snap file began with invalid data: {first_block_str}')
dump_output = bool(failed_archs)
if not dump_output: