proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-28 18:30:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show a console warning if loading an out-of-tree plugin

Browse Source 
Fixes https://github.com/hughsie/fwupd/issues/950
This commit is contained in:
Richard Hughes 2019-01-18 17:57:39 +00:00
parent 4e30d25668
commit f425d29a28
71 changed files with 296 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libfwupd/fwupd-client.c
View File

@ -37,6 +37,7 @@ static void fwupd_client_finalize (GObject *object);
typedef struct {
FwupdStatus status;
gboolean tainted;
guint percentage;
gchar *daemon_version;
GDBusConnection *conn;
@ -57,6 +58,7 @@ enum {
PROP_STATUS,
PROP_PERCENTAGE,
PROP_DAEMON_VERSION,
PROP_TAINTED,
PROP_LAST
};
@ -131,6 +133,14 @@ fwupd_client_properties_changed_cb (GDBusProxy *proxy,
g_object_notify (G_OBJECT (client), "status");
}
}
if (g_variant_dict_contains (dict, "Tainted")) {
g_autoptr(GVariant) val = NULL;
val = g_dbus_proxy_get_cached_property (proxy, "Tainted");
if (val != NULL) {
priv->tainted = g_variant_get_boolean (val);
g_object_notify (G_OBJECT (client), "tainted");
}
}
if (g_variant_dict_contains (dict, "Percentage")) {
g_autoptr(GVariant) val = NULL;
val = g_dbus_proxy_get_cached_property (proxy, "Percentage");
@ -203,6 +213,7 @@ fwupd_client_connect (FwupdClient *client, GCancellable *cancellable, GError **e
{
FwupdClientPrivate *priv = GET_PRIVATE (client);
g_autoptr(GVariant) val = NULL;
g_autoptr(GVariant) val2 = NULL;
g_return_val_if_fail (FWUPD_IS_CLIENT (client), FALSE);
g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE);
@ -235,6 +246,9 @@ fwupd_client_connect (FwupdClient *client, GCancellable *cancellable, GError **e
val = g_dbus_proxy_get_cached_property (priv->proxy, "DaemonVersion");
if (val != NULL)
fwupd_client_set_daemon_version (client, g_variant_get_string (val, NULL));
val2 = g_dbus_proxy_get_cached_property (priv->proxy, "Tainted");
if (val2 != NULL)
priv->tainted = g_variant_get_boolean (val2);
return TRUE;
}
@ -1138,6 +1152,24 @@ fwupd_client_get_status (FwupdClient *client)
return priv->status;
}
/**
* fwupd_client_get_tainted:
* @client: A #FwupdClient
*
* Gets if the daemon has been tainted by 3rd party code.
*
* Returns: %TRUE if the daemon is unsupported
*
* Since: 1.2.4
**/
gboolean
fwupd_client_get_tainted (FwupdClient *client)
{
FwupdClientPrivate *priv = GET_PRIVATE (client);
g_return_val_if_fail (FWUPD_IS_CLIENT (client), FALSE);
return priv->tainted;
}
/**
* fwupd_client_update_metadata:
* @client: A #FwupdClient
@ -1461,6 +1493,9 @@ fwupd_client_get_property (GObject *object, guint prop_id,
case PROP_STATUS:
g_value_set_uint (value, priv->status);
break;
case PROP_TAINTED:
g_value_set_boolean (value, priv->tainted);
break;
case PROP_PERCENTAGE:
g_value_set_uint (value, priv->percentage);
break;
@ -1598,6 +1633,17 @@ fwupd_client_class_init (FwupdClientClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_NAME);
g_object_class_install_property (object_class, PROP_STATUS, pspec);
/**
* FwupdClient:tainted:
*
* If the daemon is tainted by 3rd party code.
*
* Since: 1.2.4
*/
pspec = g_param_spec_boolean ("tainted", NULL, NULL, FALSE,
G_PARAM_READABLE | G_PARAM_STATIC_NAME);
g_object_class_install_property (object_class, PROP_TAINTED, pspec);
/**
* FwupdClient:percentage:
*

1
libfwupd/fwupd-client.h
View File

@ -116,6 +116,7 @@ gboolean fwupd_client_modify_device (FwupdClient *client,
GCancellable *cancellable,
GError **error);
FwupdStatus fwupd_client_get_status (FwupdClient *client);
gboolean fwupd_client_get_tainted (FwupdClient *client);
guint fwupd_client_get_percentage (FwupdClient *client);
const gchar *fwupd_client_get_daemon_version (FwupdClient *client);

6
libfwupd/fwupd.map
View File

@ -293,3 +293,9 @@ LIBFWUPD_1.2.2 {
fwupd_release_set_protocol;
local: *;
} LIBFWUPD_1.2.1;
LIBFWUPD_1.2.4 {
global:
fwupd_client_get_tainted;
local: *;
} LIBFWUPD_1.2.2;

3
meson.build
View File

@ -193,6 +193,7 @@ if libgcab.version().version_compare('>= 1.0')
endif
gcab = find_program('gcab', required : true)
bashcomp = dependency('bash-completion', required: false)
python3 = find_program('python3')
if valgrind.found()
conf.set('HAVE_VALGRIND', '1')
@ -237,8 +238,6 @@ if get_option('plugin_uefi')
gnu_efi_arch = ''
endif
conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
python3 = find_program('python3')
r = run_command([python3, 'po/test-deps'])
if r.returncode() != 0
error(r.stdout())

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

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "org.altusmetrum.altos");
}

1
plugins/altos/meson.build
View File

@ -5,6 +5,7 @@ install_data(['altos.quirk'],
)
shared_module('fu_plugin_altos',
fu_hash,
sources : [
'fu-altos-device.c',
'fu-altos-firmware.c',

6
plugins/amt/fu-plugin-amt.c
View File

@ -539,6 +539,12 @@ fu_plugin_amt_create_device (GError **error)
return g_steal_pointer (&dev);
}
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
}
gboolean
fu_plugin_coldplug (FuPlugin *plugin, GError **error)
{

1
plugins/amt/meson.build
View File

@ -1,6 +1,7 @@
cargs = ['-DG_LOG_DOMAIN="FuPluginAmt"']
shared_module('fu_plugin_amt',
fu_hash,
sources : [
'fu-plugin-amt.c',
],

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

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.hughski.colorhug");
}

1
plugins/colorhug/meson.build
View File

@ -7,6 +7,7 @@ install_data([
)
shared_module('fu_plugin_colorhug',
fu_hash,
sources : [
'fu-colorhug-common.c',
'fu-colorhug-device.c',

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

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.qualcomm.dfu");
}

1
plugins/csr/meson.build
View File

@ -5,6 +5,7 @@ install_data(['csr-aiaiai.quirk'],
)
shared_module('fu_plugin_csr',
fu_hash,
sources : [
'fu-csr-device.c',
'fu-plugin-csr.c',

5
plugins/dell-dock/fu-plugin-dell-dock.c
View File

@ -21,8 +21,11 @@
#include "fu-dell-dock-common.h"
void fu_plugin_init (FuPlugin *plugin)
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
/* allow these to be built by quirks */
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
g_type_ensure (FU_TYPE_DELL_DOCK_STATUS);

1
plugins/dell-dock/meson.build
View File

@ -5,6 +5,7 @@ install_data(['dell-dock.quirk'],
)
shared_module('fu_plugin_dell_dock',
fu_hash,
sources : [
'fu-plugin-dell-dock.c',
'fu-dell-dock-common.c',

6
plugins/dell-esrt/fu-plugin-dell-esrt.c
View File

@ -83,6 +83,12 @@ fu_plugin_dell_esrt_admin_password_present (gboolean *password_present, GError *
return TRUE;
}
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
}
gboolean
fu_plugin_startup (FuPlugin *plugin, GError **error)
{

1
plugins/dell-esrt/meson.build
View File

@ -1,6 +1,7 @@
cargs = ['-DG_LOG_DOMAIN="FuPluginDellEsrt"']
shared_module('fu_plugin_dell_esrt',
fu_hash,
sources : [
'fu-plugin-dell-esrt.c',
],

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

@ -786,6 +786,7 @@ fu_plugin_init (FuPlugin *plugin)
FuPluginData *data = fu_plugin_alloc_data (plugin, sizeof (FuPluginData));
g_autofree gchar *tmp = NULL;
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
tmp = g_strdup_printf ("%d.%d",
smbios_get_library_version_major(),
smbios_get_library_version_minor());

1
plugins/dell/meson.build
View File

@ -5,6 +5,7 @@ install_data(['dell.quirk'],
)
shared_module('fu_plugin_dell',
fu_hash,
sources : [
'fu-plugin-dell.c',
'fu-dell-smi.c',

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

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "org.usb.dfu");
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.st.dfuse");

2
plugins/dfu/meson.build
View File

@ -43,6 +43,7 @@ dfu = static_library(
)
shared_module('fu_plugin_dfu',
fu_hash,
sources : [
'fu-plugin-dfu.c',
],
@ -65,6 +66,7 @@ shared_module('fu_plugin_dfu',
dfu_tool = executable(
'dfu-tool',
fu_hash,
sources : [
'dfu-tool.c',
],

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

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.8bitdo");
}

1
plugins/ebitdo/meson.build
View File

@ -5,6 +5,7 @@ install_data(['ebitdo.quirk'],
)
shared_module('fu_plugin_ebitdo',
fu_hash,
sources : [
'fu-plugin-ebitdo.c',
'fu-ebitdo-common.c',

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

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.google.fastboot");
}

1
plugins/fastboot/meson.build
View File

@ -5,6 +5,7 @@ install_data(['fastboot.quirk'],
)
shared_module('fu_plugin_fastboot',
fu_hash,
sources : [
'fu-plugin-fastboot.c',
'fu-fastboot-device.c',

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

@ -32,6 +32,7 @@ struct FuPluginData {
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_alloc_data (plugin, sizeof (FuPluginData));
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "org.flashrom");
}

1
plugins/flashrom/meson.build
View File

@ -5,6 +5,7 @@ install_data(['flashrom.quirk'],
)
shared_module('fu_plugin_flashrom',
fu_hash,
sources : [
'fu-plugin-flashrom.c',
],

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

@ -14,6 +14,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
}

1
plugins/nitrokey/meson.build
View File

@ -5,6 +5,7 @@ install_data(['nitrokey.quirk'],
)
shared_module('fu_plugin_nitrokey',
fu_hash,
sources : [
'fu-nitrokey-device.c',
'fu-nitrokey-common.c',

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

@ -31,6 +31,7 @@ fu_plugin_udev_device_added (FuPlugin *plugin, FuUdevDevice *device, GError **er
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_udev_subsystem (plugin, "nvme");
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "org.nvmexpress");
}

1
plugins/nvme/meson.build
View File

@ -7,6 +7,7 @@ install_data([
)
shared_module('fu_plugin_nvme',
fu_hash,
sources : [
'fu-plugin-nvme.c',
'fu-nvme-common.c',

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

@ -118,6 +118,7 @@ fu_plugin_init (FuPlugin *plugin)
FuPluginData *data = fu_plugin_alloc_data (plugin, sizeof (FuPluginData));
data->client = fu_redfish_client_new ();
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "org.dmtf.redfish");
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
}
void

1
plugins/redfish/meson.build
View File

@ -1,6 +1,7 @@
cargs = ['-DG_LOG_DOMAIN="FuPluginRedfish"']
shared_module('fu_plugin_redfish',
fu_hash,
sources : [
'fu-plugin-redfish.c',
'fu-redfish-client.c',

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

@ -14,6 +14,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.realtek.rts54");

1
plugins/rts54hid/meson.build
View File

@ -7,6 +7,7 @@ install_data([
)
shared_module('fu_plugin_rts54hid',
fu_hash,
sources : [
'fu-rts54hid-device.c',
'fu-rts54hid-module.c',

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

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.realtek.rts54");
}

1
plugins/rts54hub/meson.build
View File

@ -7,6 +7,7 @@ install_data([
)
shared_module('fu_plugin_rts54hub',
fu_hash,
sources : [
'fu-rts54hub-device.c',
'fu-plugin-rts54hub.c',

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

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
}

1
plugins/steelseries/meson.build
View File

@ -5,6 +5,7 @@ install_data(['steelseries.quirk'],
)
shared_module('fu_plugin_steelseries',
fu_hash,
sources : [
'fu-plugin-steelseries.c',
'fu-steelseries-device.c',

6
plugins/superio/fu-plugin-superio.c
View File

@ -62,6 +62,12 @@ fu_plugin_superio_coldplug_chipsets (FuPlugin *plugin, const gchar *str, GError
return TRUE;
}
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
}
gboolean
fu_plugin_coldplug (FuPlugin *plugin, GError **error)
{

1
plugins/superio/meson.build
View File

@ -5,6 +5,7 @@ install_data(['superio.quirk'],
)
shared_module('fu_plugin_superio',
fu_hash,
sources : [
'fu-plugin-superio.c',
'fu-superio-device.c',

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

@ -472,4 +472,5 @@ fu_plugin_init (FuPlugin *plugin)
/* make sure dell is already coldplugged */
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_RUN_AFTER, "dell");
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.synaptics.mst");
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
}

1
plugins/synapticsmst/meson.build
View File

@ -5,6 +5,7 @@ install_data(['synapticsmst.quirk'],
)
shared_module('fu_plugin_synapticsmst',
fu_hash,
sources : [
'fu-plugin-synapticsmst.c',
'synapticsmst-common.c',

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

@ -15,6 +15,10 @@ struct FuPluginData {
void
fu_plugin_init (FuPlugin *plugin)
{
if (g_strcmp0 (g_getenv ("FWUPD_PLUGIN_TEST"), "build-hash") == 0)
fu_plugin_set_build_hash (plugin, "invalid");
else
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.acme.test");
fu_plugin_alloc_data (plugin, sizeof (FuPluginData));
g_debug ("init");

1
plugins/test/meson.build
View File

@ -6,6 +6,7 @@ if get_option('plugin_dummy')
endif
shared_module('fu_plugin_test',
fu_hash,
sources : [
'fu-plugin-test.c',
],

1
plugins/thunderbolt-power/fu-plugin-thunderbolt-power.c
View File

@ -320,6 +320,7 @@ fu_plugin_init (FuPlugin *plugin)
/* make sure it's tried to coldplug */
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_RUN_AFTER, "thunderbolt");
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
}
void

1
plugins/thunderbolt-power/meson.build
View File

@ -1,6 +1,7 @@
cargs = ['-DG_LOG_DOMAIN="FuPluginThunderbolt"']
fu_plugin_thunderbolt_power = shared_module('fu_plugin_thunderbolt_power',
fu_hash,
sources : [
'fu-plugin-thunderbolt-power.c',
],

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

@ -585,6 +585,7 @@ fu_plugin_init (FuPlugin *plugin)
FuPluginData *data = fu_plugin_alloc_data (plugin, sizeof (FuPluginData));
const gchar *subsystems[] = { "thunderbolt", NULL };
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.intel.thunderbolt");
data->udev = g_udev_client_new (subsystems);
g_signal_connect (data->udev, "uevent",

1
plugins/thunderbolt/meson.build
View File

@ -1,6 +1,7 @@
cargs = ['-DG_LOG_DOMAIN="FuPluginThunderbolt"']
fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt',
fu_hash,
sources : [
'fu-plugin-thunderbolt.c',
'fu-thunderbolt-image.c',

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

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_udev_subsystem (plugin, "pci");
}

2
plugins/udev/meson.build
View File

@ -1,6 +1,7 @@
cargs = ['-DG_LOG_DOMAIN="FuPluginUdev"']
shared_module('fu_plugin_udev',
fu_hash,
sources : [
'fu-plugin-udev.c',
'fu-rom.c',
@ -23,6 +24,7 @@ shared_module('fu_plugin_udev',
executable(
'fu-rom-tool',
fu_hash,
sources : [
'fu-rom-tool.c',
'fu-rom.c',

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

@ -40,6 +40,7 @@ fu_plugin_init (FuPlugin *plugin)
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_RUN_AFTER, "upower");
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "org.uefi.capsule");
fu_plugin_add_compile_version (plugin, "com.redhat.efivar", EFIVAR_LIBRARY_VERSION);
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
}
void

2
plugins/uefi/meson.build
View File

@ -8,6 +8,7 @@ install_data(['uefi.quirk'],
)
shared_module('fu_plugin_uefi',
fu_hash,
sources : [
'fu-plugin-uefi.c',
'fu-uefi-bgrt.c',
@ -40,6 +41,7 @@ shared_module('fu_plugin_uefi',
executable(
'fwupdate',
resources_src,
fu_hash,
sources : [
'fu-uefi-tool.c',
'fu-uefi-bgrt.c',

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

@ -173,6 +173,7 @@ fu_plugin_startup (FuPlugin *plugin, GError **error)
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.logitech.unifying");
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.logitech.unifyingsigned");

1
plugins/unifying/meson.build
View File

@ -8,6 +8,7 @@ install_data([
shared_module('fu_plugin_unifying',
fu_hash,
sources : [
'fu-plugin-unifying.c',
'fu-unifying-bootloader.c',

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

@ -18,6 +18,7 @@ struct FuPluginData {
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_alloc_data (plugin, sizeof (FuPluginData));
}

1
plugins/upower/meson.build
View File

@ -1,6 +1,7 @@
cargs = ['-DG_LOG_DOMAIN="FuPluginUpower"']
shared_module('fu_plugin_upower',
fu_hash,
sources : [
'fu-plugin-upower.c',
],

1
plugins/wacom-usb/fu-plugin-wacom-usb.c
View File

@ -13,6 +13,7 @@
void
fu_plugin_init (FuPlugin *plugin)
{
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_REQUIRES_QUIRK, FU_QUIRKS_PLUGIN);
fu_plugin_add_rule (plugin, FU_PLUGIN_RULE_SUPPORTS_PROTOCOL, "com.wacom.usb");
}

1
plugins/wacom-usb/meson.build
View File

@ -5,6 +5,7 @@ install_data(['wacom-usb.quirk'],
)
shared_module('fu_plugin_wacom_usb',
fu_hash,
sources : [
'fu-wac-common.c',
'fu-wac-device.c',

24
src/fu-engine.c
View File

@ -34,6 +34,7 @@
#include "fu-hwids.h"
#include "fu-idle.h"
#include "fu-keyring-utils.h"
#include "fu-hash.h"
#include "fu-history.h"
#include "fu-mutex.h"
#include "fu-plugin.h"
@ -55,6 +56,7 @@ struct _FuEngine
FuConfig *config;
FuDeviceList *device_list;
FwupdStatus status;
gboolean tainted;
guint percentage;
FuHistory *history;
FuIdle *idle;
@ -3376,10 +3378,22 @@ fu_engine_plugin_set_coldplug_delay_cb (FuPlugin *plugin, guint duration, FuEngi
duration, self->coldplug_delay);
}
/* for the self tests to use */
/* this is called by the self tests as well */
void
fu_engine_add_plugin (FuEngine *self, FuPlugin *plugin)
{
/* plugin does not match built version */
if (fu_plugin_get_build_hash (plugin) == NULL) {
const gchar *name = fu_plugin_get_name (plugin);
g_warning ("%s should call fu_plugin_set_build_hash()", name);
self->tainted = TRUE;
} else if (g_strcmp0 (fu_plugin_get_build_hash (plugin), FU_BUILD_HASH) != 0) {
const gchar *name = fu_plugin_get_name (plugin);
g_warning ("%s has incorrect built version %s",
name, fu_plugin_get_build_hash (plugin));
self->tainted = TRUE;
}
fu_plugin_list_add (self->plugin_list, plugin);
}
@ -3428,6 +3442,12 @@ fu_engine_plugin_check_supported_cb (FuPlugin *plugin, const gchar *guid, FuEngi
return n != NULL;
}
gboolean
fu_engine_get_tainted (FuEngine *self)
{
return self->tainted;
}
gboolean
fu_engine_load_plugins (FuEngine *self, GError **error)
{
@ -3516,7 +3536,7 @@ fu_engine_load_plugins (FuEngine *self, GError **error)
self);
/* add */
fu_plugin_list_add (self->plugin_list, plugin);
fu_engine_add_plugin (self, plugin);
}
/* depsolve into the correct order */

1
src/fu-engine.h
View File

@ -30,6 +30,7 @@ gboolean fu_engine_load (FuEngine *self,
GError **error);
gboolean fu_engine_load_plugins (FuEngine *self,
GError **error);
gboolean fu_engine_get_tainted (FuEngine *self);
FwupdStatus fu_engine_get_status (FuEngine *self);
XbSilo *fu_engine_get_silo_from_blob (FuEngine *self,
GBytes *blob_cab,

33
src/fu-hash.py Normal file
View File

@ -0,0 +1,33 @@
#!/usr/bin/python3
""" Builds a header for the plugins to include """
# pylint: disable=invalid-name,wrong-import-position,pointless-string-statement
"""
SPDX-License-Identifier: LGPL-2.1+
"""
import sys
import hashlib
def usage(return_code):
""" print usage and exit with the supplied return code """
if return_code == 0:
out = sys.stdout
else:
out = sys.stderr
out.write("usage: fu-hash.py <DAEMON> <HEADER>")
sys.exit(return_code)
if __name__ == '__main__':
if {'-?', '--help', '--usage'}.intersection(set(sys.argv)):
usage(0)
if len(sys.argv) != 3:
usage(1)
with open(sys.argv[1], 'rb') as f:
buf = f.read()
csum = hashlib.sha256(buf).hexdigest()
with open(sys.argv[2], 'w') as f2:
f2.write('#ifndef FU_BUILD_HASH\n')
f2.write('#define FU_BUILD_HASH "%s"\n' % csum)
f2.write('#endif /* FU_BUILD_HASH */\n')

3
src/fu-main.c
View File

@ -1115,6 +1115,9 @@ fu_main_daemon_get_property (GDBusConnection *connection_, const gchar *sender,
if (g_strcmp0 (property_name, "DaemonVersion") == 0)
return g_variant_new_string (VERSION);
if (g_strcmp0 (property_name, "Tainted") == 0)
return g_variant_new_boolean (fu_engine_get_tainted (priv->engine));
if (g_strcmp0 (property_name, "Status") == 0)
return g_variant_new_uint32 (fu_engine_get_status (priv->engine));

1
src/fu-plugin-private.h
View File

@ -38,6 +38,7 @@ void fu_plugin_set_priority (FuPlugin *self,
guint priority);
void fu_plugin_set_name (FuPlugin *self,
const gchar *name);
const gchar *fu_plugin_get_build_hash (FuPlugin *self);
GPtrArray *fu_plugin_get_rules (FuPlugin *self,
FuPluginRule rule);
gboolean fu_plugin_has_rule (FuPlugin *self,

1
src/fu-plugin-vfuncs.h
View File

@ -9,6 +9,7 @@
#include "fu-plugin.h"
#include "fu-device.h"
#include "fu-hash.h"
G_BEGIN_DECLS

29
src/fu-plugin.c
View File

@ -44,6 +44,7 @@ typedef struct {
guint priority;
GPtrArray *rules[FU_PLUGIN_RULE_LAST];
gchar *name;
gchar *build_hash;
FuHwids *hwids;
FuQuirks *quirks;
GHashTable *runtime_versions;
@ -132,6 +133,34 @@ fu_plugin_set_name (FuPlugin *self, const gchar *name)
priv->name = g_strdup (name);
}
/**
* fu_plugin_set_build_hash:
* @self: A #FuPlugin
* @build_hash: A checksum
*
* Sets the plugin build hash, typically a SHA256 checksum. All plugins must
* set the correct checksum to avoid the daemon being marked as tainted.
*
* Since: 1.2.4
**/
void
fu_plugin_set_build_hash (FuPlugin *self, const gchar *build_hash)
{
FuPluginPrivate *priv = GET_PRIVATE (self);
g_return_if_fail (FU_IS_PLUGIN (self));
g_return_if_fail (build_hash != NULL);
g_free (priv->build_hash);
priv->build_hash = g_strdup (build_hash);
}
const gchar *
fu_plugin_get_build_hash (FuPlugin *self)
{
FuPluginPrivate *priv = GET_PRIVATE (self);
g_return_val_if_fail (FU_IS_PLUGIN (self), NULL);
return priv->build_hash;
}
/**
* fu_plugin_cache_lookup:
* @self: A #FuPlugin

2
src/fu-plugin.h
View File

@ -97,6 +97,8 @@ FuPluginData *fu_plugin_alloc_data (FuPlugin *self,
gboolean fu_plugin_get_enabled (FuPlugin *self);
void fu_plugin_set_enabled (FuPlugin *self,
gboolean enabled);
void fu_plugin_set_build_hash (FuPlugin *self,
const gchar *build_hash);
GUsbContext *fu_plugin_get_usb_context (FuPlugin *self);
void fu_plugin_device_add (FuPlugin *self,
FuDevice *device);

31
src/fu-self-test.c
View File

@ -31,6 +31,7 @@
#include "fu-plugin-private.h"
#include "fu-plugin-list.h"
#include "fu-progressbar.h"
#include "fu-hash.h"
#include "fu-hwids.h"
#include "fu-smbios.h"
#include "fu-test.h"
@ -455,6 +456,7 @@ fu_engine_partial_hash_func (void)
/* set up dummy plugin */
fu_plugin_set_name (plugin, "test");
fu_plugin_set_build_hash (plugin, FU_BUILD_HASH);
fu_engine_add_plugin (engine, plugin);
/* add two dummy devices */
@ -1800,6 +1802,34 @@ fu_plugin_quirks_device_func (void)
g_assert (fu_device_has_flag (device_tmp, FWUPD_DEVICE_FLAG_UPDATABLE));
}
static void
fu_plugin_hash_func (void)
{
GError *error = NULL;
g_autoptr(FuEngine) engine = fu_engine_new (FU_APP_FLAGS_NONE);
g_autoptr(FuPlugin) plugin = fu_plugin_new ();
gboolean ret = FALSE;
ret = fu_engine_load (engine, &error);
g_assert_no_error (error);
g_assert (ret);
/* make sure not tainted */
ret = fu_engine_get_tainted (engine);
g_assert_false (ret);
/* create a tainted plugin */
g_setenv ("FWUPD_PLUGIN_TEST", "build-hash", TRUE);
ret = fu_plugin_open (plugin, PLUGINBUILDDIR "/libfu_plugin_test.so", &error);
g_assert_no_error (error);
/* make sure it tainted now */
g_test_expect_message ("FuEngine", G_LOG_LEVEL_WARNING, "* has incorrect built version*");
fu_engine_add_plugin (engine, plugin);
ret = fu_engine_get_tainted (engine);
g_assert_true (ret);
}
static void
fu_plugin_module_func (void)
{
@ -3301,6 +3331,7 @@ main (int argc, char **argv)
g_test_add_func ("/fwupd/plugin{composite}", fu_plugin_composite_func);
g_test_add_func ("/fwupd/keyring{gpg}", fu_keyring_gpg_func);
g_test_add_func ("/fwupd/keyring{pkcs7}", fu_keyring_pkcs7_func);
g_test_add_func ("/fwupd/plugin{build-hash}", fu_plugin_hash_func);
g_test_add_func ("/fwupd/chunk", fu_chunk_func);
g_test_add_func ("/fwupd/common{version-guess-format}", fu_common_version_guess_format_func);
g_test_add_func ("/fwupd/common{guid}", fu_common_guid_func);

8
src/fu-tool.c
View File

@ -120,7 +120,13 @@ fu_util_start_engine (FuUtilPrivate *priv, GError **error)
}
}
return fu_engine_load (priv->engine, error);
if (!fu_engine_load (priv->engine, error))
return FALSE;
if (fu_engine_get_tainted (priv->engine)) {
g_printerr ("WARNING: This tool has loaded 3rd party code and "
"is no longer supported by the upstream developers!\n");
}
return TRUE;
}
static gint

11
src/fu-util.c
View File

@ -2609,6 +2609,17 @@ main (int argc, char *argv[])
return EXIT_SUCCESS;
}
/* show a warning if the daemon is tainted */
if (!fwupd_client_connect (priv->client, priv->cancellable, &error)) {
g_printerr ("Failed to connect to daemon: %s\n",
error->message);
return EXIT_FAILURE;
}
if (fwupd_client_get_tainted (priv->client)) {
g_printerr ("WARNING: The daemon has loaded 3rd party code and "
"is no longer supported by the upstream developers!\n");
}
/* run the specified command */
ret = fu_util_run (priv, argv[1], (gchar**) &argv[2], &error);
if (!ret) {

12
src/meson.build
View File

@ -107,9 +107,19 @@ resources_src = gnome.compile_resources(
c_name : 'fu'
)
fu_hash = custom_target(
'fu-hash.h',
input : libfwupdprivate,
output : 'fu-hash.h',
command : [python3.path(),
join_paths(meson.current_source_dir(), 'fu-hash.py'),
'@INPUT@', '@OUTPUT@']
)
fwupdtool = executable(
'fwupdtool',
resources_src,
fu_hash,
sources : [
'fu-tool.c',
keyring_src,
@ -251,6 +261,7 @@ executable(
install : true,
install_dir : join_paths(libexecdir, 'fwupd')
)
endif
if get_option('tests')
@ -265,6 +276,7 @@ if get_option('tests')
hwid_test_firmware,
noreqs_test_firmware,
test_deps,
fu_hash,
sources : [
keyring_src,
'fu-self-test.c',

11
src/org.freedesktop.fwupd.xml
View File

@ -22,6 +22,17 @@
</doc:doc>
</property>
<!--***********************************************************-->
<property name='Tainted' type='b' access='read'>
<doc:doc>
<doc:description>
<doc:para>
If the daemon has been tainted with a 3rd party plugin.
</doc:para>
</doc:description>
</doc:doc>
</property>
<!--***********************************************************-->
<property name='Status' type='u' access='read'>
<doc:doc>