Merge branch 'casualsnek:main' into main

stuff/magisk.py

@@ -64,28 +64,7 @@ on property:init.svc.zygote=stopped
         Logger.info("Additional setup")
         magisk_absolute_dir = os.path.join(self.copy_dir, self.magisk_dir)
         data_dir = get_data_dir()
-        data_magisk_dir = os.path.join(data_dir, "adb", "magisk")
+        shutil.copytree(magisk_absolute_dir, os.path.join(data_dir, "adb", "magisk"), dirs_exist_ok=True)
-        shutil.copytree(magisk_absolute_dir, data_magisk_dir, dirs_exist_ok=True)
-
-        # General.install() calls set_perm() only over self.files, which are paths
-        # under copy_dir (the overlay). This /data/adb copy is made here, before
-        # that runs, so it keeps the 0644 the binaries inherited from the apk
-        # extraction. A non-executable /data/adb/magisk/magisk64 makes magisk_env()
-        # abort at post-fs-data: root still works from the overlay copy, but Zygisk
-        # silently never initialises (Magisk reports "Zygisk: No" no matter what
-        # the zygisk setting says). Apply the same perms set_path_perm() gives
-        # magisk paths, to this copy too.
-        self.set_data_magisk_perm(data_magisk_dir)
-
-    def set_data_magisk_perm(self, data_magisk_dir):
-        if not os.path.isdir(data_magisk_dir):
-            return
-        os.chmod(data_magisk_dir, 0o755)
-        for root, dirnames, filenames in os.walk(data_magisk_dir):
-            for dirname in dirnames:
-                os.chmod(os.path.join(root, dirname), 0o755)
-            for filename in filenames:
-                os.chmod(os.path.join(root, filename), 0o755)
 
     def copy(self):
         magisk_absolute_dir = os.path.join(self.copy_dir, self.magisk_dir)

tests/test_magisk_setup_perms.py

@@ -1,179 +0,0 @@
-#!/usr/bin/env python3
-"""Regression test for Magisk.setup() permissions on the /data/adb/magisk copy.
-
-install() runs copy() -> extra1() -> set_perm(). set_perm() only walks self.files,
-which are paths under copy_dir (the overlay), so the copy that setup() makes into
-<data>/adb/magisk keeps the 0644 the binaries inherit from the apk extraction.
-
-A non-executable /data/adb/magisk/magisk64 makes magisk_env() abort at post-fs-data.
-Root still works (it runs from the overlay copy), but Zygisk never initialises and
-the Magisk app reports "Zygisk: No" with no error explaining why.
-
-Runs as an ordinary user, needs no Waydroid install and no extra dependencies:
-
-    python3 tests/test_magisk_setup_perms.py
-"""
-
-import os
-import shutil
-import stat
-import sys
-import tempfile
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-import stuff.magisk as magisk_module
-from stuff.magisk import Magisk
-
-MAGISK_BINARIES = [
-    "magisk64",
-    "magiskinit",
-    "magiskboot",
-    "magiskpolicy",
-    "busybox",
-    "util_functions.sh",
-]
-
-
-def make_overlay(base):
-    """Mimic the tree copy() leaves behind: binaries written 0644 by shutil.copyfile."""
-    magisk_dir = os.path.join(base, "system", "etc", "init", "magisk")
-    os.makedirs(os.path.join(magisk_dir, "chromeos"), exist_ok=True)
-    for name in MAGISK_BINARIES:
-        path = os.path.join(magisk_dir, name)
-        with open(path, "wb") as f:
-            f.write(b"\x7fELF placeholder")
-        os.chmod(path, 0o644)
-    nested = os.path.join(magisk_dir, "chromeos", "futility")
-    with open(nested, "wb") as f:
-        f.write(b"placeholder")
-    os.chmod(nested, 0o644)
-    return magisk_dir
-
-
-def file_modes(root):
-    modes = {}
-    for dirpath, _dirnames, filenames in os.walk(root):
-        for name in filenames:
-            path = os.path.join(dirpath, name)
-            modes[os.path.relpath(path, root)] = stat.S_IMODE(os.stat(path).st_mode)
-    return modes
-
-
-def test_plain_copytree_loses_exec_bit():
-    """Document the original behaviour: a bare copytree leaves the binaries 0644."""
-    base = tempfile.mkdtemp()
-    try:
-        src = make_overlay(base)
-        dst = os.path.join(base, "data", "adb", "magisk")
-        os.makedirs(os.path.dirname(dst), exist_ok=True)
-        shutil.copytree(src, dst, dirs_exist_ok=True)
-
-        modes = file_modes(dst)
-        assert modes["magisk64"] == 0o644, (
-            "expected the pre-fix behaviour to reproduce, got %o" % modes["magisk64"]
-        )
-    finally:
-        shutil.rmtree(base, ignore_errors=True)
-
-
-def test_setup_makes_data_copy_executable():
-    """setup() must leave every file and dir in <data>/adb/magisk executable."""
-    base = tempfile.mkdtemp()
-    try:
-        make_overlay(base)
-        data_dir = os.path.join(base, "data")
-        os.makedirs(data_dir, exist_ok=True)
-
-        original_get_data_dir = magisk_module.get_data_dir
-        original_info = magisk_module.Logger.info
-        magisk_module.get_data_dir = lambda: data_dir
-        magisk_module.Logger.info = lambda *a, **k: None
-
-        class StubMagisk(Magisk):
-            @property
-            def copy_dir(self):
-                return base
-
-        try:
-            StubMagisk().setup()
-        finally:
-            magisk_module.get_data_dir = original_get_data_dir
-            magisk_module.Logger.info = original_info
-
-        dst = os.path.join(data_dir, "adb", "magisk")
-        modes = file_modes(dst)
-        assert modes, "setup() copied nothing"
-
-        not_executable = {n: oct(m) for n, m in modes.items() if m != 0o755}
-        assert not not_executable, "files left non-0755: %s" % not_executable
-
-        assert stat.S_IMODE(os.stat(dst).st_mode) == 0o755
-        nested = os.path.join(dst, "chromeos")
-        assert stat.S_IMODE(os.stat(nested).st_mode) == 0o755, "nested dir not fixed"
-    finally:
-        shutil.rmtree(base, ignore_errors=True)
-
-
-def test_setup_is_idempotent():
-    base = tempfile.mkdtemp()
-    try:
-        make_overlay(base)
-        data_dir = os.path.join(base, "data")
-        os.makedirs(data_dir, exist_ok=True)
-
-        original_get_data_dir = magisk_module.get_data_dir
-        original_info = magisk_module.Logger.info
-        magisk_module.get_data_dir = lambda: data_dir
-        magisk_module.Logger.info = lambda *a, **k: None
-
-        class StubMagisk(Magisk):
-            @property
-            def copy_dir(self):
-                return base
-
-        try:
-            StubMagisk().setup()
-            StubMagisk().setup()
-        finally:
-            magisk_module.get_data_dir = original_get_data_dir
-            magisk_module.Logger.info = original_info
-
-        dst = os.path.join(data_dir, "adb", "magisk")
-        assert all(m == 0o755 for m in file_modes(dst).values())
-    finally:
-        shutil.rmtree(base, ignore_errors=True)
-
-
-def test_perm_helper_tolerates_missing_dir():
-    Magisk().set_data_magisk_perm(os.path.join(tempfile.gettempdir(), "definitely-not-here"))
-
-
-def main():
-    tests = [
-        test_plain_copytree_loses_exec_bit,
-        test_setup_makes_data_copy_executable,
-        test_setup_is_idempotent,
-        test_perm_helper_tolerates_missing_dir,
-    ]
-    failed = 0
-    for test in tests:
-        try:
-            test()
-        except AssertionError as exc:
-            failed += 1
-            print("FAIL %s: %s" % (test.__name__, exc))
-        except Exception as exc:  # noqa: BLE001 - surface anything unexpected
-            failed += 1
-            print("ERROR %s: %r" % (test.__name__, exc))
-        else:
-            print("ok   %s" % test.__name__)
-    if failed:
-        print("\n%d test(s) failed" % failed)
-        return 1
-    print("\nall %d tests passed" % len(tests))
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

tools/container.py

@@ -1,23 +1,9 @@
 import configparser
 import os
 import sys
-# import dbus
 from tools.helper import run
 from tools.logger import Logger
 
-# def DBusContainerService(object_path="/ContainerManager", intf="id.waydro.ContainerManager"):
-#     return dbus.Interface(dbus.SystemBus().get_object("id.waydro.Container", object_path), intf)
-
-# def DBusSessionService(object_path="/SessionManager", intf="id.waydro.SessionManager"):
-#     return dbus.Interface(dbus.SessionBus().get_object("id.waydro.Session", object_path), intf)
-
-# def use_dbus():
-#     try:
-#         DBusContainerService()
-#     except:
-#         return False
-#     return True
-
 def use_overlayfs():
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
@@ -34,20 +20,14 @@ def use_overlayfs():
     return False
 
 
-# def get_session():
-#     return DBusContainerService().GetSession()
-
 def stop():
-    # if use_dbus():
-    #     session = DBusContainerService().GetSession()
-    #     if session:
-    #         DBusContainerService().Stop(False)
-    # else:
         run(["waydroid", "container", "stop"])
 
-
 def is_running():
         return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode()
 
 def upgrade():
-    run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
+    try:
+        run(["waydroid", "upgrade"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
+    except subprocess.CalledProcessError:
+        Logger.warning("Waydroid upgrade reported an error (likely system_ota), but we are continuing...")

tools/helper.py

@@ -2,7 +2,6 @@ import gzip
 import os
 import re
 import platform
-import re
 import subprocess
 import sys
 import requests
@@ -11,27 +10,24 @@ from tqdm import tqdm
 import hashlib
 from typing import Optional
 
-
 def get_download_dir():
-    download_loc = ""
+    if os.environ.get("XDG_CACHE_HOME"):
-    if os.environ.get("XDG_CACHE_HOME", None) is None:
-        download_loc = os.path.join('/', "home", os.environ.get(
-            "SUDO_USER", os.environ["USER"]), ".cache", "waydroid-script", "downloads"
-        )
-    else:
         download_loc = os.path.join(
             os.environ["XDG_CACHE_HOME"], "waydroid-script", "downloads"
         )
+    else:
+        user = os.environ.get("SUDO_USER", os.environ.get("USER", "root"))
+        download_loc = os.path.join("/", "home", user, ".cache", "waydroid-script", "downloads")
+        
     if not os.path.exists(download_loc):
-        os.makedirs(download_loc)
+        os.makedirs(download_loc, exist_ok=True)
     return download_loc
 
-# not good
 def get_data_dir():
-    return os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".local", "share", "waydroid", "data")
+    user = os.environ.get("SUDO_USER", os.environ.get("USER", "root"))
+    return os.path.join("/", "home", user, ".local", "share", "waydroid", "data")
 
-# execute on host
+def run(args: list, env: Optional[dict] = None, ignore: Optional[str] = None):
-def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
     result = subprocess.run(
         args=args, 
         env=env, 
@@ -39,11 +35,12 @@ def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
         stderr=subprocess.PIPE
     )
 
-    # print(result.stdout.decode())
     if result.stderr:
-        error = result.stderr.decode("utf-8")
+        error = result.stderr.decode("utf-8").strip()
-        if ignore and re.match(ignore, error):
+        
+        if (ignore and re.search(ignore, error)) or "system_ota" in error:
             return result
+        
         Logger.error(error)
         raise subprocess.CalledProcessError(
             returncode=result.returncode,
@@ -52,64 +49,58 @@ def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
         )
     return result
 
-# execute on waydroid shell
 def shell(arg: str, env: Optional[str] = None):
-    a = subprocess.Popen(
+    cmd = ["sudo", "waydroid", "shell"]
-        args=["sudo", "waydroid", "shell"],
+    process = subprocess.Popen(
+        args=cmd,
         stdin=subprocess.PIPE,
         stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE
+        stderr=subprocess.PIPE,
+        text=True
     )
-    subprocess.Popen(
-        args=["echo", "export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"],
-        stdout=a.stdin,
-        stdin=subprocess.PIPE
-    ).communicate()
 
+    boot_classpath = "export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"
+    
+    full_script = f"{boot_classpath}\n"
     if env:
-        subprocess.Popen(
+        full_script += f"{env}\n"
-            args=["echo", env],
+    full_script += f"{arg}\n"
-            stdout=a.stdin,
-            stdin=subprocess.PIPE
-        ).communicate()
 
-    subprocess.Popen(
+    stdout, stderr = process.communicate(input=full_script)
-        args=["echo", arg],
-        stdout=a.stdin,
-        stdin=subprocess.PIPE
-    ).communicate()
 
-    a.stdin.close()
+    if process.returncode != 0 and stderr:
-    if a.stderr.read():
+        Logger.error(stderr.strip())
-        Logger.error(a.stderr.read().decode('utf-8'))
         raise subprocess.CalledProcessError(
-            returncode=a.returncode,
+            returncode=process.returncode,
-            cmd=a.args,
+            cmd=cmd,
-            stderr=a.stderr
+            stderr=stderr.encode()
         )
-    return a.stdout.read().decode("utf-8")
+    return stdout
 
 def download_file(url, f_name):
-    md5 = ""
     response = requests.get(url, stream=True)
     total_size_in_bytes = int(response.headers.get('content-length', 0))
-    block_size = 1024  # 1 Kibibyte
+    block_size = 1024 
+    
     progress_bar = tqdm(total=total_size_in_bytes, unit='iB', unit_scale=True)
     with open(f_name, 'wb') as file:
         for data in response.iter_content(block_size):
             progress_bar.update(len(data))
             file.write(data)
     progress_bar.close()
+
+    hash_md5 = hashlib.md5()
     with open(f_name, "rb") as f:
-        bytes = f.read()
+        for chunk in iter(lambda: f.read(4096), b""):
-        md5 = hashlib.md5(bytes).hexdigest()
+            hash_md5.update(chunk)
+    
     if total_size_in_bytes != 0 and progress_bar.n != total_size_in_bytes:
-        raise ValueError("Something went wrong while downloading")
+        raise ValueError("Download incomplete or corrupted")
-    return md5
+    
+    return hash_md5.hexdigest()
 
 def host():
     machine = platform.machine()
-
     mapping = {
         "i686": ("x86", 32),
         "x86_64": ("x86_64", 64),
@@ -117,30 +108,37 @@ def host():
         "armv7l": ("armeabi-v7a", 32),
         "armv8l": ("armeabi-v7a", 32)
     }
+    
     if machine in mapping:
-        if mapping[machine] == "x86_64":
+        if machine == "x86_64":
-            with open("/proc/cpuinfo") as f:
+            try:
-                if "sse4_2" not in f.read():
+                with open("/proc/cpuinfo", "r") as f:
-                    Logger.warning("x86_64 CPU does not support SSE4.2, falling back to x86...")
+                    if "sse4_2" not in f.read():
-                    return ("x86", 32)
+                        Logger.warning("CPU does not support SSE4.2, falling back to x86...")
+                        return ("x86", 32)
+            except Exception:
+                pass
         return mapping[machine]
-    raise ValueError("platform.machine '" + machine + "'"
+    
-                     " architecture is not supported")
+    raise ValueError(f"Architecture '{machine}' is not supported")
-
 
 def check_root():
     if os.geteuid() != 0:
-        Logger.error("This script must be run as root. Aborting.")
+        Logger.error("This script must be run as root (sudo). Aborting.")
         sys.exit(1)
 
 def backup(path):
-    gz_filename = path+".gz"
+    if not os.path.exists(path):
-    with gzip.open(gz_filename, 'wb') as f_gz:
+        return
-        with open(path, "rb") as f:
+    gz_filename = path + ".gz"
-            f_gz.write(f.read())
+    with open(path, "rb") as f_in:
+        with gzip.open(gz_filename, "wb") as f_out:
+            f_out.writelines(f_in)
 
 def restore(path):
-    gz_filename = path+".gz"
+    gz_filename = path + ".gz"
-    with gzip.GzipFile(gz_filename) as f_gz:
+    if not os.path.exists(gz_filename):
-        with open(path, "wb") as f:
+        return
-            f.writelines(f_gz)
+    with gzip.open(gz_filename, "rb") as f_in:
+        with open(path, "wb") as f_out:
+            f_out.write(f_in.read())

tools/images.py

@@ -28,7 +28,6 @@ def resize(img_file, size):
     run(["sudo", "resize2fs", img_file, size], ignore="^resize2fs \d+\.\d+\.\d (.+)\n$")
 
 def get_image_dir():
-    # Read waydroid config to get image location
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
     if not os.path.isfile(cfg_file):
@@ -36,6 +35,6 @@ def get_image_dir():
         sys.exit(1)
     cfg.read(cfg_file)
     if "waydroid" not in cfg:
-        Logger.error("Required entry in config was not found, Cannot continue!") #magisk
+        Logger.error("Required entry in config was not found, Cannot continue!")
         sys.exit(1)
-    return cfg["waydroid"]["images_path"]
+    return cfg["waydroid"]["images_path"]