proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-16 07:25:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add new flags can-verify and can-verify-image

Browse Source 
These are used to indicate that the device can verify checksums or
can dump an image for checksumming.
This commit is contained in:
Mario Limonciello 2019-10-14 07:36:04 -05:00 committed by Mario Limonciello
parent 49556a3948
commit 8fa0b382fa
13 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfwupd/fwupd-enums.c
View File

@ -169,6 +169,10 @@ fwupd_device_flag_to_string (FwupdDeviceFlags device_flag)
return "only-supported";
if (device_flag == FWUPD_DEVICE_FLAG_WILL_DISAPPEAR)
return "will-disappear";
if (device_flag == FWUPD_DEVICE_FLAG_CAN_VERIFY)
return "can-verify";
if (device_flag == FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE)
return "can-verify-image";
if (device_flag == FWUPD_DEVICE_FLAG_UNKNOWN)
return "unknown";
return NULL;
@ -239,6 +243,10 @@ fwupd_device_flag_from_string (const gchar *device_flag)
return FWUPD_DEVICE_FLAG_ONLY_SUPPORTED;
if (g_strcmp0 (device_flag, "will-disappear") == 0)
return FWUPD_DEVICE_FLAG_WILL_DISAPPEAR;
if (g_strcmp0 (device_flag, "can-verify") == 0)
return FWUPD_DEVICE_FLAG_CAN_VERIFY;
if (g_strcmp0 (device_flag, "can-verify-image") == 0)
return FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE;
return FWUPD_DEVICE_FLAG_UNKNOWN;
}

4
libfwupd/fwupd-enums.h
View File

@ -92,6 +92,8 @@ typedef enum {
* @FWUPD_DEVICE_FLAG_ENSURE_SEMVER: Ensure the version is a valid semantic version, e.g. numbers separated with dots
* @FWUPD_DEVICE_FLAG_ONLY_SUPPORTED: Only devices supported in the metadata will be opened
* @FWUPD_DEVICE_FLAG_WILL_DISAPPEAR: Device will disappear after update and can't be verified
* @FWUPD_DEVICE_FLAG_CAN_VERIFY: Device checksums can be compared against metadata
* @FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE: Image can be dumped from device for verification
*
* The device flags.
**/
@ -121,6 +123,8 @@ typedef enum {
#define FWUPD_DEVICE_FLAG_HISTORICAL (1u << 22) /* Since: 1.3.2 */
#define FWUPD_DEVICE_FLAG_ONLY_SUPPORTED (1u << 23) /* Since: 1.3.3 */
#define FWUPD_DEVICE_FLAG_WILL_DISAPPEAR (1u << 24) /* Since: 1.3.3 */
#define FWUPD_DEVICE_FLAG_CAN_VERIFY (1u << 25) /* Since: 1.3.3 */
#define FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE (1u << 26) /* Since: 1.3.3 */
#define FWUPD_DEVICE_FLAG_UNKNOWN G_MAXUINT64 /* Since: 0.7.3 */
typedef guint64 FwupdDeviceFlags;

1
plugins/optionrom/fu-optionrom-device.c
View File

@ -91,6 +91,7 @@ fu_optionrom_device_init (FuOptionromDevice *self)
{
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL);
fu_device_add_icon (FU_DEVICE (self), "audio-card");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE);
}
static void

1
plugins/superio/fu-superio-device.c
View File

@ -448,6 +448,7 @@ fu_superio_device_init (FuSuperioDevice *self)
{
fu_device_set_physical_id (FU_DEVICE (self), "/dev/port");
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_INTERNAL);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE);
fu_device_set_summary (FU_DEVICE (self), "Embedded Controller");
fu_device_add_icon (FU_DEVICE (self), "computer");
}

2
plugins/superio/fu-superio-it89-device.c
View File

@ -468,7 +468,7 @@ fu_superio_it89_device_detach (FuDevice *device, GError **error)
}
/* success */
fu_device_add_flag (self, FWUPD_DEVICE_FLAG_IS_BOOTLOADER);
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_IS_BOOTLOADER);
return TRUE;
}

1
plugins/synaptics-prometheus/fu-synaprom-device.c
View File

@ -434,6 +434,7 @@ static void
fu_synaprom_device_init (FuSynapromDevice *self)
{
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (FU_DEVICE (self), FWUPD_DEVICE_FLAG_CAN_VERIFY);
fu_device_set_remove_delay (FU_DEVICE (self), FU_DEVICE_REMOVE_DELAY_RE_ENUMERATE);
fu_device_set_name (FU_DEVICE (self), "Prometheus");
fu_device_set_summary (FU_DEVICE (self), "Fingerprint reader");

1
plugins/test/fu-plugin-test.c
View File

@ -41,6 +41,7 @@ fu_plugin_coldplug (FuPlugin *plugin, GError **error)
fu_device_set_name (device, "Integrated_Webcam(TM)");
fu_device_add_icon (device, "preferences-desktop-keyboard");
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_UPDATABLE);
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_CAN_VERIFY);
fu_device_set_summary (device, "A fake webcam");
fu_device_set_vendor (device, "ACME Corp.");
fu_device_set_vendor_id (device, "USB:0x046D");

1
plugins/uefi/fu-uefi-device.c
View File

@ -554,6 +554,7 @@ fu_uefi_device_probe (FuDevice *device, GError **error)
/* set the PCR0 as the device checksum */
if (self->kind == FU_UEFI_DEVICE_KIND_SYSTEM_FIRMWARE) {
g_autoptr(GError) error_local = NULL;
fu_device_add_flag (device, FWUPD_DEVICE_FLAG_CAN_VERIFY);
if (!fu_uefi_device_add_system_checksum (device, &error_local))
g_warning ("Failed to get PCR0s: %s", error_local->message);
}

14
src/fu-device.c
View File

@ -1405,6 +1405,14 @@ fu_device_get_physical_id (FuDevice *self)
return priv->physical_id;
}
void
fu_device_add_flag (FuDevice *self, FwupdDeviceFlags flag)
{
if (flag & FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE)
flag |= FWUPD_DEVICE_FLAG_CAN_VERIFY;
fwupd_device_add_flag (FWUPD_DEVICE (self), flag);
}
static void
fu_device_set_custom_flag (FuDevice *self, const gchar *hint)
{
@ -1911,8 +1919,10 @@ fu_device_read_firmware (FuDevice *self, GError **error)
g_return_val_if_fail (FU_IS_DEVICE (self), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
/* no plugin-specific method */
if (klass->read_firmware == NULL) {
/* no plugin-specific method or device doesn't support */
if (!fu_device_has_flag (self, FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE) ||
klass->read_firmware == NULL) {
g_set_error_literal (error,
FWUPD_ERROR,
FWUPD_ERROR_NOT_SUPPORTED,

3
src/fu-device.h
View File

@ -83,7 +83,6 @@ struct _FuDeviceClass
FuDevice *fu_device_new (void);
/* helpful casting macros */
#define fu_device_add_flag(d,v) fwupd_device_add_flag(FWUPD_DEVICE(d),v)
#define fu_device_remove_flag(d,v) fwupd_device_remove_flag(FWUPD_DEVICE(d),v)
#define fu_device_has_flag(d,v) fwupd_device_has_flag(FWUPD_DEVICE(d),v)
#define fu_device_has_instance_id(d,v) fwupd_device_has_instance_id(FWUPD_DEVICE(d),v)
@ -179,6 +178,8 @@ void fu_device_set_physical_id (FuDevice *self,
const gchar *fu_device_get_logical_id (FuDevice *self);
void fu_device_set_logical_id (FuDevice *self,
const gchar *logical_id);
void fu_device_add_flag (FuDevice *self,
FwupdDeviceFlags flag);
const gchar *fu_device_get_custom_flags (FuDevice *self);
gboolean fu_device_has_custom_flag (FuDevice *self,
const gchar *hint);

12
src/fu-engine.c
View File

@ -827,10 +827,12 @@ fu_engine_verify (FuEngine *self, const gchar *device_id, GError **error)
if (plugin == NULL)
return FALSE;
/* set the device firmware hash */
if (!fu_plugin_runner_verify (plugin, device,
FU_PLUGIN_VERIFY_FLAG_NONE, error))
return FALSE;
/* update the device firmware hashes if possible */
if (fu_device_has_flag (device, FWUPD_DEVICE_FLAG_CAN_VERIFY_IMAGE)) {
if (!fu_plugin_runner_verify (plugin, device,
FU_PLUGIN_VERIFY_FLAG_NONE, error))
return FALSE;
}
/* find component in metadata */
version = fu_device_get_version (device);
@ -874,7 +876,7 @@ fu_engine_verify (FuEngine *self, const gchar *device_id, GError **error)
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_NOT_FOUND,
"No version %s", version);
"No release found for version %s", version);
return FALSE;
}

1
src/fu-plugin.c
View File

@ -1752,7 +1752,6 @@ fu_plugin_runner_verify (FuPlugin *self,
/* optional */
g_module_symbol (priv->module, "fu_plugin_verify", (gpointer *) &func);
if (func == NULL) {
g_debug ("running superclassed read_firmware() on %s", priv->name);
return fu_plugin_device_read_firmware (self, device, error);
}

6
src/fu-util.c
View File

@ -1056,6 +1056,7 @@ fu_util_verify_update (FuUtilPrivate *priv, gchar **values, GError **error)
{
g_autoptr(FwupdDevice) dev = NULL;
priv->filter_include |= FWUPD_DEVICE_FLAG_CAN_VERIFY;
dev = fu_util_get_device_or_prompt (priv, values, error);
if (dev == NULL)
return FALSE;
@ -1489,6 +1490,7 @@ fu_util_verify (FuUtilPrivate *priv, gchar **values, GError **error)
{
g_autoptr(FwupdDevice) dev = NULL;
priv->filter_include |= FWUPD_DEVICE_FLAG_CAN_VERIFY;
dev = fu_util_get_device_or_prompt (priv, values, error);
if (dev == NULL)
return FALSE;
@ -2450,7 +2452,7 @@ main (int argc, char *argv[])
"verify",
"[DEVICE_ID]",
/* TRANSLATORS: command description */
_("Gets the cryptographic hash of the dumped firmware"),
_("Checks cryptographic hash matches firmware"),
fu_util_verify);
fu_util_cmd_array_add (cmd_array,
"unlock",
@ -2504,7 +2506,7 @@ main (int argc, char *argv[])
"verify-update",
"[DEVICE_ID]",
/* TRANSLATORS: command description */
_("Update the stored metadata with current ROM contents"),
_("Update the stored cryptographic hash with current ROM contents"),
fu_util_verify_update);
fu_util_cmd_array_add (cmd_array,
"modify-remote",