Require full runtime assets and verify every packaged APK

(cherry picked from commit 75c62ddd92000e31a96d9acbd9599cb07c7041ed)
This commit is contained in:
K11MCH1 committed 2026-10-25 02:10:00 +09:00
1 parent c334ef309b
commit a2fa72eb74
4 files changed
+75 -3

No files matched your search

+36 -2
View File
@@ -33,6 +33,16 @@ SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app
'app/src/main/assets/graphics_driver/adrenotools-turnip25.1.0.tzst']
def zstd():
executable = shutil.which('zstd')
if executable:
return executable
windows_tool = ROOT / 'build/windows-setup/tools/zstd/zstd.exe'
if windows_tool.is_file():
return str(windows_tool)
raise ValueError('zstd is required to verify Linux runtime packages')
def digest(path):
with path.open('rb') as source:
result = hashlib.file_digest(source, 'sha256') if hasattr(hashlib, 'file_digest') else None
@@ -132,7 +142,7 @@ def record(root=ROOT):
gzip.decompress((root / path).read_bytes())
except (OSError, EOFError) as error:
raise ValueError('Invalid desktop removal inventory: ' + name) from error
process = subprocess.Popen(['zstd', '-dc', str(root / paths['assets/pulseaudio.tzst'])], stdout=subprocess.PIPE)
process = subprocess.Popen([zstd(), '-dc', str(root / paths['assets/pulseaudio.tzst'])], stdout=subprocess.PIPE)
try:
with tarfile.open(fileobj=process.stdout, mode='r|') as archive:
names = {member.name.removeprefix('./') for member in archive}
@@ -171,7 +181,7 @@ def pack_digests(root, name):
path = root / PACKS / (name + '.tar.zst')
if not path.is_file():
raise ValueError('Missing add-on pack ' + name + '. Run tools/packs/build.sh app/build/packs.')
process = subprocess.Popen(['zstd', '-dc', str(path)], stdout=subprocess.PIPE)
process = subprocess.Popen([zstd(), '-dc', str(path)], stdout=subprocess.PIPE)
digests = {}
try:
with tarfile.open(fileobj=process.stdout, mode='r|') as archive:
@@ -185,6 +195,23 @@ def pack_digests(root, name):
return digests
def qualcomm_assets(root):
path = root / 'tools/qualcomm/runtime.json'
if not path.is_file():
return {}
lock = json.loads(path.read_text())
expected = {'assets/qualcomm/runtime.tzst': lock['sha256'],
'assets/qualcomm/gamescope': lock['gamescope']['member_sha256']}
built = lock['gamescope'].get('build')
if built:
expected['assets/qualcomm/licenses/gamescope-patched-source.tar.gzip'] = built['source_sha256']
expected.update({'assets/qualcomm/mesa/' + entry['path']: entry['sha256']
for entry in lock.get('mesa', {}).get('files', [])})
expected.update({'assets/qualcomm/' + entry['path']: entry['sha256']
for entry in lock.get('wsi', {}).get('files', [])})
return expected
def check_apk(apk, root=ROOT):
data = verify(root)
packs = {name: pack_digests(root, name) for name in PACK_NAMES}
@@ -216,6 +243,13 @@ def check_apk(apk, root=ROOT):
raise ValueError('APK missing ' + name)
if hashlib.sha256(content).hexdigest() != output['sha256']:
raise ValueError('APK has stale runtime input: ' + name)
for name, checksum in qualcomm_assets(root).items():
try:
content = package.read(name)
except KeyError:
raise ValueError('APK missing ' + name)
if hashlib.sha256(content).hexdigest() != checksum:
raise ValueError('APK has stale Qualcomm runtime input: ' + name)
if __name__ == '__main__':
+14
View File
@@ -1,6 +1,8 @@
import importlib.util
import gzip
import hashlib
import io
import json
from pathlib import Path, PureWindowsPath
import subprocess
import tarfile
@@ -209,3 +211,15 @@ class RuntimeInputsTest(unittest.TestCase):
path.write_bytes(b'not a gzip stream')
with self.assertRaisesRegex(ValueError, 'Invalid desktop removal inventory'):
runtime.record(self.root)
def test_stale_qualcomm_binary_is_rejected(self):
bridge, binary = b'bridge', b'new gamescope'
lock = self.root / 'tools/qualcomm/runtime.json'
lock.parent.mkdir(parents=True)
lock.write_text(json.dumps({'sha256': hashlib.sha256(bridge).hexdigest(),
'gamescope': {'member_sha256': hashlib.sha256(binary).hexdigest()}}))
apk = self.current_apk(self.root / 'qualcomm.apk', {
'assets/qualcomm/runtime.tzst': bridge,
'assets/qualcomm/gamescope': b'old gamescope'})
with self.assertRaisesRegex(ValueError, 'stale Qualcomm runtime input'):
runtime.check_apk(apk, self.root)