mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-02-20 15:48:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

run: Fix some symlink handling issues

Browse Source 
If the target of a direct bind, such as $home/.var/app/$appid/ is
a symlink, and the symlink contains absolute pathnames, then they
will not resolve correctly in the bwrap setup code due to the
fact that the final root is on /newroot, not /, so we resolve
the target paths before we call bwrap.
This commit is contained in:
Alexander Larsson
2017-09-25 14:08:19 +02:00
parent 5ca82643d2
commit f1df5cb1d9
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/flatpak-run.c
View File

@@ -2880,6 +2880,21 @@ flatpak_exports_from_context (FlatpakContext *context,
return g_steal_pointer (&exports); return g_steal_pointer (&exports);
} }
/* This resolves the target here rather than the destination, because
it may not resolve in bwrap setup due to absolute relative links
conflicting with /newroot root. */
static void
add_bind_arg (GPtrArray *argv_array,
const char *type,
const char *src,
const char *dest)
{
g_autofree char *dest_real = realpath (dest, NULL);
if (dest_real)
add_args (argv_array, type, src, dest_real, NULL);
}
gboolean gboolean
flatpak_run_add_environment_args (GPtrArray *argv_array, flatpak_run_add_environment_args (GPtrArray *argv_array,
GArray *fd_array, GArray *fd_array,
@@ -2982,9 +2997,7 @@ flatpak_run_add_environment_args (GPtrArray *argv_array,
g_mkdir_with_parents (src, 0755); g_mkdir_with_parents (src, 0755);
add_args (argv_array, add_bind_arg (argv_array, "--bind", src, dest);
"--bind", src, dest,
NULL);
} }
} }
@@ -3042,10 +3055,9 @@ flatpak_run_add_environment_args (GPtrArray *argv_array,
g_file_test (xdg_path, G_FILE_TEST_IS_REGULAR)) g_file_test (xdg_path, G_FILE_TEST_IS_REGULAR))
{ {
g_autofree char *xdg_path_in_app = g_file_get_path (app_version_subdir); g_autofree char *xdg_path_in_app = g_file_get_path (app_version_subdir);
add_args (argv_array, add_bind_arg (argv_array,
mode == FLATPAK_FILESYSTEM_MODE_READ_ONLY ? "--ro-bind" : "--bind", mode == FLATPAK_FILESYSTEM_MODE_READ_ONLY ? "--ro-bind" : "--bind",
xdg_path, xdg_path_in_app, xdg_path, xdg_path_in_app);
NULL);
} }
} }
} }
@@ -3059,9 +3071,7 @@ flatpak_run_add_environment_args (GPtrArray *argv_array,
g_autofree char *path = g_build_filename (flatpak_file_get_path_cached (app_id_dir), g_autofree char *path = g_build_filename (flatpak_file_get_path_cached (app_id_dir),
"config/user-dirs.dirs", NULL); "config/user-dirs.dirs", NULL);
if (g_file_test (src_path, G_FILE_TEST_EXISTS)) if (g_file_test (src_path, G_FILE_TEST_EXISTS))
add_args (argv_array, add_bind_arg (argv_array, "--ro-bind", src_path, path);
"--ro-bind", src_path, path,
NULL);
} }
else if (xdg_dirs_conf->len > 0 && app_id_dir != NULL) else if (xdg_dirs_conf->len > 0 && app_id_dir != NULL)
{ {