mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-07 08:34:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

exports: Add assertions to distinguish between mode representations

Browse Source 
When we're talking about a "mode", sometimes we mean a
FlatpakFilesystemMode, sometimes we mean a FlatpakFilesystemMode that
must be strictly greater than NONE, and sometimes we're willing to
accept the FAKE_MODE constants too.

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 115d82e6ff)
This commit is contained in:
Simon McVittie
2020-08-26 16:53:25 +01:00
committed by Alexander Larsson
parent 50056d48bf
commit 0964eb59fc
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/flatpak-exports-private.h
View File

@@ -30,6 +30,7 @@ typedef enum {
FLATPAK_FILESYSTEM_MODE_READ_ONLY = 1,
FLATPAK_FILESYSTEM_MODE_READ_WRITE = 2,
FLATPAK_FILESYSTEM_MODE_CREATE = 3,
FLATPAK_FILESYSTEM_MODE_LAST = FLATPAK_FILESYSTEM_MODE_CREATE
} FlatpakFilesystemMode;
typedef struct _FlatpakExports FlatpakExports;

36
common/flatpak-exports.c
View File

@@ -85,6 +85,15 @@ make_relative (const char *base, const char *path)
#define FAKE_MODE_TMPFS FLATPAK_FILESYSTEM_MODE_NONE
#define FAKE_MODE_SYMLINK G_MAXINT
static inline gboolean
is_export_mode (int mode)
{
return ((mode >= FLATPAK_FILESYSTEM_MODE_NONE
&& mode <= FLATPAK_FILESYSTEM_MODE_LAST)
|| mode == FAKE_MODE_DIR
|| mode == FAKE_MODE_SYMLINK);
}
typedef struct
{
char *path;
@@ -138,6 +147,8 @@ path_parent_is_mapped (const char **keys,
const char *mounted_path = keys[i];
ExportedPath *ep = g_hash_table_lookup (hash_table, mounted_path);
g_assert (is_export_mode (ep->mode));
if (flatpak_has_path_prefix (path, mounted_path) &&
(strcmp (path, mounted_path) != 0))
{
@@ -169,6 +180,8 @@ path_is_mapped (const char **keys,
const char *mounted_path = keys[i];
ExportedPath *ep = g_hash_table_lookup (hash_table, mounted_path);
g_assert (is_export_mode (ep->mode));
if (flatpak_has_path_prefix (path, mounted_path))
{
/* FAKE_MODE_DIR has same mapped value as parent */
@@ -262,6 +275,8 @@ flatpak_exports_append_bwrap_args (FlatpakExports *exports,
ExportedPath *ep = l->data;
const char *path = ep->path;
g_assert (is_export_mode (ep->mode));
if (ep->mode == FAKE_MODE_SYMLINK)
{
if (!path_parent_is_mapped (keys, n_keys, exports->hash, path))
@@ -301,6 +316,9 @@ flatpak_exports_append_bwrap_args (FlatpakExports *exports,
}
}
g_assert (exports->host_os >= FLATPAK_FILESYSTEM_MODE_NONE);
g_assert (exports->host_os <= FLATPAK_FILESYSTEM_MODE_LAST);
if (exports->host_os != FLATPAK_FILESYSTEM_MODE_NONE)
{
const char *os_bind_mode = "--bind";
@@ -383,6 +401,9 @@ flatpak_exports_append_bwrap_args (FlatpakExports *exports,
}
}
g_assert (exports->host_etc >= FLATPAK_FILESYSTEM_MODE_NONE);
g_assert (exports->host_etc <= FLATPAK_FILESYSTEM_MODE_LAST);
if (exports->host_etc != FLATPAK_FILESYSTEM_MODE_NONE)
{
const char *etc_bind_mode = "--bind";
@@ -501,6 +522,8 @@ do_export_path (FlatpakExports *exports,
ExportedPath *old_ep = g_hash_table_lookup (exports->hash, path);
ExportedPath *ep;
g_return_if_fail (is_export_mode (mode));
ep = g_new0 (ExportedPath, 1);
ep->path = g_strdup (path);
@@ -596,6 +619,8 @@ _exports_path_expose (FlatpakExports *exports,
int i;
glnx_autofd int o_path_fd = -1;
g_return_val_if_fail (is_export_mode (mode), FALSE);
if (level > 40) /* 40 is the current kernel ELOOP check */
{
g_debug ("Expose too deep, bail");
@@ -704,6 +729,8 @@ flatpak_exports_add_path_expose (FlatpakExports *exports,
FlatpakFilesystemMode mode,
const char *path)
{
g_return_if_fail (mode > FLATPAK_FILESYSTEM_MODE_NONE);
g_return_if_fail (mode <= FLATPAK_FILESYSTEM_MODE_LAST);
_exports_path_expose (exports, mode, path, 0);
}
@@ -719,6 +746,9 @@ flatpak_exports_add_path_expose_or_hide (FlatpakExports *exports,
FlatpakFilesystemMode mode,
const char *path)
{
g_return_if_fail (mode >= FLATPAK_FILESYSTEM_MODE_NONE);
g_return_if_fail (mode <= FLATPAK_FILESYSTEM_MODE_LAST);
if (mode == FLATPAK_FILESYSTEM_MODE_NONE)
flatpak_exports_add_path_tmpfs (exports, path);
else
@@ -736,6 +766,9 @@ void
flatpak_exports_add_host_etc_expose (FlatpakExports *exports,
FlatpakFilesystemMode mode)
{
g_return_if_fail (mode > FLATPAK_FILESYSTEM_MODE_NONE);
g_return_if_fail (mode <= FLATPAK_FILESYSTEM_MODE_LAST);
exports->host_etc = mode;
}
@@ -743,5 +776,8 @@ void
flatpak_exports_add_host_os_expose (FlatpakExports *exports,
FlatpakFilesystemMode mode)
{
g_return_if_fail (mode > FLATPAK_FILESYSTEM_MODE_NONE);
g_return_if_fail (mode <= FLATPAK_FILESYSTEM_MODE_LAST);
exports->host_os = mode;
}