sources: update tough to 0.12

Author: cbgbt

sources/Cargo.lock

@@ -20,7 +20,7 @@ regex = "1.1"
 semver = "1.0"
 simplelog = "0.10"
 snafu = "0.6"
-tough = "0.11"
+tough = "0.12"
 update_metadata = { path = "../../../updater/update_metadata", version = "0.1.0" }
 url = "2.1.1"
 

sources/api/migration/migrator/Cargo.toml

@@ -70,6 +70,12 @@ pub(crate) enum Error {
     #[snafu(display("Failed listing migration directory '{}': {}", dir.display(), source))]
     ListMigrations { dir: PathBuf, source: io::Error },
 
+    #[snafu(display("Invalid target name '{}': {}", target, source))]
+    TargetName {
+        target: String,
+        source: tough::error::Error,
+    },
+
     #[snafu(display("Error loading migration '{}': {}", migration, source))]
     LoadMigration {
         migration: String,

sources/api/migration/migrator/src/error.rs

@@ -32,6 +32,7 @@ use semver::Version;
 use simplelog::{Config as LogConfig, SimpleLogger};
 use snafu::{ensure, OptionExt, ResultExt};
 use std::collections::HashSet;
+use std::convert::TryInto;
 use std::env;
 use std::fs::{self, File};
 use std::os::unix::fs::symlink;
@@ -243,14 +244,24 @@ where
 
     for migration in migrations {
         let migration = migration.as_ref();
+        let migration = migration
+            .try_into()
+            .context(error::TargetName { target: migration })?;
+
         // get the migration from the repo
         let lz4_bytes = repository
-            .read_target(migration)
-            .context(error::LoadMigration { migration })?
-            .context(error::MigrationNotFound { migration })?;
+            .read_target(&migration)
+            .context(error::LoadMigration {
+                migration: migration.raw(),
+            })?
+            .context(error::MigrationNotFound {
+                migration: migration.raw(),
+            })?;
 
         // Add an LZ4 decoder so the bytes will be deflated on read
-        let mut reader = lz4::Decoder::new(lz4_bytes).context(error::Lz4Decode { migration })?;
+        let mut reader = lz4::Decoder::new(lz4_bytes).context(error::Lz4Decode {
+            migration: migration.raw(),
+        })?;
 
         // Create a sealed command with pentacle, so we can run the verified bytes from memory
         let mut command =
@@ -480,9 +491,10 @@ where
 
 fn load_manifest(repository: &tough::Repository) -> Result<Manifest> {
     let target = "manifest.json";
+    let target = target.try_into().context(error::TargetName { target })?;
     Manifest::from_json(
         repository
-            .read_target(target)
+            .read_target(&target)
             .context(error::ManifestLoad)?
             .context(error::ManifestNotFound)?,
     )

sources/api/migration/migrator/src/main.rs

@@ -158,7 +158,7 @@ fn create_test_repo() -> TestRepo {
             let dir_entry = dir_entry_result.unwrap();
             editor
                 .add_target(
-                    dir_entry.file_name().to_str().unwrap().into(),
+                    dir_entry.file_name().to_str().unwrap(),
                     tough::schema::Target::from_path(dir_entry.path()).unwrap(),
                 )
                 .unwrap();

sources/api/migration/migrator/src/test.rs

@@ -52,8 +52,8 @@ skip = [
     # older version used by hyper 0.14.2
     { name = "socket2", version = "0.3.19" },
 
-    # older version used by tough 0.11.2
-    { name = "serde_plain", version = "0.3.0" },
+    # older version used by webpki-roots 0.21.1
+    { name = "pem", version = "0.8.3" },
 ]
 
 skip-tree = [

sources/deny.toml

@@ -23,7 +23,7 @@ signpost = { path = "../signpost", version = "0.1.0" }
 simplelog = "0.10"
 snafu = "0.6.0"
 toml = "0.5.1"
-tough = { version = "0.11", features = ["http"] }
+tough = { version = "0.12", features = ["http"] }
 update_metadata = { path = "../update_metadata", version = "0.1.0" }
 structopt = "0.3"
 url = "2.1.0"

sources/updater/updog/Cargo.toml

@@ -66,6 +66,12 @@ pub(crate) enum Error {
         backtrace: Backtrace,
     },
 
+    #[snafu(display("Invalid target name '{}': {}", target, source))]
+    TargetName {
+        target: String,
+        source: tough::error::Error,
+    },
+
     #[snafu(display("Manifest load error: {}", source))]
     ManifestLoad {
         source: tough::error::Error,

sources/updater/updog/src/error.rs

@@ -215,13 +215,18 @@ fn write_target_to_disk<P: AsRef<Path>>(
     target: &str,
     disk_path: P,
 ) -> Result<()> {
+    let target = target.try_into().context(error::TargetName { target })?;
     let reader = repository
-        .read_target(target)
+        .read_target(&target)
         .context(error::Metadata)?
-        .context(error::TargetNotFound { target })?;
+        .context(error::TargetNotFound {
+            target: target.raw(),
+        })?;
     // Note: the file extension for the compression type we're using should be removed in
     // retrieve_migrations below.
-    let mut reader = lz4::Decoder::new(reader).context(error::Lz4Decode { target })?;
+    let mut reader = lz4::Decoder::new(reader).context(error::Lz4Decode {
+        target: target.raw(),
+    })?;
     let mut f = OpenOptions::new()
         .write(true)
         .create(true)
@@ -584,9 +589,10 @@ fn main_inner() -> Result<()> {
 
 fn load_manifest(repository: &tough::Repository) -> Result<Manifest> {
     let target = "manifest.json";
+    let target = target.try_into().context(error::TargetName { target })?;
     Manifest::from_json(
         repository
-            .read_target(target)
+            .read_target(&target)
             .context(error::ManifestLoad)?
             .context(error::ManifestNotFound)?,
     )