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

trivial: Split up fu_engine_update_metadata() for future use

Browse Source
This commit is contained in:
Richard Hughes 2020-01-17 14:32:23 +00:00
parent fd7e994971
commit be5b019ae5
2 changed files with 61 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/fu-engine.c
View File

@ -2885,7 +2885,6 @@ fu_engine_remote_list_changed_cb (FuRemoteList *remote_list, FuEngine *self)
fu_engine_emit_changed (self); fu_engine_emit_changed (self);
} }
#ifdef HAVE_GIO_UNIX
static FuKeyringResult * static FuKeyringResult *
fu_engine_get_existing_keyring_result (FuEngine *self, fu_engine_get_existing_keyring_result (FuEngine *self,
FuKeyring *kr, FuKeyring *kr,
@ -2903,46 +2902,34 @@ fu_engine_get_existing_keyring_result (FuEngine *self,
return fu_keyring_verify_data (kr, blob, blob_sig, return fu_keyring_verify_data (kr, blob, blob_sig,
FU_KEYRING_VERIFY_FLAG_NONE, error); FU_KEYRING_VERIFY_FLAG_NONE, error);
} }
#endif
/** /**
* fu_engine_update_metadata: * fu_engine_update_metadata_bytes:
* @self: A #FuEngine * @self: A #FuEngine
* @remote_id: A remote ID, e.g. `lvfs` * @remote_id: A remote ID, e.g. `lvfs`
* @fd: file descriptor of the metadata * @bytes_raw: Blob of metadata
* @fd_sig: file descriptor of the metadata signature * @bytes_sig: Blob of metadata signature
* @error: A #GError, or %NULL * @error: A #GError, or %NULL
* *
* Updates the metadata for a specific remote. * Updates the metadata for a specific remote.
* *
* Note: this will close the fds when done
*
* Returns: %TRUE for success * Returns: %TRUE for success
**/ **/
gboolean gboolean
fu_engine_update_metadata (FuEngine *self, const gchar *remote_id, fu_engine_update_metadata_bytes (FuEngine *self, const gchar *remote_id,
gint fd, gint fd_sig, GError **error) GBytes *bytes_raw, GBytes *bytes_sig, GError **error)
{ {
#ifdef HAVE_GIO_UNIX
FwupdKeyringKind keyring_kind; FwupdKeyringKind keyring_kind;
FwupdRemote *remote; FwupdRemote *remote;
g_autoptr(GBytes) bytes_raw = NULL;
g_autoptr(GBytes) bytes_sig = NULL;
g_autoptr(GInputStream) stream_fd = NULL;
g_autoptr(GInputStream) stream_sig = NULL;
g_autofree gchar *pki_dir = NULL; g_autofree gchar *pki_dir = NULL;
g_autofree gchar *sysconfdir = NULL; g_autofree gchar *sysconfdir = NULL;
g_return_val_if_fail (FU_IS_ENGINE (self), FALSE); g_return_val_if_fail (FU_IS_ENGINE (self), FALSE);
g_return_val_if_fail (remote_id != NULL, FALSE); g_return_val_if_fail (remote_id != NULL, FALSE);
g_return_val_if_fail (fd > 0, FALSE); g_return_val_if_fail (bytes_raw != NULL, FALSE);
g_return_val_if_fail (fd_sig > 0, FALSE); g_return_val_if_fail (bytes_sig != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
/* ensures the fd's are closed on error */
stream_fd = g_unix_input_stream_new (fd, TRUE);
stream_sig = g_unix_input_stream_new (fd_sig, TRUE);
/* check remote is valid */ /* check remote is valid */
remote = fu_remote_list_get_by_id (self->remote_list, remote_id); remote = fu_remote_list_get_by_id (self->remote_list, remote_id);
if (remote == NULL) { if (remote == NULL) {
@ -2960,16 +2947,6 @@ fu_engine_update_metadata (FuEngine *self, const gchar *remote_id,
return FALSE; return FALSE;
} }
/* read the entire file into memory */
bytes_raw = g_input_stream_read_bytes (stream_fd, 0x100000, NULL, error);
if (bytes_raw == NULL)
return FALSE;
/* read signature */
bytes_sig = g_input_stream_read_bytes (stream_sig, 0x800, NULL, error);
if (bytes_sig == NULL)
return FALSE;
/* verify file */ /* verify file */
keyring_kind = fwupd_remote_get_keyring_kind (remote); keyring_kind = fwupd_remote_get_keyring_kind (remote);
if (keyring_kind != FWUPD_KEYRING_KIND_NONE) { if (keyring_kind != FWUPD_KEYRING_KIND_NONE) {
@ -3041,7 +3018,56 @@ fu_engine_update_metadata (FuEngine *self, const gchar *remote_id,
return FALSE; return FALSE;
fu_engine_emit_changed (self); fu_engine_emit_changed (self);
return TRUE; return TRUE;
}
/**
* fu_engine_update_metadata:
* @self: A #FuEngine
* @remote_id: A remote ID, e.g. `lvfs`
* @fd: file descriptor of the metadata
* @fd_sig: file descriptor of the metadata signature
* @error: A #GError, or %NULL
*
* Updates the metadata for a specific remote.
*
* Note: this will close the fds when done
*
* Returns: %TRUE for success
**/
gboolean
fu_engine_update_metadata (FuEngine *self, const gchar *remote_id,
gint fd, gint fd_sig, GError **error)
{
#ifdef HAVE_GIO_UNIX
g_autoptr(GBytes) bytes_raw = NULL;
g_autoptr(GBytes) bytes_sig = NULL;
g_autoptr(GInputStream) stream_fd = NULL;
g_autoptr(GInputStream) stream_sig = NULL;
g_return_val_if_fail (FU_IS_ENGINE (self), FALSE);
g_return_val_if_fail (remote_id != NULL, FALSE);
g_return_val_if_fail (fd > 0, FALSE);
g_return_val_if_fail (fd_sig > 0, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
/* ensures the fd's are closed on error */
stream_fd = g_unix_input_stream_new (fd, TRUE);
stream_sig = g_unix_input_stream_new (fd_sig, TRUE);
/* read the entire file into memory */
bytes_raw = g_input_stream_read_bytes (stream_fd, 0x100000, NULL, error);
if (bytes_raw == NULL)
return FALSE;
/* read signature */
bytes_sig = g_input_stream_read_bytes (stream_sig, 0x800, NULL, error);
if (bytes_sig == NULL)
return FALSE;
/* update with blobs */
return fu_engine_update_metadata_bytes (self, remote_id,
bytes_raw, bytes_sig,
error);
#else #else
g_set_error (error, g_set_error (error,
FWUPD_ERROR, FWUPD_ERROR,

5
src/fu-engine.h
View File

@ -87,6 +87,11 @@ gboolean fu_engine_update_metadata (FuEngine *self,
gint fd, gint fd,
gint fd_sig, gint fd_sig,
GError **error); GError **error);
gboolean fu_engine_update_metadata_bytes (FuEngine *self,
const gchar *remote_id,
GBytes *bytes_raw,
GBytes *bytes_sig,
GError **error);
gboolean fu_engine_unlock (FuEngine *self, gboolean fu_engine_unlock (FuEngine *self,
const gchar *device_id, const gchar *device_id,
GError **error); GError **error);