diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2f799d2b54..ed6641ad53 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -903,6 +903,7 @@ jobs:
uses: ./.github/workflows/scan.yml
with:
artifact: droiddeck-signed
+ variant: standard
secrets: inherit
packs:
diff --git a/.github/workflows/publish-packs.yml b/.github/workflows/publish-packs.yml
index ca61616d18..53e26f4ed8 100644
--- a/.github/workflows/publish-packs.yml
+++ b/.github/workflows/publish-packs.yml
@@ -55,7 +55,7 @@ jobs:
jq -r --arg n "$2" '.assets // [] | .[] | select(.name == $n) | .digest // empty'
}
commit=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$BUILD_RUN" --jq .head_sha 2>/dev/null || echo "$GITHUB_SHA")
- for name in proot directaudio tracking xbox comet butler powervr; do
+ for name in proot directaudio tracking xbox comet butler powervr ubisoft; do
file="packs/$name.tar.zst"
[ -f "$file" ] || { echo "::error::$name.tar.zst is missing from Build APK run $BUILD_RUN"; exit 1; }
sha=$(sha256sum "$file" | cut -d' ' -f1)
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
index 408983955b..9790f40c7b 100644
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -7,6 +7,10 @@ on:
description: Prefix of the signed artifacts to scan, as passed to sign.yml
type: string
required: true
+ variant:
+ description: Variant to scan, as listed in tools/release/variants.txt; every variant when omitted
+ type: string
+ default: '*'
fail_on_detection:
type: boolean
default: false
@@ -27,7 +31,7 @@ jobs:
- uses: actions/download-artifact@v4
with:
- pattern: ${{ inputs.artifact }}-*
+ pattern: ${{ inputs.artifact }}-${{ inputs.variant }}
merge-multiple: true
path: scan
diff --git a/app/build.gradle b/app/build.gradle
index c87e70938f..28bf184e32 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,7 +93,7 @@ def trackingPack = rootProject.file('tools/packs/tracking/release.env').readLine
def prootPackPin = rootProject.file('tools/packs/proot/release.env').readLines()
.findAll { it.contains('=') && !it.startsWith('#') }
.collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] }
-def addonPacks = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr'].collectEntries { name ->
+def addonPacks = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr', 'ubisoft'].collectEntries { name ->
def pack = file("build/packs/${name}.tar.zst")
if (!pack.isFile()) {
if (ciBuild) throw new GradleException("Add-on pack ${pack} is missing: run tools/packs/build.sh app/build/packs")
@@ -205,7 +205,7 @@ android {
}
androidResources {
- ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:
_*:!CVS:!thumbs.db:!picasa.ini:!*~:droiddeck-xbox:droiddeck-comet:directaudio:hybris'
+ ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:_*:!CVS:!thumbs.db:!picasa.ini:!*~:droiddeck-xbox:droiddeck-comet:droiddeck-ubisoft:directaudio:hybris'
}
packagingOptions {
diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt
index 2137828dd7..be81fc6960 100644
--- a/app/src/main/java/com/droiddeck/launcher/App.kt
+++ b/app/src/main/java/com/droiddeck/launcher/App.kt
@@ -77,6 +77,8 @@ class App : Application() {
if (com.droiddeck.launcher.stores.gog.GogComet.enabled(app)) com.droiddeck.launcher.core.AddonPack.COMET.ensure(app)
if (com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, com.droiddeck.launcher.stores.Store.XBOX) != null)
com.droiddeck.launcher.core.AddonPack.XBOX.ensure(app)
+ if (com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, com.droiddeck.launcher.stores.Store.UBISOFT) != null)
+ com.droiddeck.launcher.session.SessionFiles.ensureUbisoftService(app)
com.droiddeck.launcher.handtracking.HandTracking.load(app)
}.onFailure { android.util.Log.w("App", "add-on pack prefetch failed", it) }
}, "addon-packs").start()
diff --git a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt
index 4f88d90e34..d3d5cf2c74 100644
--- a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt
+++ b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt
@@ -152,5 +152,7 @@ internal class AddonPack(
@JvmField
val POWERVR = AddonPack("powervr", BuildConfig.PACK_POWERVR_SHA256, BuildConfig.PACK_POWERVR_SIZE,
listOf("runtime.tzst", "version.txt"))
+ val UBISOFT = AddonPack("ubisoft", BuildConfig.PACK_UBISOFT_SHA256, BuildConfig.PACK_UBISOFT_SIZE,
+ listOf("droiddeck-upc.exe"))
}
}
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt
index 82fea84f03..c8d1e4dd92 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt
@@ -38,6 +38,37 @@ object SessionFiles {
"etc/xdg/autostart/droiddeck-clipboard.desktop" to "etc/xdg/autostart/droiddeck-clipboard.desktop",
)
+ private const val UBISOFT_SERVICE = "usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe"
+
+ /** Fetches the Ubisoft pack and, once it lands, stages the service so a running session gets it without restarting. */
+ fun ensureUbisoftService(context: Context) {
+ AddonPack.UBISOFT.ensure(context) { app ->
+ com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app).takeIf { it.isDirectory }
+ ?.let { stageUbisoftService(app, it, null) }
+ }
+ }
+
+ @Synchronized
+ private fun stageUbisoftService(context: Context, root: File, ledger: StageLedger?) {
+ val pack = AddonPack.UBISOFT.takeIf { it.installed(context) }?.dir(context) ?: return
+ val target = File(root, UBISOFT_SERVICE)
+ if (ledger?.current(UBISOFT_SERVICE, target) == true) return
+ val staged = File(target.parentFile, target.name + ".staged")
+ var installed = false
+ try {
+ target.parentFile?.mkdirs()
+ File(pack, "droiddeck-upc.exe").inputStream().use { input ->
+ staged.outputStream().use { output -> FileUtils.copy(input, output) }
+ }
+ installed = staged.setExecutable(true, false) && staged.renameTo(target)
+ } catch (e: Exception) {
+ Log.w(TAG, "could not stage the Ubisoft launcher service", e)
+ } finally {
+ if (!installed) staged.delete()
+ }
+ if (installed) ledger?.staged(UBISOFT_SERVICE, target) else Log.e(TAG, "$UBISOFT_SERVICE NOT staged")
+ }
+
fun stage(context: Context, root: File, startsSession: Boolean = false) {
if (DesktopCatalog.desktopInstalled(root) && !DesktopCatalog.desktopFromPack(root)) try { DesktopCatalog.cleanLegacy(context) }
catch (e: Exception) { Log.w(TAG, "LXQt cleanup will retry next session", e) }
@@ -202,7 +233,6 @@ object SessionFiles {
"usr/local/share/licenses/uruntime/LICENSE" to "usr/local/share/licenses/uruntime/LICENSE",
"usr/local/lib/droiddeck-dirt/ws2_32.dll" to "usr/local/lib/droiddeck-dirt/ws2_32.dll",
LSE_EMU to LSE_EMU,
- "usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe" to "usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe",
) + mangoapp + xclipse.map { it to it } + maliCompat + msitools.map { it to it } + vr + gpuLoad + fexPreloads).filter { (asset, _) ->
val dir = asset.substringBeforeLast('/')
runCatching { context.assets.list("linuxfs/$dir")?.contains(asset.substringAfterLast('/')) == true }.getOrDefault(false)
@@ -258,6 +288,7 @@ object SessionFiles {
}
if (installed) ledger.staged(key, target) else Log.e(TAG, "DirectAudio $set/$relative NOT staged")
}
+ stageUbisoftService(context, root, ledger)
ledger.save()
for (old in arrayOf("aarch64-unix", "aarch64-windows", "i386-windows")) File(root, "$DIRECTAUDIO_DIR/lib/wine/$old").deleteRecursively()
val preload = StringBuilder(lsePreload(CpuFeatures.lacksAtomics, File(root, LSE_EMU).isFile))
diff --git a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt
index 5de002dade..f1cf2ea84d 100644
--- a/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt
+++ b/app/src/main/java/com/droiddeck/launcher/stores/ubisoft/UbisoftAuth.kt
@@ -132,6 +132,7 @@ object UbisoftAuth {
} ?: remember.takeIf { it.isNotEmpty() }?.let { rm -> parseSession(session("rm_v1 t=$rm").body, rm) }
?: return "no ticket"
save(context, fresh)
+ com.droiddeck.launcher.session.SessionFiles.ensureUbisoftService(context)
return null
}
diff --git a/tools/linuxfs/preload/binfmt.c b/tools/linuxfs/preload/binfmt.c
index eb912efe11..dbe2977265 100644
--- a/tools/linuxfs/preload/binfmt.c
+++ b/tools/linuxfs/preload/binfmt.c
@@ -18,6 +18,8 @@
typedef int (*spawn_fn)(pid_t *, const char *, const posix_spawn_file_actions_t *, const posix_spawnattr_t *,
char *const[], char *const[]);
+__attribute__((visibility("hidden")))
+char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]);
#if defined(__aarch64__) || defined(BINFMT_TEST)
@@ -141,21 +143,26 @@ __attribute__((visibility("hidden"))) int bl_binfmt_spawn(pid_t *pid, const char
}
int execvpe(const char *file, char *const argv[], char *const envp[]) {
+ char resolved[PATH_MAX];
+ const char *path = lookup(file, resolved, sizeof resolved) ? resolved : file;
+ char *const *adjusted = bl_webhelper_argv(path, argv, envp);
static int (*real)(const char *, char *const[], char *const[]);
if (!real) real = (int (*)(const char *, char *const[], char *const[]))dlsym(RTLD_NEXT, "execvpe");
- bl_binfmt_before_search(file, argv, envp);
- real(file, argv, envp);
- return bl_binfmt_after_search(file, argv, envp, errno);
+ bl_binfmt_before_search(file, (char *const *)adjusted, envp);
+ real(file, (char *const *)adjusted, envp);
+ return bl_binfmt_after_search(file, (char *const *)adjusted, envp, errno);
}
int posix_spawnp(pid_t *pid, const char *file, const posix_spawn_file_actions_t *fa, const posix_spawnattr_t *attr,
char *const argv[], char *const envp[]) {
+ char path[PATH_MAX];
+ int found = lookup(file, path, sizeof path);
+ char *const *adjusted = bl_webhelper_argv(found ? path : file, argv, envp);
static spawn_fn real, spawn;
if (!real) real = (spawn_fn)dlsym(RTLD_NEXT, "posix_spawnp");
if (!spawn) spawn = (spawn_fn)dlsym(RTLD_NEXT, "posix_spawn");
- char path[PATH_MAX];
- if (!handing_off() || !lookup(file, path, sizeof path)) return real(pid, file, fa, attr, argv, envp);
- return bl_binfmt_spawn(pid, path, fa, attr, argv, envp, spawn);
+ if (!handing_off() || !found) return real(pid, file, fa, attr, (char *const *)adjusted, envp);
+ return bl_binfmt_spawn(pid, path, fa, attr, (char *const *)adjusted, envp, spawn);
}
#else
diff --git a/tools/linuxfs/preload/net.c b/tools/linuxfs/preload/net.c
index 4946db7f9c..e45ed9c5c0 100644
--- a/tools/linuxfs/preload/net.c
+++ b/tools/linuxfs/preload/net.c
@@ -271,7 +271,8 @@ __attribute__((visibility("hidden"))) void bl_binfmt_before(const char *path, ch
__attribute__((visibility("hidden"))) int bl_binfmt_retry(const char *path, char *const argv[], char *const envp[], int error);
__attribute__((visibility("hidden"))) void bl_binfmt_before_search(const char *file, char *const argv[], char *const envp[]);
__attribute__((visibility("hidden"))) int bl_binfmt_after_search(const char *file, char *const argv[], char *const envp[], int error);
-__attribute__((visibility("hidden"))) char *const *bl_webhelper_argv(const char *path, char *const argv[]);
+__attribute__((visibility("hidden")))
+char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]);
__attribute__((visibility("hidden"))) int bl_binfmt_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *fa,
const posix_spawnattr_t *attr, char *const argv[], char *const envp[],
spawn_fn real);
@@ -341,7 +342,7 @@ static char **web_helper_redirect(const char *path, char *const argv[], const ch
}
int execve(const char *path, char *const argv_in[], char *const envp[]) {
- char *const *argv = bl_webhelper_argv(path, argv_in);
+ char *const *argv = bl_webhelper_argv(path, argv_in, envp);
static int (*real)(const char *, char *const[], char *const[]);
if (!real) real = (int (*)(const char *, char *const[], char *const[]))dlsym(RTLD_NEXT, "execve");
maybe_answer_lsof(path, argv);
@@ -372,7 +373,7 @@ static int answer_lsof_via_spawn(const char *path, char *const argv[], pid_t *pi
}
int execvp(const char *file, char *const argv_in[]) {
- char *const *argv = bl_webhelper_argv(file, argv_in);
+ char *const *argv = bl_webhelper_argv(file, argv_in, environ);
static int (*real)(const char *, char *const[]);
if (!real) real = (int (*)(const char *, char *const[]))dlsym(RTLD_NEXT, "execvp");
maybe_answer_lsof(file, argv);
@@ -382,7 +383,7 @@ int execvp(const char *file, char *const argv_in[]) {
}
int execv(const char *path, char *const argv_in[]) {
- char *const *argv = bl_webhelper_argv(path, argv_in);
+ char *const *argv = bl_webhelper_argv(path, argv_in, environ);
static int (*real)(const char *, char *const[]);
if (!real) real = (int (*)(const char *, char *const[]))dlsym(RTLD_NEXT, "execv");
maybe_answer_lsof(path, argv);
@@ -406,5 +407,6 @@ int posix_spawn(pid_t *pid, const char *path, const posix_spawn_file_actions_t *
}
static spawn_fn real;
if (!real) real = (spawn_fn)dlsym(RTLD_NEXT, "posix_spawn");
- return bl_binfmt_spawn(pid, path, fa, attr, argv, envp, real);
+ char *const *adjusted = bl_webhelper_argv(path, argv, envp);
+ return bl_binfmt_spawn(pid, path, fa, attr, (char *const *)adjusted, envp, real);
}
diff --git a/tools/linuxfs/preload/webhelper.c b/tools/linuxfs/preload/webhelper.c
index 9494872797..7642a34632 100644
--- a/tools/linuxfs/preload/webhelper.c
+++ b/tools/linuxfs/preload/webhelper.c
@@ -26,6 +26,14 @@ static char *join_features(const char *have, const char *add) {
return strcat(out, add);
}
+static int electron_node_mode(char *const envp[]) {
+ static const char variable[] = "ELECTRON_RUN_AS_NODE=";
+ for (int i = 0; envp && envp[i]; i++)
+ if (!strncmp(envp[i], variable, sizeof variable - 1))
+ return envp[i][sizeof variable - 1] != 0;
+ return 0;
+}
+
static char *const *chromium_argv(const char *path, char *const argv[]) {
const char *slash = path ? strrchr(path, '/') : NULL;
if (!slash || !argv || !argv[0]) return argv;
@@ -48,7 +56,9 @@ static char *const *chromium_argv(const char *path, char *const argv[]) {
return out;
}
-__attribute__((visibility("hidden"))) char *const *bl_webhelper_argv(const char *path, char *const argv[]) {
+__attribute__((visibility("hidden")))
+char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]) {
+ if (electron_node_mode(envp)) return argv;
if (!is_webhelper_browser(path, argv)) return chromium_argv(path, argv);
const char *spec = getenv("BL_WEBHELPER_ARGS");
if (!spec || !*spec) spec = WEBHELPER_DEFAULT;
diff --git a/tools/packs/build.sh b/tools/packs/build.sh
index 7b7e7e76fd..4ea6a41932 100755
--- a/tools/packs/build.sh
+++ b/tools/packs/build.sh
@@ -77,6 +77,7 @@ pack tracking "$work/tracking" hand_landmarker.task hand_landmarker_lite.task po
pack xbox "$linuxfs/droiddeck-xbox" version xodus-cli xodus-service
pack comet "$linuxfs/droiddeck-comet" version comet
pack powervr "$repo/app/src/main/assets/hybris" runtime.tzst version.txt
+[ ! -f "$linuxfs/droiddeck-ubisoft/droiddeck-upc.exe" ] || pack ubisoft "$linuxfs/droiddeck-ubisoft" droiddeck-upc.exe
mkdir "$work/butler"
fetch "https://broth.itch.zone/butler/linux-arm64/${BUTLER_VERSION}/archive/default" \
diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py
index e9d2bbda83..9c4173d7e1 100644
--- a/tools/release/runtime_inputs.py
+++ b/tools/release/runtime_inputs.py
@@ -14,15 +14,16 @@ ROOT = Path(__file__).resolve().parents[2]
MANIFEST = Path('app/build/runtime-inputs.json')
PACKS = Path('app/build/packs')
PACKED = {'assets/linuxfs/usr/local/lib/droiddeck-xbox/': 'xbox', 'assets/linuxfs/usr/local/lib/droiddeck-comet/': 'comet',
+ 'assets/linuxfs/usr/local/lib/droiddeck-ubisoft/': 'ubisoft',
'assets/directaudio/': 'directaudio', 'assets/hybris/': 'powervr'}
PACKED_FILES = {'lib/arm64-v8a/libproot.so': ('proot', 'libproot.so'),
'lib/arm64-v8a/libproot-loader.so': ('proot', 'libproot-loader.so')}
PACKED_LIBRARIES = ['lib/arm64-v8a/libopencv_java4.so', 'lib/arm64-v8a/libmediapipe_tasks_jni.so']
-PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr']
+PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler', 'powervr', 'ubisoft']
SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst',
'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/packs',
'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env',
- 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/components', 'tools/ci', 'tools/build_local.sh',
+ 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/ubisoft-launcher', 'tools/components', 'tools/ci', 'tools/build_local.sh',
'tools/powervr', 'tools/hybris', 'tools/dxvk', 'tools/vulkan-wsi',
'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal',
'tools/quest', 'tools/vr/src', 'tools/vr/driver_droiddeck', 'tools/vr/layer', 'tools/vr/build.sh',
@@ -212,7 +213,8 @@ def pack_digests(root, name):
def check_apk(apk, root=ROOT):
data = verify(root)
- packs = {name: pack_digests(root, name) for name in PACK_NAMES}
+ packs = {name: pack_digests(root, name) for name in PACK_NAMES
+ if name != 'ubisoft' or (root / PACKS / 'ubisoft.tar.zst').is_file()}
with ZipFile(apk) as package:
names = set(package.namelist())
for library in PACKED_LIBRARIES:
@@ -232,7 +234,7 @@ def check_apk(apk, root=ROOT):
if prefix:
if name in names:
raise ValueError('APK still carries ' + name + ', which the ' + PACKED[prefix] + ' pack provides')
- if packs[PACKED[prefix]].get(name[len(prefix):]) != output['sha256']:
+ if packs.get(PACKED[prefix], {}).get(name[len(prefix):]) != output['sha256']:
raise ValueError('Add-on pack ' + PACKED[prefix] + ' is missing or has a stale ' + name)
continue
try:
diff --git a/tools/tests/test_binfmt_preload.py b/tools/tests/test_binfmt_preload.py
index 8314d39e40..9966b28505 100644
--- a/tools/tests/test_binfmt_preload.py
+++ b/tools/tests/test_binfmt_preload.py
@@ -22,22 +22,29 @@ extern char **environ;
int main(int argc, char **argv) {
if (argc < 3) return 2;
const char *how = argv[1], *file = argv[2];
+ char *node_env[] = {"ELECTRON_RUN_AS_NODE=1", NULL};
+ char *const *child_env = !strcmp(how, "execve-node") || !strcmp(how, "execvpe-node") ||
+ !strcmp(how, "spawn-node") || !strcmp(how, "spawnp-node") ? node_env : environ;
char **args = argv + 2;
if (!strcmp(how, "access")) {
int result = access(file, X_OK);
printf("access %d %d\n", result, result ? errno : 0);
return 0;
}
- if (!strcmp(how, "spawn") || !strcmp(how, "spawnp")) {
+ if (!strcmp(how, "spawn") || !strcmp(how, "spawnp") || !strcmp(how, "spawn-node") ||
+ !strcmp(how, "spawnp-node")) {
pid_t pid;
- int error = how[5] ? posix_spawnp(&pid, file, NULL, NULL, args, environ) : posix_spawn(&pid, file, NULL, NULL, args, environ);
+ int spawnp = !strcmp(how, "spawnp") || !strcmp(how, "spawnp-node");
+ int error = spawnp ? posix_spawnp(&pid, file, NULL, NULL, args, child_env)
+ : posix_spawn(&pid, file, NULL, NULL, args, child_env);
if (error) { printf("errno %d\n", error); return 3; }
int status;
waitpid(pid, &status, 0);
printf("exit %d\n", WEXITSTATUS(status));
return 0;
}
- if (!strcmp(how, "execve")) execve(file, args, environ);
+ if (!strcmp(how, "execve") || !strcmp(how, "execve-node")) execve(file, args, (char *const *)child_env);
+ else if (!strcmp(how, "execvpe-node")) execvpe(file, args, (char *const *)child_env);
else if (!strcmp(how, "execv")) execv(file, args);
else if (!strcmp(how, "execvp")) execvp(file, args);
else if (!strcmp(how, "execvpe")) execvpe(file, args, environ);
@@ -88,6 +95,15 @@ class BinfmtPreloadTest(unittest.TestCase):
path.chmod(mode)
return path
+ def chromium_script(self):
+ folder = self.dir / "vscode"
+ folder.mkdir()
+ executable = folder / "code"
+ executable.write_text("#!/bin/sh\nprintf '%s\\n' \"$@\"\n")
+ executable.chmod(0o755)
+ (folder / "chrome-sandbox").touch()
+ return executable
+
def environment(self, desktop=True, **extra):
env = {"PATH": "%s:/usr/bin:/bin" % self.dir, "LD_PRELOAD": str(self.library), "HANDLER_LOG": str(self.log)}
if desktop:
@@ -161,6 +177,17 @@ class BinfmtPreloadTest(unittest.TestCase):
self.file("script.sh", b"#!/bin/sh\nexit 5\n")
self.assertEqual(self.run_program("spawnp", "script.sh"), (0, "exit 5", None))
+ def test_explicit_node_child_environment_skips_injection_for_execve_and_spawn(self):
+ code = self.chromium_script()
+ self.assertEqual(self.run_program("execve-node", code, "--version"), (0, "--version", None))
+ self.assertEqual(self.run_program("execvpe-node", code, "--version"), (0, "--version", None))
+ self.assertEqual(self.run_program("spawn-node", code, "--version"), (0, "--version\nexit 0", None))
+ self.assertEqual(self.run_program("spawnp-node", code, "--version"), (0, "--version\nexit 0", None))
+
+ def test_chromium_gui_launch_without_node_mode_still_receives_no_sandbox(self):
+ code = self.chromium_script()
+ self.assertEqual(self.run_program("execve", code, "--version"), (0, "--no-sandbox\n--version", None))
+
def test_the_hand_off_switch_works_without_the_desktop(self):
tool = self.x86()
for how in ("execve", "execvp"):
diff --git a/tools/tests/test_runtime_inputs.py b/tools/tests/test_runtime_inputs.py
index 60c0fc9920..906bef4c2f 100644
--- a/tools/tests/test_runtime_inputs.py
+++ b/tools/tests/test_runtime_inputs.py
@@ -33,6 +33,9 @@ class RuntimeInputsTest(unittest.TestCase):
self.source = self.root / 'tools/linuxfs/preload/test.c'
self.source.parent.mkdir(parents=True)
self.source.write_text('current source')
+ service = self.root / 'app/src/main/assets/linuxfs/usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe'
+ service.parent.mkdir(parents=True)
+ service.write_bytes(b'MZ service')
self.audio(['pactl', 'modules/arm64/module-aaudio-sink.so', 'modules/arm64/module-directaudio-native-sink.so'])
self.packs()
@@ -179,6 +182,13 @@ class RuntimeInputsTest(unittest.TestCase):
with self.assertRaisesRegex(ValueError, 'xbox pack provides'):
runtime.check_apk(apk, self.root)
+ def test_an_apk_still_carrying_the_ubisoft_service_is_rejected(self):
+ name = 'assets/linuxfs/usr/local/lib/droiddeck-ubisoft/droiddeck-upc.exe'
+ self.assertIn(name, runtime.outputs(self.root))
+ apk = self.current_apk(self.root / 'bundled.apk', {name: b'MZ service'})
+ with self.assertRaisesRegex(ValueError, 'ubisoft pack provides'):
+ runtime.check_apk(apk, self.root)
+
def test_an_apk_still_carrying_the_powervr_runtime_is_rejected(self):
apk = self.current_apk(self.root / 'bundled.apk', {'assets/hybris/runtime.tzst': b'runtime'})
with self.assertRaisesRegex(ValueError, 'powervr pack provides'):
diff --git a/tools/tests/test_webhelper_preload.py b/tools/tests/test_webhelper_preload.py
index 7c49e1d765..a7476945ce 100644
--- a/tools/tests/test_webhelper_preload.py
+++ b/tools/tests/test_webhelper_preload.py
@@ -9,9 +9,16 @@ PRELOAD = Path(__file__).resolve().parents[1] / "linuxfs/preload"
PROGRAM = r"""
#include
-char *const *bl_webhelper_argv(const char *path, char *const argv[]);
+#include
+char *const *bl_webhelper_argv(const char *path, char *const argv[], char *const envp[]);
int main(int argc, char **argv) {
- char *const *out = bl_webhelper_argv(argv[1], argv + 1);
+ const char *mode = getenv("TEST_NODE_MODE_CHILD");
+ static char node[64];
+ snprintf(node, sizeof node, "ELECTRON_RUN_AS_NODE=%s", mode ? mode : "");
+ char *node_env[] = {node, NULL};
+ char *plain_env[] = {"PATH=/usr/bin", NULL};
+ char *const *envp = mode ? node_env : plain_env;
+ char *const *out = bl_webhelper_argv(argv[1], argv + 1, (char *const *)envp);
for (int i = 0; out[i]; i++) printf("%s\n", out[i]);
return 0;
}
@@ -35,13 +42,28 @@ class WebhelperPreloadTest(unittest.TestCase):
def tearDownClass(cls):
shutil.rmtree(cls.tmp, ignore_errors=True)
- def argv(self, *args, spec=None):
+ def argv(self, *args, spec=None, node_child=False, parent_node=False):
env = {k: v for k, v in os.environ.items() if k != "BL_WEBHELPER_ARGS"}
+ env.pop("ELECTRON_RUN_AS_NODE", None)
if spec is not None:
env["BL_WEBHELPER_ARGS"] = spec
+ if node_child is not False:
+ env["TEST_NODE_MODE_CHILD"] = "1" if node_child is True else node_child
+ else:
+ env.pop("TEST_NODE_MODE_CHILD", None)
+ if parent_node:
+ env["ELECTRON_RUN_AS_NODE"] = "1"
result = subprocess.run([str(self.program), *args], env=env, capture_output=True, text=True, check=True)
return result.stdout.splitlines()
+ def chromium(self, directory, name):
+ root = self.tmp / directory
+ root.mkdir(exist_ok=True)
+ executable = root / name
+ executable.touch()
+ (root / "chrome-sandbox").touch()
+ return str(executable)
+
def test_the_browser_process_keeps_its_helpers_in_process(self):
out = self.argv(WEBHELPER, "-lang=en_US", "--enable-features=A", "--no-sandbox", "--disable-features=B,C")
self.assertEqual(out, [WEBHELPER, "-lang=en_US", "--no-sandbox", "--no-zygote", "--in-process-gpu",
@@ -57,6 +79,31 @@ class WebhelperPreloadTest(unittest.TestCase):
other = ["/usr/bin/steam", "--enable-features=A"]
self.assertEqual(self.argv(*other), other)
+ def test_node_mode_from_the_child_environment_skips_sandbox_injection(self):
+ code = self.chromium("vscode", "code")
+ self.assertEqual(self.argv(code, node_child=True), [code])
+
+ def test_any_nonempty_node_mode_value_skips_sandbox_injection(self):
+ code = self.chromium("vscode-true", "code")
+ for value in ("true", "0", "yes"):
+ self.assertEqual(self.argv(code, node_child=value), [code])
+
+ def test_empty_node_mode_value_still_gets_sandbox_flag(self):
+ chrome = self.chromium("chromium-empty-mode", "chrome")
+ self.assertEqual(self.argv(chrome, node_child=""), [chrome, "--no-sandbox"])
+
+ def test_non_browser_helper_beside_chrome_sandbox_skips_injection_in_node_mode(self):
+ helper = self.chromium("vscode-helper", "remote-cli")
+ self.assertEqual(self.argv(helper, node_child=True), [helper])
+
+ def test_chromium_gui_launch_still_gets_sandbox_flag_from_explicit_environment(self):
+ chrome = self.chromium("chromium", "chrome")
+ self.assertEqual(self.argv(chrome), [chrome, "--no-sandbox"])
+
+ def test_parent_node_mode_does_not_override_the_explicit_child_environment(self):
+ chrome = self.chromium("chromium-parent-mode", "chrome")
+ self.assertEqual(self.argv(chrome, parent_node=True), [chrome, "--no-sandbox"])
+
def test_stock_turns_it_off(self):
args = [WEBHELPER, "--enable-features=A"]
self.assertEqual(self.argv(*args, spec="stock"), args)