X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/2ffd66ba5682212fd0c92bb570b538caf894e0b3..refs/heads/electrikjesus-patch-1:/tools/helpers/images.py diff --git a/tools/helpers/images.py b/tools/helpers/images.py index 8a5a38b..f266db3 100644 --- a/tools/helpers/images.py +++ b/tools/helpers/images.py @@ -4,10 +4,11 @@ import logging import zipfile import json import hashlib +import shutil import os import tools.config from tools import helpers - +from shutil import which def sha256sum(filename): h = hashlib.sha256() @@ -36,6 +37,10 @@ def get(args): args, system_response['url'], system_response['filename'], cache=False) logging.info("Validating system image") if sha256sum(images_zip) != system_response['id']: + try: + os.remove(images_zip) + except: + pass raise ValueError("Downloaded system image hash doesn't match, expected: {}".format( system_response['id'])) logging.info("Extracting to " + args.images_path) @@ -61,6 +66,10 @@ def get(args): args, vendor_response['url'], vendor_response['filename'], cache=False) logging.info("Validating vendor image") if sha256sum(images_zip) != vendor_response['id']: + try: + os.remove(images_zip) + except: + pass raise ValueError("Downloaded vendor image hash doesn't match, expected: {}".format( vendor_response['id'])) logging.info("Extracting to " + args.images_path) @@ -70,6 +79,21 @@ def get(args): tools.config.save(args, cfg) os.remove(images_zip) break + remove_overlay(args) + +def validate(args, channel, image_zip): + # Verify that the zip comes from the channel + cfg = tools.config.load(args) + channel_url = cfg["waydroid"][channel] + channel_request = helpers.http.retrieve(channel_url) + if channel_request[0] != 200: + return False + channel_responses = json.loads(channel_request[1].decode('utf8'))["response"] + for build in channel_responses: + if sha256sum(image_zip) == build['id']: + return True + logging.warning(f"Could not verify the image {image_zip} against {channel_url}") + return False def replace(args, system_zip, system_time, vendor_zip, vendor_time): cfg = tools.config.load(args) @@ -77,20 +101,82 @@ def replace(args, system_zip, system_time, vendor_zip, vendor_time): if os.path.exists(system_zip): with zipfile.ZipFile(system_zip, 'r') as zip_ref: zip_ref.extractall(args.images_path) + os.remove(system_zip) cfg["waydroid"]["system_datetime"] = str(system_time) tools.config.save(args, cfg) if os.path.exists(vendor_zip): with zipfile.ZipFile(vendor_zip, 'r') as zip_ref: zip_ref.extractall(args.images_path) + os.remove(vendor_zip) cfg["waydroid"]["vendor_datetime"] = str(vendor_time) tools.config.save(args, cfg) + remove_overlay(args) + +def remove_overlay(args): + if os.path.isdir(tools.config.defaults["overlay_rw"]): + shutil.rmtree(tools.config.defaults["overlay_rw"]) + if os.path.isdir(tools.config.defaults["overlay_work"]): + shutil.rmtree(tools.config.defaults["overlay_work"]) + +def make_prop(args, cfg, full_props_path): + if not os.path.isfile(args.work + "/waydroid_base.prop"): + raise RuntimeError("waydroid_base.prop Not found") + with open(args.work + "/waydroid_base.prop") as f: + props = f.read().splitlines() + if not props: + raise RuntimeError("waydroid_base.prop is broken!!?") + + def add_prop(key, cfg_key): + value = cfg[cfg_key] + if value != "None": + value = value.replace("/mnt/", "/mnt_extra/") + props.append(key + "=" + value) + add_prop("waydroid.host.user", "user_name") + add_prop("waydroid.host.uid", "user_id") + add_prop("waydroid.host.gid", "group_id") + add_prop("waydroid.host_data_path", "waydroid_data") + add_prop("waydroid.xdg_runtime_dir", "xdg_runtime_dir") + add_prop("waydroid.pulse_runtime_path", "pulse_runtime_path") + add_prop("waydroid.wayland_display", "wayland_display") + add_prop("waydroid.background_start", "background_start") + if which("waydroid-sensord") is None: + props.append("waydroid.stub_sensors_hal=1") + dpi = cfg["lcd_density"] + if dpi != "0": + props.append("ro.sf.lcd_density=" + dpi) -def mount_rootfs(args, images_dir): + final_props = open(full_props_path, "w") + for prop in props: + final_props.write(prop + "\n") + final_props.close() + os.chmod(full_props_path, 0o644) + +def mount_rootfs(args, images_dir, session): + cfg = tools.config.load(args) helpers.mount.mount(args, images_dir + "/system.img", tools.config.defaults["rootfs"], umount=True) + if cfg["waydroid"]["mount_overlays"] == "True": + try: + helpers.mount.mount_overlay(args, [tools.config.defaults["overlay"], + tools.config.defaults["rootfs"]], + tools.config.defaults["rootfs"], + upper_dir=tools.config.defaults["overlay_rw"] + "/system", + work_dir=tools.config.defaults["overlay_work"] + "/system") + except RuntimeError: + cfg["waydroid"]["mount_overlays"] = "False" + tools.config.save(args, cfg) + logging.warning("Mounting overlays failed. The feature has been disabled.") + helpers.mount.mount(args, images_dir + "/vendor.img", tools.config.defaults["rootfs"] + "/vendor") + if cfg["waydroid"]["mount_overlays"] == "True": + helpers.mount.mount_overlay(args, [tools.config.defaults["overlay"] + "/vendor", + tools.config.defaults["rootfs"] + "/vendor"], + tools.config.defaults["rootfs"] + "/vendor", + upper_dir=tools.config.defaults["overlay_rw"] + "/vendor", + work_dir=tools.config.defaults["overlay_work"] + "/vendor") + for egl_path in ["/vendor/lib/egl", "/vendor/lib64/egl"]: if os.path.isdir(egl_path): helpers.mount.bind( @@ -102,6 +188,8 @@ def mount_rootfs(args, images_dir): if os.path.isdir("/vendor/odm"): helpers.mount.bind( args, "/vendor/odm", tools.config.defaults["rootfs"] + "/odm_extra") + + make_prop(args, session, args.work + "/waydroid.prop") helpers.mount.bind_file(args, args.work + "/waydroid.prop", tools.config.defaults["rootfs"] + "/vendor/waydroid.prop")