proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-16 15:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Save the metadata signature in the local cache

Browse Source 
This is useful if the admin wants to re-verify the metadata, or if a public
key is removed or expires.
This commit is contained in:
Richard Hughes 2017-08-16 12:24:18 +01:00
parent 18c2a689d2
commit 99e621d388
5 changed files with 76 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
libfwupd/fwupd-remote.c
View File

@ -38,6 +38,7 @@ struct _FwupdRemote
gchar *filename;
gchar *filename_asc;
gchar *filename_cache;
gchar *filename_cache_sig;
gboolean enabled;
SoupURI *uri;
SoupURI *uri_asc;
@ -101,11 +102,21 @@ fwupd_remote_set_id (FwupdRemote *self, const gchar *id)
g_strdelimit (self->id, ".", '\0');
}
static const gchar *
fwupd_remote_get_suffix_for_keyring_kind (FwupdKeyringKind keyring_kind)
{
if (keyring_kind == FWUPD_KEYRING_KIND_GPG)
return ".asc";
if (keyring_kind == FWUPD_KEYRING_KIND_PKCS7)
return ".p7b";
return NULL;
}
/* note, this has to be set before username and password */
static void
fwupd_remote_set_url (FwupdRemote *self, const gchar *url)
{
g_autofree gchar *url_asc = NULL;
const gchar *suffix;
g_autofree gchar *basename = NULL;
g_autofree gchar *basename_asc = NULL;
@ -122,17 +133,9 @@ fwupd_remote_set_url (FwupdRemote *self, const gchar *url)
self->filename = g_strdup_printf ("%s-%s", self->id, basename);
/* generate the signature URI too */
switch (self->keyring_kind) {
case FWUPD_KEYRING_KIND_GPG:
url_asc = g_strdup_printf ("%s.asc", url);
break;
case FWUPD_KEYRING_KIND_PKCS7:
url_asc = g_strdup_printf ("%s.p7b", url);
break;
default:
break;
}
if (url_asc != NULL) {
suffix = fwupd_remote_get_suffix_for_keyring_kind (self->keyring_kind);
if (suffix != NULL) {
g_autofree gchar *url_asc = g_strconcat (url, suffix, NULL);
self->uri_asc = fwupd_remote_build_uri (self, url_asc, NULL);
basename_asc = g_path_get_basename (soup_uri_get_path (self->uri_asc));
self->filename_asc = g_strdup_printf ("%s-%s", self->id, basename_asc);
@ -179,6 +182,24 @@ fwupd_remote_kind_to_string (FwupdRemoteKind kind)
return NULL;
}
static void
fwupd_remote_set_filename_cache (FwupdRemote *self, const gchar *filename)
{
const gchar *suffix;
g_return_if_fail (FWUPD_IS_REMOTE (self));
g_free (self->filename_cache);
self->filename_cache = g_strdup (filename);
/* create for all remote types */
suffix = fwupd_remote_get_suffix_for_keyring_kind (self->keyring_kind);
if (suffix != NULL) {
g_free (self->filename_cache_sig);
self->filename_cache_sig = g_strconcat (filename, suffix, NULL);
}
}
/**
* fwupd_remote_load_from_filename:
* @self: A #FwupdRemote
@ -259,6 +280,7 @@ fwupd_remote_load_from_filename (FwupdRemote *self,
/* DOWNLOAD-type remotes */
if (self->kind == FWUPD_REMOTE_KIND_DOWNLOAD) {
g_autofree gchar *filename_cache = NULL;
g_autofree gchar *url = NULL;
g_autofree gchar *username = NULL;
g_autofree gchar *password = NULL;
@ -288,20 +310,23 @@ fwupd_remote_load_from_filename (FwupdRemote *self,
fwupd_remote_set_password (self, password);
/* set cache to /var/lib... */
self->filename_cache = g_build_filename (LOCALSTATEDIR,
"lib",
"fwupd",
"remotes.d",
self->id,
"metadata.xml.gz",
NULL);
filename_cache = g_build_filename (LOCALSTATEDIR,
"lib",
"fwupd",
"remotes.d",
self->id,
"metadata.xml.gz",
NULL);
fwupd_remote_set_filename_cache (self, filename_cache);
}
/* all LOCAL remotes have to include a valid File */
if (self->kind == FWUPD_REMOTE_KIND_LOCAL) {
self->filename_cache = g_key_file_get_string (kf, group, "File", error);
if (self->filename_cache == NULL)
g_autofree gchar *filename_cache = NULL;
filename_cache = g_key_file_get_string (kf, group, "File", error);
if (filename_cache == NULL)
return FALSE;
fwupd_remote_set_filename_cache (self, filename_cache);
}
/* dep logic */
@ -349,12 +374,21 @@ fwupd_remote_get_filename_cache (FwupdRemote *self)
return self->filename_cache;
}
static void
fwupd_remote_set_filename_cache (FwupdRemote *self, const gchar *filename)
/**
* fwupd_remote_get_filename_cache_sig:
* @self: A #FwupdRemote
*
* Gets the path and filename that the remote is using for a signature cache.
*
* Returns: a string, or %NULL for unset
*
* Since: 0.9.7
**/
const gchar *
fwupd_remote_get_filename_cache_sig (FwupdRemote *self)
{
g_return_if_fail (FWUPD_IS_REMOTE (self));
g_free (self->filename_cache);
self->filename_cache = g_strdup (filename);
g_return_val_if_fail (FWUPD_IS_REMOTE (self), NULL);
return self->filename_cache_sig;
}
/**
@ -779,6 +813,7 @@ fwupd_remote_finalize (GObject *obj)
g_free (self->filename);
g_free (self->filename_asc);
g_free (self->filename_cache);
g_free (self->filename_cache_sig);
g_strfreev (self->order_after);
g_strfreev (self->order_before);
if (self->uri != NULL)

1
libfwupd/fwupd-remote.h
View File

@ -49,6 +49,7 @@ const gchar *fwupd_remote_get_filename_asc (FwupdRemote *self);
const gchar *fwupd_remote_get_username (FwupdRemote *self);
const gchar *fwupd_remote_get_password (FwupdRemote *self);
const gchar *fwupd_remote_get_filename_cache (FwupdRemote *self);
const gchar *fwupd_remote_get_filename_cache_sig (FwupdRemote *self);
gboolean fwupd_remote_get_enabled (FwupdRemote *self);
gint fwupd_remote_get_priority (FwupdRemote *self);
guint64 fwupd_remote_get_age (FwupdRemote *self);

3
libfwupd/fwupd-self-test.c
View File

@ -117,6 +117,8 @@ fwupd_remote_download_func (void)
g_assert_cmpstr (fwupd_remote_get_filename_asc (remote), ==, "lvfs-firmware.xml.gz.asc");
g_assert_cmpstr (fwupd_remote_get_filename_cache (remote), ==,
LOCALSTATEDIR "/lib/fwupd/remotes.d/lvfs/metadata.xml.gz");
g_assert_cmpstr (fwupd_remote_get_filename_cache_sig (remote), ==,
LOCALSTATEDIR "/lib/fwupd/remotes.d/lvfs/metadata.xml.gz.asc");
}
static void
@ -140,6 +142,7 @@ fwupd_remote_local_func (void)
g_assert_cmpstr (fwupd_remote_get_filename (remote), ==, NULL);
g_assert_cmpstr (fwupd_remote_get_filename_asc (remote), ==, NULL);
g_assert_cmpstr (fwupd_remote_get_filename_cache (remote), ==, "@datadir@/fwupd/remotes.d/fwupd/metadata.xml");
g_assert_cmpstr (fwupd_remote_get_filename_cache_sig (remote), ==, NULL);
}
static void

7
src/fu-engine.c
View File

@ -1508,10 +1508,15 @@ fu_engine_update_metadata (FuEngine *self, const gchar *remote_id,
return FALSE;
}
/* save XML to remotes.d */
/* save XML and signature to remotes.d */
if (!fu_common_set_contents_bytes (fwupd_remote_get_filename_cache (remote),
bytes_raw, error))
return FALSE;
if (keyring_kind != FWUPD_KEYRING_KIND_NONE) {
if (!fu_common_set_contents_bytes (fwupd_remote_get_filename_cache_sig (remote),
bytes_sig, error))
return FALSE;
}
return fu_engine_load_metadata_store (self, error);
}

5
src/fu-util.c
View File

@ -1260,6 +1260,11 @@ fu_util_get_remotes (FuUtilPrivate *priv, gchar **values, GError **error)
/* TRANSLATORS: locatation of the local file */
fu_util_print_data (_("Location"), tmp);
}
tmp = fwupd_remote_get_filename_cache_sig (remote);
if (tmp != NULL) {
/* TRANSLATORS: locatation of the local file */
fu_util_print_data (_("Location Signature"), tmp);
}
uri = fwupd_remote_get_uri (remote);
if (uri != NULL) {
g_autofree gchar *uri_str = soup_uri_to_string (uri, FALSE);