marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

run: Allow --filesystem=xdg-*/subdir:ro 

We previously required the directory to be writable to expose
it in the app-specific directory. However, the file was already
made visible in the regular location, and it was explicitly requested
by the app, so not allowing it to be there read-only makes no sense.

In particular, this allows KDE apps to use
--filesystem=xdg-config/kdeglobals:ro to allow apps to pick up global
configurations such as theme, etc, in a safe way.
tingping/wmclass
Alexander Larsson 2017-06-01 11:03:20 +02:00
parent 75d884046d
commit 1d9fe6fbf3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/flatpak-run.c
View File

@ -2948,11 +2948,11 @@ flatpak_run_add_environment_args (GPtrArray *argv_array,
"--dir", g_get_home_dir (),
NULL);
/* Special case subdirectories of the cache, config and data xdg dirs.
* If these are accessible explicilty, in a read-write fashion, then
* we bind-mount these in the app-id dir. This allows applications to
* explicitly opt out of keeping some config/cache/data in the
* app-specific directory.
/* Special case subdirectories of the cache, config and data xdg
* dirs. If these are accessible explicilty, then we bind-mount
* these in the app-id dir. This allows applications to explicitly
* opt out of keeping some config/cache/data in the app-specific
* directory.
*/
if (app_id_dir)
{
@ -2967,7 +2967,7 @@ flatpak_run_add_environment_args (GPtrArray *argv_array,
xdg_path = get_xdg_dir_from_string (filesystem, &rest, &where);
if (xdg_path != NULL && *rest != 0 &&
mode >= FLATPAK_FILESYSTEM_MODE_READ_WRITE)
mode >= FLATPAK_FILESYSTEM_MODE_READ_ONLY)
{
g_autoptr(GFile) app_version = g_file_get_child (app_id_dir, where);
g_autoptr(GFile) app_version_subdir = g_file_resolve_relative_path (app_version, rest);
@ -2977,7 +2977,8 @@ flatpak_run_add_environment_args (GPtrArray *argv_array,
{
g_autofree char *xdg_path_in_app = g_file_get_path (app_version_subdir);
add_args (argv_array,
"--bind", xdg_path, xdg_path_in_app,
mode == FLATPAK_FILESYSTEM_MODE_READ_ONLY ? "--ro-bind" : "--bind",
xdg_path, xdg_path_in_app,
NULL);
}
}