mirror of
https://github.com/flatpak/flatpak.git
synced 2026-03-27 19:33:06 -04:00
48caf88a63
As noticed on #5615, under normal circumstances, flatpak-run(1)
replaces itself with the bwrap process via execve(), and does not
close any fds that it might have inherited from its parent. This
allows for patterns like:
flatpak run com.example.App --in-fd=3 --out-fd=5 3<foo 5>bar
However, using execve() is annoying when trying to analyze code
coverage, because the coverage instrumentation does not get the
opportunity to write out its data during exit, so it is possible to
set FLATPAK_TEST_COVERAGE=1 to make flatpak run the app as a child
process and wait for it. This puts us on the code path normally used
for apps launched in the background by flatpak_installation_launch_full(),
which *don't* inherit arbitrary fds from their parent.
Detect this situation and use a different child setup function,
avoiding closing fds that we were meant to inherit.
Fixes: 88a928ea "run: Avoid execve() when measuring test coverage"
Signed-off-by: Simon McVittie <smcv@collabora.com>
103 lines
4.9 KiB
C
103 lines
4.9 KiB
C
/*
|
|
* Copyright © 2014-2018 Red Hat, Inc
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Authors:
|
|
* Alexander Larsson <alexl@redhat.com>
|
|
*/
|
|
|
|
#ifndef __FLATPAK_BWRAP_H__
|
|
#define __FLATPAK_BWRAP_H__
|
|
|
|
typedef struct
|
|
{
|
|
GPtrArray *argv;
|
|
GArray *noinherit_fds; /* Just keep these open while the bwrap lives */
|
|
GArray *fds;
|
|
GStrv envp;
|
|
GPtrArray *runtime_dir_members;
|
|
int sync_fds[2];
|
|
} FlatpakBwrap;
|
|
|
|
extern char *flatpak_bwrap_empty_env[1];
|
|
|
|
FlatpakBwrap *flatpak_bwrap_new (char **env);
|
|
void flatpak_bwrap_free (FlatpakBwrap *bwrap);
|
|
void flatpak_bwrap_set_env (FlatpakBwrap *bwrap,
|
|
const char *variable,
|
|
const char *value,
|
|
gboolean overwrite);
|
|
gboolean flatpak_bwrap_is_empty (FlatpakBwrap *bwrap);
|
|
void flatpak_bwrap_finish (FlatpakBwrap *bwrap);
|
|
void flatpak_bwrap_unset_env (FlatpakBwrap *bwrap,
|
|
const char *variable);
|
|
void flatpak_bwrap_add_arg (FlatpakBwrap *bwrap,
|
|
const char *arg);
|
|
void flatpak_bwrap_take_arg (FlatpakBwrap *bwrap,
|
|
char *arg);
|
|
void flatpak_bwrap_add_noinherit_fd (FlatpakBwrap *bwrap,
|
|
int fd);
|
|
void flatpak_bwrap_add_fd (FlatpakBwrap *bwrap,
|
|
int fd);
|
|
void flatpak_bwrap_add_args (FlatpakBwrap *bwrap,
|
|
...) G_GNUC_NULL_TERMINATED;
|
|
void flatpak_bwrap_add_arg_printf (FlatpakBwrap *bwrap,
|
|
const char *format,
|
|
...) G_GNUC_PRINTF (2, 3);
|
|
void flatpak_bwrap_append_argsv (FlatpakBwrap *bwrap,
|
|
char **args,
|
|
int len);
|
|
void flatpak_bwrap_append_bwrap (FlatpakBwrap *bwrap,
|
|
FlatpakBwrap *other); /* Steals the fds */
|
|
void flatpak_bwrap_append_args (FlatpakBwrap *bwrap,
|
|
GPtrArray *other_array);
|
|
void flatpak_bwrap_add_args_data_fd (FlatpakBwrap *bwrap,
|
|
const char *op,
|
|
int fd,
|
|
const char *path_optional);
|
|
gboolean flatpak_bwrap_add_args_data (FlatpakBwrap *bwrap,
|
|
const char *name,
|
|
const char *content,
|
|
gssize content_size,
|
|
const char *path,
|
|
GError **error);
|
|
void flatpak_bwrap_add_bind_arg (FlatpakBwrap *bwrap,
|
|
const char *type,
|
|
const char *src,
|
|
const char *dest);
|
|
void flatpak_bwrap_sort_envp (FlatpakBwrap *bwrap);
|
|
void flatpak_bwrap_envp_to_args (FlatpakBwrap *bwrap);
|
|
gboolean flatpak_bwrap_bundle_args (FlatpakBwrap *bwrap,
|
|
int start,
|
|
int end,
|
|
gboolean one_arg,
|
|
GError **error);
|
|
void flatpak_bwrap_add_runtime_dir_member (FlatpakBwrap *bwrap,
|
|
const char *name);
|
|
void flatpak_bwrap_populate_runtime_dir (FlatpakBwrap *bwrap,
|
|
const char *shared_xdg_runtime_dir);
|
|
|
|
void flatpak_bwrap_child_setup_cb (gpointer user_data);
|
|
void flatpak_bwrap_child_setup_inherit_fds_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)
|
|
|
|
|
|
#endif /* __FLATPAK_BWRAP_H__ */
|