proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-13 21:09:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Export if the volume is encrypted

Browse Source 
This requires passing in the udisks block proxy when creating the object.
This commit is contained in:
Richard Hughes 2020-10-30 14:52:36 +00:00
parent f3993a6b96
commit 2b188c8488
4 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libfwupdplugin/fu-common.c
View File

@ -2280,6 +2280,7 @@ fu_common_get_volumes_by_kind (const gchar *kind, GError **error)
}
g_ptr_array_add (volumes,
g_object_new (FU_TYPE_VOLUME,
"proxy-block", proxy_blk,
"proxy-filesystem", proxy_fs,
NULL));
}

50
libfwupdplugin/fu-volume.c
View File

@ -23,6 +23,7 @@
struct _FuVolume {
GObject parent_instance;
GDBusProxy *proxy_blk;
GDBusProxy *proxy_fs;
gchar *mount_path; /* only when mounted ourselves */
};
@ -30,6 +31,7 @@ struct _FuVolume {
enum {
PROP_0,
PROP_MOUNT_PATH,
PROP_PROXY_BLOCK,
PROP_PROXY_FILESYSTEM,
PROP_LAST
};
@ -41,6 +43,8 @@ fu_volume_finalize (GObject *obj)
{
FuVolume *self = FU_VOLUME (obj);
g_free (self->mount_path);
if (self->proxy_blk != NULL)
g_object_unref (self->proxy_blk);
if (self->proxy_fs != NULL)
g_object_unref (self->proxy_fs);
G_OBJECT_CLASS (fu_volume_parent_class)->finalize (obj);
@ -55,6 +59,9 @@ fu_volume_get_property (GObject *object, guint prop_id,
case PROP_MOUNT_PATH:
g_value_set_string (value, self->mount_path);
break;
case PROP_PROXY_BLOCK:
g_value_set_object (value, self->proxy_blk);
break;
case PROP_PROXY_FILESYSTEM:
g_value_set_object (value, self->proxy_fs);
break;
@ -73,6 +80,9 @@ fu_volume_set_property (GObject *object, guint prop_id,
case PROP_MOUNT_PATH:
self->mount_path = g_value_dup_string (value);
break;
case PROP_PROXY_BLOCK:
self->proxy_blk = g_value_dup_object (value);
break;
case PROP_PROXY_FILESYSTEM:
self->proxy_fs = g_value_dup_object (value);
break;
@ -92,6 +102,12 @@ fu_volume_class_init (FuVolumeClass *klass)
object_class->get_property = fu_volume_get_property;
object_class->set_property = fu_volume_set_property;
pspec = g_param_spec_object ("proxy-block", NULL, NULL, G_TYPE_DBUS_PROXY,
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_READWRITE |
G_PARAM_STATIC_NAME);
g_object_class_install_property (object_class, PROP_PROXY_BLOCK, pspec);
pspec = g_param_spec_object ("proxy-filesystem", NULL, NULL, G_TYPE_DBUS_PROXY,
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_READWRITE |
@ -124,7 +140,11 @@ const gchar *
fu_volume_get_id (FuVolume *self)
{
g_return_val_if_fail (FU_IS_VOLUME (self), NULL);
return g_dbus_proxy_get_object_path (self->proxy_fs);
if (self->proxy_fs != NULL)
return g_dbus_proxy_get_object_path (self->proxy_fs);
if (self->proxy_blk != NULL)
return g_dbus_proxy_get_object_path (self->proxy_blk);
return NULL;
}
/**
@ -142,7 +162,6 @@ fu_volume_get_mount_point (FuVolume *self)
{
g_autofree const gchar **mountpoints = NULL;
g_autoptr(GVariant) val = NULL;
g_autoptr(GError) error_local = NULL;
g_return_val_if_fail (FU_IS_VOLUME (self), NULL);
@ -226,6 +245,33 @@ fu_volume_is_mounted (FuVolume *self)
return mount_point != NULL;
}
/**
* fu_volume_is_encrypted:
* @self: a @FuVolume
*
* Checks if the VOLUME is currently encrypted.
*
* Returns: %TRUE for success
*
* Since: 1.5.1
**/
gboolean
fu_volume_is_encrypted (FuVolume *self)
{
g_autoptr(GVariant) val = NULL;
g_return_val_if_fail (FU_IS_VOLUME (self), FALSE);
if (self->proxy_blk == NULL)
return FALSE;
val = g_dbus_proxy_get_cached_property (self->proxy_blk, "CryptoBackingDevice");
if (val == NULL)
return FALSE;
if (g_strcmp0 (g_variant_get_string (val, NULL), "/") == 0)
return FALSE;
return TRUE;
}
/**
* fu_volume_mount:
* @self: a @FuVolume

1
libfwupdplugin/fu-volume.h
View File

@ -22,6 +22,7 @@ gboolean fu_volume_check_free_space (FuVolume *self,
guint64 required,
GError **error);
gboolean fu_volume_is_mounted (FuVolume *self);
gboolean fu_volume_is_encrypted (FuVolume *self);
gchar *fu_volume_get_mount_point (FuVolume *self);
gboolean fu_volume_mount (FuVolume *self,
GError **error);

1
libfwupdplugin/fwupdplugin.map
View File

@ -674,5 +674,6 @@ LIBFWUPDPLUGIN_1.5.1 {
global:
fu_device_add_possible_plugin;
fu_efivar_space_used;
fu_volume_is_encrypted;
local: *;
} LIBFWUPDPLUGIN_1.5.0;