From c5710d91bdcf593bdb5bff167bfee1d786744d06 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 26 Jun 2020 11:08:25 +0100
Subject: [PATCH] Be more defensive when remotes are missing required keys

Fixes half of https://github.com/fwupd/fwupd/issues/2223
---
 src/fu-tool.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/fu-tool.c b/src/fu-tool.c
index 09455daa6..971b4fbf1 100644
--- a/src/fu-tool.c
+++ b/src/fu-tool.c
@@ -1846,26 +1846,41 @@ fu_util_get_history (FuUtilPrivate *priv, gchar **values, GError **error)
 static gboolean
 fu_util_refresh_remote (FuUtilPrivate *priv, FwupdRemote *remote, GError **error)
 {
+	const gchar *metadata_uri = NULL;
 	g_autofree gchar *fn_raw = NULL;
 	g_autofree gchar *fn_sig = NULL;
 	g_autoptr(GBytes) bytes_raw = NULL;
 	g_autoptr(GBytes) bytes_sig = NULL;
 
 	/* payload */
-	fn_raw = fu_util_get_user_cache_path (fwupd_remote_get_metadata_uri (remote));
+	metadata_uri = fwupd_remote_get_metadata_uri (remote);
+	if (metadata_uri == NULL) {
+		g_set_error_literal (error,
+				     FWUPD_ERROR,
+				     FWUPD_ERROR_NOTHING_TO_DO,
+				     "no metadata URI available");
+		return FALSE;
+	}
+	fn_raw = fu_util_get_user_cache_path (metadata_uri);
 	if (!fu_common_mkdir_parent (fn_raw, error))
 		return FALSE;
-	if (!fu_util_download_out_of_process (fwupd_remote_get_metadata_uri (remote),
-					      fn_raw, error))
+	if (!fu_util_download_out_of_process (metadata_uri, fn_raw, error))
 		return FALSE;
 	bytes_raw = fu_common_get_contents_bytes (fn_raw, error);
 	if (bytes_raw == NULL)
 		return FALSE;
 
 	/* signature */
-	fn_sig = fu_util_get_user_cache_path (fwupd_remote_get_metadata_uri_sig (remote));
-	if (!fu_util_download_out_of_process (fwupd_remote_get_metadata_uri_sig (remote),
-					      fn_sig, error))
+	metadata_uri = fwupd_remote_get_metadata_uri_sig (remote);
+	if (metadata_uri == NULL) {
+		g_set_error_literal (error,
+				     FWUPD_ERROR,
+				     FWUPD_ERROR_NOTHING_TO_DO,
+				     "no metadata signature URI available");
+		return FALSE;
+	}
+	fn_sig = fu_util_get_user_cache_path (metadata_uri);
+	if (!fu_util_download_out_of_process (metadata_uri, fn_sig, error))
 		return FALSE;
 	bytes_sig = fu_common_get_contents_bytes (fn_sig, error);
 	if (bytes_sig == NULL)