mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-06-28 18:26:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

context: Pass in the negated permission string

Browse Source 
For device and socket the negated versions are nodevice and nosocket,
but for shares, the strings are allow and disallow. Take arguments for
both forms.
This commit is contained in:
Sebastian Wick
2025-12-05 15:30:08 +01:00
parent 2beadfc860
commit e0e1b20ecb
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/flatpak-context.c
View File

@@ -279,6 +279,7 @@ flatpak_permission_serialize (FlatpakPermission *permission,
static void static void
flatpak_permission_to_args (FlatpakPermission *permission, flatpak_permission_to_args (FlatpakPermission *permission,
const char *argname, const char *argname,
const char *noargname,
const char *name, const char *name,
GPtrArray *args) GPtrArray *args)
{ {
@@ -293,7 +294,7 @@ flatpak_permission_to_args (FlatpakPermission *permission,
/* Partially allowed */ /* Partially allowed */
if (permission->reset) if (permission->reset)
g_ptr_array_add (args, g_strdup_printf ("--no%s=%s", argname, name)); g_ptr_array_add (args, g_strdup_printf ("--%s=%s", noargname, name));
for (size_t i = 0; i < permission->conditionals->len; i++) for (size_t i = 0; i < permission->conditionals->len; i++)
{ {
@@ -582,6 +583,7 @@ flatpak_permissions_allows_unconditionally (GHashTable *permissions,
static void static void
flatpak_permissions_to_args (GHashTable *permissions, flatpak_permissions_to_args (GHashTable *permissions,
const char *argname, const char *argname,
const char *noargname,
GPtrArray *args) GPtrArray *args)
{ {
g_autoptr(GList) ordered_keys = NULL; g_autoptr(GList) ordered_keys = NULL;
@@ -594,7 +596,7 @@ flatpak_permissions_to_args (GHashTable *permissions,
const char *name = l->data; const char *name = l->data;
FlatpakPermission *permission = g_hash_table_lookup (permissions, name); FlatpakPermission *permission = g_hash_table_lookup (permissions, name);
flatpak_permission_to_args (permission, argname, name, args); flatpak_permission_to_args (permission, argname, noargname, name, args);
} }
} }
@@ -892,7 +894,7 @@ static void flatpak_permissions_test_basic (void)
g_assert_cmpstrv (perms_strv, new_strv); g_assert_cmpstrv (perms_strv, new_strv);
g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free); g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
flatpak_permissions_to_args (perms, "socket", args); flatpak_permissions_to_args (perms, "socket", "nosocket", args);
g_ptr_array_add(args, NULL); g_ptr_array_add(args, NULL);
g_assert_cmpstrv (perms_args, args->pdata); g_assert_cmpstrv (perms_args, args->pdata);
@@ -3695,9 +3697,10 @@ flatpak_context_to_args (FlatpakContext *context,
flatpak_context_shared_to_args (context, args); flatpak_context_shared_to_args (context, args);
flatpak_context_features_to_args (context, args); flatpak_context_features_to_args (context, args);
flatpak_permissions_to_args (context->device_permissions,
flatpak_permissions_to_args (context->device_permissions, "device", args); "device", "nodevice", args);
flatpak_permissions_to_args (context->socket_permissions, "socket", args); flatpak_permissions_to_args (context->socket_permissions,
"socket", "nosocket", args);
g_hash_table_iter_init (&iter, context->env_vars); g_hash_table_iter_init (&iter, context->env_vars);
while (g_hash_table_iter_next (&iter, &key, &value)) while (g_hash_table_iter_next (&iter, &key, &value))