Merge pull request #90 from flatcar/dongsu/fix-pkg-verified-extension

download: Fix bug of pkg_verified path extension

Author: dongsupark

src/bin/download_sysext.rs

@@ -10,7 +10,7 @@ use anyhow::Result;
 use argh::FromArgs;
 use globset::{Glob, GlobSet, GlobSetBuilder};
 
-use ue_rs::{TARGET_FILENAME_DEFAULT, DownloadVerify};
+use ue_rs::DownloadVerify;
 
 #[derive(FromArgs, Debug)]
 /// Parse an update-engine Omaha XML response to extract sysext images, then download and verify
@@ -102,9 +102,9 @@ fn main() -> Result<(), Box<dyn Error>> {
     let glob_set = args.image_match_glob_set()?;
 
     DownloadVerify::new(args.output_dir, args.pubkey_file, args.take_first_match, glob_set)
-        .target_filename(args.target_filename.unwrap_or(TARGET_FILENAME_DEFAULT.into()))
+        .target_filename(args.target_filename)
         .input_xml(input_xml.unwrap_or_default())
-        .payload_url(payload_url.clone())
+        .payload_url(Some(payload_url.clone()))
         .run()?;
 
     Ok(())

src/download/mod.rs

@@ -24,9 +24,6 @@ const DOWNLOAD_TIMEOUT: u64 = 3600;
 const HTTP_CONN_TIMEOUT: u64 = 20;
 const MAX_DOWNLOAD_RETRY: u32 = 20;
 
-pub const TARGET_FILENAME_DEFAULT: &str = "oem-azure.gz";
-pub const PAYLOAD_URL_DEFAULT: &str = "https://update.release.flatcar-linux.net/amd64-usr/current/oem-azure.gz";
-
 const UNVERFIED_SUFFIX: &str = ".unverified";
 const TMP_SUFFIX: &str = ".tmp";
 
@@ -212,7 +209,8 @@ fn do_download_verify(pkg: &mut Package<'_>, output_filename: Option<String>, ou
     // Unverified payload is stored in e.g. "output_dir/.unverified/oem.gz".
     // Verified payload is stored in e.g. "output_dir/oem.raw".
     let pkg_unverified = unverified_dir.join(&*pkg.name);
-    let pkg_verified = output_dir.join(output_filename.as_ref().map(OsStr::new).unwrap_or(pkg_unverified.with_extension("raw").file_name().unwrap_or_default()));
+    let mut pkg_verified = output_dir.join(output_filename.as_ref().map(OsStr::new).unwrap_or(pkg_unverified.with_extension("raw").file_name().unwrap_or_default()));
+    pkg_verified.set_extension("raw");
 
     let datablobspath = pkg.verify_signature_on_disk(&pkg_unverified, pubkey_file).context(format!("unable to verify signature \"{}\"", pkg.name))?;
 
@@ -246,8 +244,8 @@ impl DownloadVerify {
         }
     }
 
-    pub fn target_filename(mut self, param_target_filename: String) -> Self {
-        self.target_filename = Some(param_target_filename);
+    pub fn target_filename(mut self, param_target_filename: Option<String>) -> Self {
+        self.target_filename = param_target_filename;
         self
     }
 
@@ -256,8 +254,8 @@ impl DownloadVerify {
         self
     }
 
-    pub fn payload_url(mut self, param_payload_url: String) -> Self {
-        self.payload_url = Some(param_payload_url);
+    pub fn payload_url(mut self, param_payload_url: Option<String>) -> Self {
+        self.payload_url = param_payload_url;
         self
     }
 

src/lib.rs

@@ -1,6 +1,4 @@
 mod download;
-pub use download::TARGET_FILENAME_DEFAULT;
-pub use download::PAYLOAD_URL_DEFAULT;
 pub use download::{DownloadResult, DownloadVerify};
 pub use download::download_and_hash;
 pub use download::hash_on_disk;