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

Download firmware if the user specifies a URI

Browse Source
This commit is contained in:
Richard Hughes 2018-08-30 11:14:24 +01:00
parent 798cb062bf
commit 3d178befb1
2 changed files with 80 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/fu-tool.c
View File

@ -12,6 +12,7 @@
#include <locale.h>
#include <stdlib.h>
#include <unistd.h>
#include <libsoup/soup.h>
#include "fu-engine.h"
#include "fu-plugin-private.h"
@ -548,10 +549,52 @@ fu_util_install_task_sort_cb (gconstpointer a, gconstpointer b)
return fu_install_task_compare (task1, task2);
}
static gboolean
fu_util_download_out_of_process (const gchar *uri, const gchar *fn, GError **error)
{
const gchar *argv[][5] = { { "wget", uri, "-o", fn, NULL },
{ "curl", uri, "--output", fn, NULL },
{ NULL } };
for (guint i = 0; argv[i][0] != NULL; i++) {
g_autoptr(GError) error_local = NULL;
if (!fu_common_find_program_in_path (argv[i][0], &error_local)) {
g_debug ("%s", error_local->message);
continue;
}
return fu_common_spawn_sync (argv[i], NULL, NULL, NULL, error);
}
g_set_error_literal (error,
FWUPD_ERROR,
FWUPD_ERROR_NOT_FOUND,
"no supported out-of-process downloaders found");
return FALSE;
}
static gchar *
fu_util_download_if_required (FuUtilPrivate *priv, const gchar *perhapsfn, GError **error)
{
g_autofree gchar *filename = NULL;
g_autoptr(SoupURI) uri = NULL;
/* a local file */
uri = soup_uri_new (perhapsfn);
if (uri == NULL)
return g_strdup (perhapsfn);
/* download the firmware to a cachedir */
filename = fu_util_get_user_cache_path (perhapsfn);
if (!fu_common_mkdir_parent (filename, error))
return NULL;
if (!fu_util_download_out_of_process (perhapsfn, filename, error))
return NULL;
return g_steal_pointer (&filename);
}
static gboolean
fu_util_install (FuUtilPrivate *priv, gchar **values, GError **error)
{
GPtrArray *apps;
g_autofree gchar *filename = NULL;
g_autoptr(AsStore) store = NULL;
g_autoptr(GBytes) blob_cab = NULL;
g_autoptr(GPtrArray) devices_possible = NULL;
@ -583,10 +626,15 @@ fu_util_install (FuUtilPrivate *priv, gchar **values, GError **error)
return FALSE;
}
/* download if required */
filename = fu_util_download_if_required (priv, values[0], error);
if (filename == NULL)
return FALSE;
/* parse store */
blob_cab = fu_common_get_contents_bytes (values[0], error);
blob_cab = fu_common_get_contents_bytes (filename, error);
if (blob_cab == NULL) {
fu_util_maybe_prefix_sandbox_error (values[0], error);
fu_util_maybe_prefix_sandbox_error (filename, error);
return FALSE;
}
store = fu_engine_get_store_from_blob (priv->engine, blob_cab, error);

31
src/fu-util.c
View File

@ -67,6 +67,11 @@ typedef gboolean (*FuUtilPrivateCb) (FuUtilPrivate *util,
GError **error);
static gboolean fu_util_report_history (FuUtilPrivate *priv, gchar **values, GError **error);
static gboolean fu_util_download_file (FuUtilPrivate *priv,
SoupURI *uri,
const gchar *fn,
const gchar *checksum_expected,
GError **error);
typedef struct {
gchar *name;
@ -565,10 +570,31 @@ fu_util_get_devices (FuUtilPrivate *priv, gchar **values, GError **error)
return TRUE;
}
static gchar *
fu_util_download_if_required (FuUtilPrivate *priv, const gchar *perhapsfn, GError **error)
{
g_autofree gchar *filename = NULL;
g_autoptr(SoupURI) uri = NULL;
/* a local file */
uri = soup_uri_new (perhapsfn);
if (uri == NULL)
return g_strdup (perhapsfn);
/* download the firmware to a cachedir */
filename = fu_util_get_user_cache_path (perhapsfn);
if (!fu_common_mkdir_parent (filename, error))
return NULL;
if (!fu_util_download_file (priv, uri, filename, NULL, error))
return NULL;
return g_steal_pointer (&filename);
}
static gboolean
fu_util_install (FuUtilPrivate *priv, gchar **values, GError **error)
{
const gchar *id;
g_autofree gchar *filename = NULL;
/* handle both forms */
if (g_strv_length (values) == 1) {
@ -588,7 +614,10 @@ fu_util_install (FuUtilPrivate *priv, gchar **values, GError **error)
G_CALLBACK (fu_util_update_device_changed_cb), priv);
/* install with flags chosen by the user */
return fwupd_client_install (priv->client, id, values[0], priv->flags, NULL, error);
filename = fu_util_download_if_required (priv, values[0], error);
if (filename == NULL)
return FALSE;
return fwupd_client_install (priv->client, id, filename, priv->flags, NULL, error);
}
static gboolean