Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Wayland security context #4920

Merged
merged 3 commits into from
Aug 24, 2023
Merged

Add support for Wayland security context #4920

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7db6276
common: introduce flatpak_bwrap_add_sync_fd
emersion Jun 3, 2022
ec77874
common: split Wayland socket setup to separate file
emersion Jun 15, 2023
6d3188f
common: add support for Wayland security context
emersion Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Next Next commit
common: introduce flatpak_bwrap_add_sync_fd 
The same logic will be used for Wayland security context.
  • Loading branch information
@emersion
emersion committed Aug 24, 2023
commit 7db62760deca0ac1030b573f1e5d26b117acc439
3 changes: 3 additions & 0 deletions common/flatpak-bwrap-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ typedef struct
GArray *fds;
GStrv envp;
GPtrArray *runtime_dir_members;
int sync_fds[2];
} FlatpakBwrap;

extern char *flatpak_bwrap_empty_env[1];
Expand Down Expand Up @@ -92,6 +93,8 @@ void flatpak_bwrap_child_setup_cb (gpointer user_data);
void flatpak_bwrap_child_setup (GArray *fd_array,
gboolean close_fd_workaround);

int flatpak_bwrap_add_sync_fd (FlatpakBwrap *bwrap);

G_DEFINE_AUTOPTR_CLEANUP_FUNC (FlatpakBwrap, flatpak_bwrap_free)


Expand Down
19 changes: 19 additions & 0 deletions common/flatpak-bwrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ flatpak_bwrap_new (char **env)
else
bwrap->envp = g_get_environ ();

bwrap->sync_fds[0] = -1;
bwrap->sync_fds[1] = -1;

return bwrap;
}

Expand Down Expand Up @@ -526,3 +529,19 @@ flatpak_bwrap_child_setup_cb (gpointer user_data)

flatpak_bwrap_child_setup (fd_array, TRUE);
}

/* Add a --sync-fd argument for bwrap(1). Returns the write end of the pipe on
* success, or -1 on error. */
int
flatpak_bwrap_add_sync_fd (FlatpakBwrap *bwrap)
{
/* --sync-fd is only allowed once */
if (bwrap->sync_fds[1] >= 0)
return bwrap->sync_fds[1];

if (pipe2 (bwrap->sync_fds, O_CLOEXEC) < 0)
return -1;

flatpak_bwrap_add_args_data_fd (bwrap, "--sync-fd", bwrap->sync_fds[0], NULL);
return bwrap->sync_fds[1];
}
15 changes: 6 additions & 9 deletions common/flatpak-run-dbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ flatpak_run_maybe_start_dbus_proxy (FlatpakBwrap *app_bwrap,
const char *proxy;
g_autofree char *commandline = NULL;
g_autoptr(FlatpakBwrap) proxy_bwrap = NULL;
int sync_fds[2] = {-1, -1};
int proxy_start_index;
int sync_fd;

if (flatpak_bwrap_is_empty (proxy_arg_bwrap))
{
Expand All @@ -139,19 +139,16 @@ flatpak_run_maybe_start_dbus_proxy (FlatpakBwrap *app_bwrap,

proxy_start_index = proxy_bwrap->argv->len;

if (pipe2 (sync_fds, O_CLOEXEC) < 0)
sync_fd = flatpak_bwrap_add_sync_fd (app_bwrap);
if (sync_fd < 0)
{
g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errno),
_("Unable to create sync pipe"));
return FALSE;
}

/* read end goes to app */
flatpak_bwrap_add_args_data_fd (app_bwrap, "--sync-fd", sync_fds[0], NULL);

/* write end goes to proxy */
flatpak_bwrap_add_fd (proxy_bwrap, sync_fds[1]);
flatpak_bwrap_add_arg_printf (proxy_bwrap, "--fd=%d", sync_fds[1]);
flatpak_bwrap_add_fd (proxy_bwrap, sync_fd);
flatpak_bwrap_add_arg_printf (proxy_bwrap, "--fd=%d", sync_fd);

/* Note: This steals the fds from proxy_arg_bwrap */
flatpak_bwrap_append_bwrap (proxy_bwrap, proxy_arg_bwrap);
Expand All @@ -178,7 +175,7 @@ flatpak_run_maybe_start_dbus_proxy (FlatpakBwrap *app_bwrap,
g_clear_pointer (&proxy_bwrap, flatpak_bwrap_free);

/* Sync with proxy, i.e. wait until its listening on the sockets */
if (read (sync_fds[0], &x, 1) != 1)
if (read (app_bwrap->sync_fds[0], &x, 1) != 1)
{
g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errno),
_("Failed to sync with dbus proxy"));
Expand Down