[image] Omit URI query string and fragment from download progress messages

The URIs printed as part of download progress messages are intended to
provide a quick visual progress indication to the user.  Very long
query strings can render this visual indication useless in practice,
since the most important information (generally the URI host and path)
is drowned out by multiple lines of human-illegible URI-encoded data.

Omit the query string entirely from the download progress message.
For consistency and brevity, also omit the URI fragment along with the
username and password (which was previously redacted anyway).

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/usr/imgmgmt.c b/src/usr/imgmgmt.c
index 352dd024265bf84893bb14adfd4cd0021c86b39d..a01d6e291d00dd253e0e5a64fd1d6b588373719d 100644 (file)
--- a/src/usr/imgmgmt.c
+++ b/src/usr/imgmgmt.c
@@ -50,16 +50,17 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  */
 int imgdownload ( struct uri *uri, unsigned long timeout,
                  struct image **image ) {
-       const char *password;
+       struct uri uri_redacted;
        char *uri_string_redacted;
        int rc;
 
        /* Construct redacted URI */
-       password = uri->password;
-       if ( password )
-               uri->password = "***";
-       uri_string_redacted = format_uri_alloc ( uri );
-       uri->password = password;
+       memcpy ( &uri_redacted, uri, sizeof ( uri_redacted ) );
+       uri_redacted.user = NULL;
+       uri_redacted.password = NULL;
+       uri_redacted.query = NULL;
+       uri_redacted.fragment = NULL;
+       uri_string_redacted = format_uri_alloc ( &uri_redacted );
        if ( ! uri_string_redacted ) {
                rc = -ENOMEM;
                goto err_uri_string;