Verify previous release packages using GitHub asset digests
This commit is contained in:
1 parent
927aec8ffe
commit
9c8def5e5c
4 files changed
+43
-3
No files matched your search
@@ -143,6 +143,8 @@ jobs:
|
|||||||
sudo apt-get update -qq
|
sudo apt-get update -qq
|
||||||
sudo apt-get install -y qemu-system-x86 openssh-client
|
sudo apt-get install -y qemu-system-x86 openssh-client
|
||||||
- name: Test with the real OpenWrt package manager and BusyBox ash
|
- name: Test with the real OpenWrt package manager and BusyBox ash
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ github.token }}
|
||||||
run: |
|
run: |
|
||||||
python3 scripts/test-openwrt-package-vm.py \
|
python3 scripts/test-openwrt-package-vm.py \
|
||||||
--release '${{ matrix.version }}' --package-dir artifacts \
|
--release '${{ matrix.version }}' --package-dir artifacts \
|
||||||
|
|||||||
@@ -65,6 +65,33 @@ def release_tag():
|
|||||||
return 'v' + version + (('-r' + revision) if revision != '1' else '')
|
return 'v' + version + (('-r' + revision) if revision != '1' else '')
|
||||||
|
|
||||||
|
|
||||||
|
def release_asset(tag, filename):
|
||||||
|
"""Resolve the official prior package even if its SHA256SUMS was removed."""
|
||||||
|
repository = 'https://github.com/kzolotarev95/luci-app-owrt-remote'
|
||||||
|
api = 'https://api.github.com/repos/kzolotarev95/luci-app-owrt-remote/releases/tags/'
|
||||||
|
if not re.fullmatch(r'v[0-9]+(?:-r[0-9]+)?', tag) or not re.fullmatch(r'[A-Za-z0-9_.+-]+', filename):
|
||||||
|
raise ValueError('invalid previous release identifier')
|
||||||
|
headers = {'User-Agent': 'OpenWrt-Remote-package-builder', 'Accept': 'application/vnd.github+json'}
|
||||||
|
token = os.environ.get('GITHUB_TOKEN')
|
||||||
|
if token:
|
||||||
|
headers['Authorization'] = 'Bearer ' + token
|
||||||
|
with urllib.request.urlopen(urllib.request.Request(api + tag, headers=headers), timeout=45) as response:
|
||||||
|
data = response.read(4 * 1024 * 1024 + 1)
|
||||||
|
if len(data) > 4 * 1024 * 1024:
|
||||||
|
raise ValueError('oversized previous Release metadata')
|
||||||
|
assets = [asset for asset in json.loads(data).get('assets', []) if asset.get('name') == filename]
|
||||||
|
if len(assets) != 1:
|
||||||
|
raise ValueError('previous Release package missing or ambiguous: ' + filename)
|
||||||
|
asset = assets[0]
|
||||||
|
expected_url = repository + '/releases/download/' + tag + '/' + filename
|
||||||
|
digest = asset.get('digest') or ''
|
||||||
|
if asset.get('browser_download_url') != expected_url or not re.fullmatch(r'sha256:[0-9a-f]{64}', digest):
|
||||||
|
raise ValueError('previous Release package has no official SHA256: ' + filename)
|
||||||
|
if not 0 < int(asset.get('size') or 0) <= 16 * 1024 * 1024:
|
||||||
|
raise ValueError('invalid previous Release package size')
|
||||||
|
return expected_url, digest.removeprefix('sha256:')
|
||||||
|
|
||||||
|
|
||||||
def latest_release(series, html):
|
def latest_release(series, html):
|
||||||
candidates = [link.rstrip("/") for link in Links(html).links
|
candidates = [link.rstrip("/") for link in Links(html).links
|
||||||
if re.fullmatch(re.escape(series) + r"\.[0-9]+/", link)]
|
if re.fullmatch(re.escape(series) + r"\.[0-9]+/", link)]
|
||||||
|
|||||||
@@ -64,10 +64,9 @@ def main():
|
|||||||
tag = 'v' + version + (('-r' + previous) if previous != '1' else '')
|
tag = 'v' + version + (('-r' + previous) if previous != '1' else '')
|
||||||
series = '.'.join(args.release.split('.')[:2])
|
series = '.'.join(args.release.split('.')[:2])
|
||||||
name = f'{package.PACKAGE}_{version}-r{previous}_openwrt-{series}_{"noarch" if apk else "all"}{candidate.suffix}'
|
name = f'{package.PACKAGE}_{version}-r{previous}_openwrt-{series}_{"noarch" if apk else "all"}{candidate.suffix}'
|
||||||
origin = 'https://github.com/kzolotarev95/luci-app-owrt-remote/releases/download/' + tag + '/'
|
url, expected = package.release_asset(tag, name)
|
||||||
expected = package.checksum(package.get_text(origin + 'SHA256SUMS'), name)
|
|
||||||
baseline = source / 'test-fixtures' / ('previous-release' + candidate.suffix)
|
baseline = source / 'test-fixtures' / ('previous-release' + candidate.suffix)
|
||||||
package.download(origin + name, baseline, expected)
|
package.download(url, baseline, expected)
|
||||||
output = Path(args.output).resolve()
|
output = Path(args.output).resolve()
|
||||||
output.mkdir(parents=True, exist_ok=True)
|
output.mkdir(parents=True, exist_ok=True)
|
||||||
port = free_port()
|
port = free_port()
|
||||||
|
|||||||
@@ -89,6 +89,18 @@ class PackageTests(unittest.TestCase):
|
|||||||
with self.subTest(values=values), mock.patch.object(p,'versions',return_value=values):
|
with self.subTest(values=values), mock.patch.object(p,'versions',return_value=values):
|
||||||
self.assertEqual(p.release_tag(), expected)
|
self.assertEqual(p.release_tag(), expected)
|
||||||
|
|
||||||
|
def test_previous_package_uses_official_api_digest_without_checksum_asset(self):
|
||||||
|
filename = 'luci-app-owrt-remote_122-r1_openwrt-25.12_noarch.apk'
|
||||||
|
url = 'https://github.com/kzolotarev95/luci-app-owrt-remote/releases/download/v122/' + filename
|
||||||
|
asset = {'name':filename,'browser_download_url':url,'digest':'sha256:'+'a'*64,'size':83000}
|
||||||
|
data = p.json.dumps({'assets':[asset]}).encode()
|
||||||
|
with mock.patch.object(p.urllib.request,'urlopen',return_value=io.BytesIO(data)):
|
||||||
|
self.assertEqual(p.release_asset('v122',filename),(url,'a'*64))
|
||||||
|
for change in ({'digest':None},{'browser_download_url':'https://other.example/package.apk'}):
|
||||||
|
invalid = dict(asset,**change)
|
||||||
|
with mock.patch.object(p.urllib.request,'urlopen',return_value=io.BytesIO(p.json.dumps({'assets':[invalid]}).encode())):
|
||||||
|
with self.assertRaises(ValueError):p.release_asset('v122',filename)
|
||||||
|
|
||||||
def test_package_scripts_defer_procd_lifecycle_to_openwrt_for_apk_and_ipk(self):
|
def test_package_scripts_defer_procd_lifecycle_to_openwrt_for_apk_and_ipk(self):
|
||||||
script = p.package_hook("postinst")
|
script = p.package_hook("postinst")
|
||||||
self.assertNotIn("configure ]", script)
|
self.assertNotIn("configure ]", script)
|
||||||
|
|||||||
Reference in new issue
Block a user