Upgrade HTTP URLs to HTTPS

Resolves #356

src/commands/new_version.rs

@@ -45,7 +45,6 @@ use crate::types::urls::license_url::LicenseUrl;
 use crate::types::urls::package_url::PackageUrl;
 use crate::types::urls::publisher_url::PublisherUrl;
 use crate::types::urls::release_notes_url::ReleaseNotesUrl;
-use crate::types::urls::url::Url;
 use crate::update_state::UpdateState;
 use base64ct::Encoding;
 use camino::Utf8PathBuf;
@@ -63,6 +62,7 @@ use std::num::{NonZeroU32, NonZeroU8};
 use std::ops::Not;
 use std::time::Duration;
 use strum::IntoEnumIterator;
+use url::Url;
 
 #[derive(Parser)]
 pub struct NewVersion {
@@ -250,7 +250,7 @@ impl NewVersion {
                     .as_mut()
                     .and_then(|zip| mem::take(&mut zip.nested_installer_files)),
                 scope: Scope::find_from_url(url.as_str()),
-                installer_url: url.clone(),
+                installer_url: url.clone().into(),
                 installer_sha_256: mem::take(&mut analyser.installer_sha_256),
                 signature_sha_256: mem::take(&mut analyser.signature_sha_256),
                 installer_switches: installer_switches

src/commands/update_version.rs

@@ -18,7 +18,6 @@ use crate::types::installer_type::InstallerType;
 use crate::types::manifest_version::ManifestVersion;
 use crate::types::package_identifier::PackageIdentifier;
 use crate::types::package_version::PackageVersion;
-use crate::types::urls::url::Url;
 use crate::update_state::UpdateState;
 use base64ct::Encoding;
 use camino::Utf8PathBuf;
@@ -35,6 +34,7 @@ use std::mem;
 use std::num::{NonZeroU32, NonZeroU8};
 use std::ops::Not;
 use std::time::Duration;
+use url::Url;
 
 #[derive(Parser)]
 pub struct UpdateVersion {
@@ -138,7 +138,7 @@ impl UpdateVersion {
                 architecture: download.architecture.unwrap(),
                 installer_type: Some(download.installer_type),
                 scope: Scope::find_from_url(url.as_str()),
-                installer_url: url.clone(),
+                installer_url: url.clone().into(),
                 ..Installer::default()
             })
             .collect::<Vec<_>>();

src/download_file.rs

@@ -1,5 +1,4 @@
 use crate::file_analyser::FileAnalyser;
-use crate::types::urls::url::Url;
 use crate::url_utils::find_architecture;
 use camino::Utf8Path;
 use chrono::{DateTime, NaiveDate};
@@ -9,7 +8,7 @@ use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use itertools::Itertools;
 use memmap2::Mmap;
 use reqwest::header::{HeaderValue, CONTENT_DISPOSITION, LAST_MODIFIED};
-use reqwest::Client;
+use reqwest::{Client, Response};
 use sha2::{Digest, Sha256};
 use std::borrow::Cow;
 use std::cmp::min;
@@ -18,13 +17,27 @@ use std::fs::File;
 use std::future::Future;
 use std::io::Cursor;
 use tokio::io::AsyncWriteExt;
+use url::Url;
 use uuid::Uuid;
 
 async fn download_file(
     client: &Client,
-    url: Url,
+    mut url: Url,
     multi_progress: &MultiProgress,
 ) -> Result<DownloadedFile> {
+    if url.scheme() == "http" {
+        url.set_scheme("https").unwrap();
+        if client
+            .head(url.as_str())
+            .send()
+            .await
+            .and_then(Response::error_for_status)
+            .is_err()
+        {
+            url.set_scheme("http").unwrap();
+        }
+    }
+
     let res = client
         .get(url.as_str())
         .send()
@@ -79,11 +92,7 @@ async fn download_file(
     })
 }
 
-fn get_file_name(
-    url: &Url,
-    final_url: &url::Url,
-    content_disposition: Option<&HeaderValue>,
-) -> String {
+fn get_file_name(url: &Url, final_url: &Url, content_disposition: Option<&HeaderValue>) -> String {
     if let Some(content_disposition) = content_disposition.and_then(|value| value.to_str().ok()) {
         let mut sections = content_disposition.split(';');
         let _disposition = sections.next();

src/types/urls/url.rs

@@ -9,3 +9,9 @@ use percent_encoding::percent_decode_str;
     derive(Clone, Deref, FromStr, Display, Default, Deserialize, Serialize, Hash, Eq, PartialEq, Ord, PartialOrd, Debug)
 )]
 pub struct Url(url::Url);
+
+impl From<url::Url> for Url {
+    fn from(value: url::Url) -> Self {
+        Self::new(value)
+    }
+}