bottlerocket-os · tjkirch · Jun 21, 2021 · Jun 17, 2021 · Jun 17, 2021 · Jun 17, 2021
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/api/apiserver/Cargo.toml b/sources/api/apiserver/Cargo.toml
@@ -19,10 +19,10 @@ http = "0.2.1"
 libc = "0.2"
 log = "0.4"
 models = { path = "../../models" }
-nix = "0.20.0"
+nix = "0.21"
 num = "0.4"
 percent-encoding = "2.1"
-semver = "0.11"
+semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 simplelog = "0.10"

diff --git a/sources/api/apiserver/src/server/error.rs b/sources/api/apiserver/src/server/error.rs
@@ -1,3 +1,4 @@
+use actix_web::{HttpResponseBuilder, ResponseError};
 use datastore::{self, deserialization, serialization};
 use nix::unistd::Gid;
 use snafu::Snafu;
@@ -175,3 +176,12 @@ pub enum Error {
 }
 
 pub type Result<T> = std::result::Result<T, Error>;
+
+impl From<Error> for actix_web::HttpResponse {
+    fn from(e: Error) -> Self {
+        // Include the error message in the response.  The Bottlerocket API is only
+        // exposed locally, and only on the host filesystem and to authorized containers,
+        // so we're not worried about exposing error details.
+        HttpResponseBuilder::new(e.status_code()).body(format!("{}", e))
+    }
+}
diff --git a/sources/api/apiserver/src/server/mod.rs b/sources/api/apiserver/src/server/mod.rs
@@ -6,7 +6,8 @@ mod error;
 pub use error::Error;
 
 use actix_web::{
-    error::ResponseError, web, App, FromRequest, HttpRequest, HttpResponse, HttpServer, Responder,
+    body::Body, error::ResponseError, web, App, BaseHttpResponse, FromRequest, HttpRequest,
+    HttpResponse, HttpServer, Responder,
 };
 use bottlerocket_release::BottlerocketRelease;
 use datastore::{Committed, FilesystemDataStore, Key, Value};
@@ -75,9 +76,7 @@ where
             // ResponseError implementation.  This configuration of the Json extractor allows us to
             // add the error message into the response.
             .app_data(web::Json::<Settings>::configure(|cfg| {
-                cfg.error_handler(|err, _req| {
-                    HttpResponse::BadRequest().body(err.to_string()).into()
-                })
+                cfg.error_handler(|err, _req| actix_web::Error::from(err))
             }))
             // This makes the data store available to API methods merely by having a Data
             // parameter.
@@ -444,64 +443,62 @@ fn transaction_name(query: &web::Query<HashMap<String, String>>) -> &str {
 // Can also override `render_response` if we want to change headers, content type, etc.
 impl ResponseError for error::Error {
     /// Maps our error types to the HTTP error code they should return.
-    fn error_response(&self) -> HttpResponse {
+    fn error_response(&self) -> BaseHttpResponse<Body> {
         use error::Error::*;
-        match self {
+        let status_code = match self {
             // 400 Bad Request
-            MissingInput { .. } => HttpResponse::BadRequest(),
-            EmptyInput { .. } => HttpResponse::BadRequest(),
-            NewKey { .. } => HttpResponse::BadRequest(),
+            MissingInput { .. } => StatusCode::BAD_REQUEST,
+            EmptyInput { .. } => StatusCode::BAD_REQUEST,
+            NewKey { .. } => StatusCode::BAD_REQUEST,
 
             // 404 Not Found
-            MissingData { .. } => HttpResponse::NotFound(),
-            ListKeys { .. } => HttpResponse::NotFound(),
-            UpdateDoesNotExist { .. } => HttpResponse::NotFound(),
-            NoStagedImage { .. } => HttpResponse::NotFound(),
-            UninitializedUpdateStatus { .. } => HttpResponse::NotFound(),
+            MissingData { .. } => StatusCode::NOT_FOUND,
+            ListKeys { .. } => StatusCode::NOT_FOUND,
+            UpdateDoesNotExist { .. } => StatusCode::NOT_FOUND,
+            NoStagedImage { .. } => StatusCode::NOT_FOUND,
+            UninitializedUpdateStatus { .. } => StatusCode::NOT_FOUND,
 
             // 422 Unprocessable Entity
-            CommitWithNoPending => HttpResponse::UnprocessableEntity(),
+            CommitWithNoPending => StatusCode::UNPROCESSABLE_ENTITY,
 
             // 423 Locked
-            UpdateShareLock { .. } => HttpResponse::build(StatusCode::LOCKED),
-            UpdateLockHeld { .. } => HttpResponse::build(StatusCode::LOCKED),
+            UpdateShareLock { .. } => StatusCode::LOCKED,
+            UpdateLockHeld { .. } => StatusCode::LOCKED,
 
             // 409 Conflict
-            DisallowCommand { .. } => HttpResponse::Conflict(),
+            DisallowCommand { .. } => StatusCode::CONFLICT,
 
             // 500 Internal Server Error
-            DataStoreLock => HttpResponse::InternalServerError(),
-            ResponseSerialization { .. } => HttpResponse::InternalServerError(),
-            BindSocket { .. } => HttpResponse::InternalServerError(),
-            ServerStart { .. } => HttpResponse::InternalServerError(),
-            ListedKeyNotPresent { .. } => HttpResponse::InternalServerError(),
-            DataStore { .. } => HttpResponse::InternalServerError(),
-            Deserialization { .. } => HttpResponse::InternalServerError(),
-            DataStoreSerialization { .. } => HttpResponse::InternalServerError(),
-            CommandSerialization { .. } => HttpResponse::InternalServerError(),
-            InvalidMetadata { .. } => HttpResponse::InternalServerError(),
-            ConfigApplierFork { .. } => HttpResponse::InternalServerError(),
-            ConfigApplierStart { .. } => HttpResponse::InternalServerError(),
-            ConfigApplierStdin {} => HttpResponse::InternalServerError(),
-            ConfigApplierWait { .. } => HttpResponse::InternalServerError(),
-            ConfigApplierWrite { .. } => HttpResponse::InternalServerError(),
-            SystemdNotify { .. } => HttpResponse::InternalServerError(),
-            SystemdNotifyStatus {} => HttpResponse::InternalServerError(),
-            SetPermissions { .. } => HttpResponse::InternalServerError(),
-            SetGroup { .. } => HttpResponse::InternalServerError(),
-            ReleaseData { .. } => HttpResponse::InternalServerError(),
-            Shutdown { .. } => HttpResponse::InternalServerError(),
-            Reboot { .. } => HttpResponse::InternalServerError(),
-            UpdateDispatcher { .. } => HttpResponse::InternalServerError(),
-            UpdateError { .. } => HttpResponse::InternalServerError(),
-            UpdateStatusParse { .. } => HttpResponse::InternalServerError(),
-            UpdateInfoParse { .. } => HttpResponse::InternalServerError(),
-            UpdateLockOpen { .. } => HttpResponse::InternalServerError(),
-        }
-        // Include the error message in the response, and for all error types.  The Bottlerocket
-        // API is only exposed locally, and only on the host filesystem and to authorized
-        // containers, so we're not worried about exposing error details.
-        .body(self.to_string())
+            DataStoreLock => StatusCode::INTERNAL_SERVER_ERROR,
+            ResponseSerialization { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            BindSocket { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            ServerStart { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            ListedKeyNotPresent { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            DataStore { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            Deserialization { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            DataStoreSerialization { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            CommandSerialization { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            InvalidMetadata { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            ConfigApplierFork { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            ConfigApplierStart { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            ConfigApplierStdin {} => StatusCode::INTERNAL_SERVER_ERROR,
+            ConfigApplierWait { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            ConfigApplierWrite { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            SystemdNotify { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            SystemdNotifyStatus {} => StatusCode::INTERNAL_SERVER_ERROR,
+            SetPermissions { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            SetGroup { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            ReleaseData { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            Shutdown { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            Reboot { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            UpdateDispatcher { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            UpdateError { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            UpdateStatusParse { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            UpdateInfoParse { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+            UpdateLockOpen { .. } => StatusCode::INTERNAL_SERVER_ERROR,
+        };
+
+        BaseHttpResponse::new(status_code)
     }
 }
 
@@ -520,7 +517,7 @@ macro_rules! impl_responder_for {
             fn respond_to($self, _req: &HttpRequest) -> HttpResponse {
                 let body = match serde_json::to_string(&$serialize_expr) {
                     Ok(s) => s,
-                    Err(e) => return Error::ResponseSerialization { source: e }.error_response(),
+                    Err(e) => return Error::ResponseSerialization { source: e }.into(),
                 };
                 HttpResponse::Ok()
                     .content_type("application/json")

diff --git a/sources/api/ecs-settings-applier/Cargo.toml b/sources/api/ecs-settings-applier/Cargo.toml
@@ -12,7 +12,6 @@ exclude = ["README.md"]
 [dependencies]
 serde = {version = "1.0", features = ["derive"]}
 serde_json = "1"
-models = { path = "../../models" }
 schnauzer = { path = "../schnauzer" }
 log = "0.4"
 snafu = "0.6"

diff --git a/sources/api/migration/migrator/Cargo.toml b/sources/api/migration/migrator/Cargo.toml
@@ -13,11 +13,11 @@ exclude = ["README.md"]
 bottlerocket-release = { path = "../../../bottlerocket-release" }
 log = "0.4"
 lz4 = "1.23.1"
-nix = "0.20.0"
+nix = "0.21"
 pentacle = "1.0.0"
 rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
 regex = "1.1"
-semver = "0.11"
+semver = "1.0"
 simplelog = "0.10"
 snafu = "0.6"
 tough = "0.11"

diff --git a/sources/api/migration/migrator/src/error.rs b/sources/api/migration/migrator/src/error.rs
@@ -33,13 +33,13 @@ pub(crate) enum Error {
     #[snafu(display("Data store path '{}' contains invalid version: {}", path.display(), source))]
     InvalidDataStoreVersion {
         path: PathBuf,
-        source: semver::SemVerError,
+        source: semver::Error,
     },
 
     #[snafu(display("Migration '{}' contains invalid version: {}", path.display(), source))]
     InvalidMigrationVersion {
         path: PathBuf,
-        source: semver::SemVerError,
+        source: semver::Error,
     },
 
     #[snafu(display("Data store for new version {} already exists at {}", version, path.display()))]

diff --git a/sources/api/storewolf/Cargo.toml b/sources/api/storewolf/Cargo.toml
@@ -15,7 +15,7 @@ datastore = { path = "../datastore" }
 log = "0.4"
 models = { path = "../../models" }
 rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
-semver = "0.11"
+semver = "1.0"
 simplelog = "0.10"
 snafu = "0.6"
 toml = "0.5"

diff --git a/sources/api/thar-be-settings/Cargo.toml b/sources/api/thar-be-settings/Cargo.toml
@@ -16,7 +16,7 @@ http = "0.2"
 itertools = "0.10"
 log = "0.4"
 models = { path = "../../models" }
-nix = "0.20.0"
+nix = "0.21"
 schnauzer = { path = "../schnauzer" }
 serde_json = "1"
 simplelog = "0.10"

diff --git a/sources/api/thar-be-updates/Cargo.toml b/sources/api/thar-be-updates/Cargo.toml
@@ -17,10 +17,10 @@ fs2 = "0.4.3"
 http = "0.2.1"
 log = "0.4.8"
 models = { path = "../../models" }
-nix = "0.20.0"
+nix = "0.21"
 num-derive = "0.3.0"
 num-traits = "0.2.12"
-semver = { version = "0.11", features = [ "serde" ] }
+semver = { version = "1.0", features = [ "serde" ] }
 serde = { version = "1.0.111", features = [ "derive" ] }
 serde_json = "1.0.53"
 serde_plain = "0.3.0"

diff --git a/sources/api/thar-be-updates/src/error.rs b/sources/api/thar-be-updates/src/error.rs
@@ -122,7 +122,7 @@ pub enum Error {
     #[snafu(display("Failed to parse version string '{}' into semver version", version))]
     SemVer {
         version: String,
-        source: semver::SemVerError,
+        source: semver::Error,
     },
 
     #[snafu(display("Invalid state transition from {:?} to {:?}", from, to))]

diff --git a/sources/bottlerocket-release/Cargo.toml b/sources/bottlerocket-release/Cargo.toml
@@ -11,7 +11,7 @@ exclude = ["README.md"]
 [dependencies]
 envy = "0.4"
 log = "0.4"
-semver = { version = "0.11", features = ["serde"] }
+semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 snafu = "0.6"
 

diff --git a/sources/clarify.toml b/sources/clarify.toml
@@ -1,8 +1,22 @@
 [clarify.actix-macros]
 expression = "MIT OR Apache-2.0"
 license-files = [
-    { path = "LICENSE-APACHE", hash = 0x671c8ae7 },
-    { path = "LICENSE-MIT", hash = 0xda536e85 },
+    { path = "LICENSE-APACHE", hash = 0x31de3fcd },
+    { path = "LICENSE-MIT", hash = 0xfeb1e4a7 },
+]
+
+[clarify.actix-codec]
+expression = "MIT OR Apache-2.0"
+license-files = [
+    { path = "LICENSE-APACHE", hash = 0x31de3fcd },
+    { path = "LICENSE-MIT", hash = 0xfeb1e4a7 },
+]
+
+[clarify.actix-http]
+expression = "MIT OR Apache-2.0"
+license-files = [
+    { path = "LICENSE-APACHE", hash = 0x31de3fcd },
+    { path = "LICENSE-MIT", hash = 0xfeb1e4a7 },
 ]
 
 [clarify.backtrace-sys]
@@ -36,7 +50,7 @@ expression = "(MIT OR Apache-2.0) AND BSD-2-Clause-FreeBSD"
 license-files = [
     { path = "LICENSE-APACHE", hash = 0x24b54f4b },
     { path = "LICENSE-MIT", hash = 0xbc436f08 },
-    { path = "LICENSE-THIRD-PARTY", hash = 0xc6242648 },
+    { path = "LICENSE-THIRD-PARTY", hash = 0x847bf39 },
 ]
 
 [clarify.lz4-sys]
@@ -113,7 +127,7 @@ license-files = [
 [clarify.tokio-macros]
 expression = "MIT"
 license-files = [
-    { path = "LICENSE", hash = 0x288c17e1 },
+    { path = "LICENSE", hash = 0x28d2b8db },
 ]
 
 [clarify.vmw_backdoor]

diff --git a/sources/imdsclient/Cargo.toml b/sources/imdsclient/Cargo.toml
@@ -14,7 +14,6 @@ http = "0.2"
 log = "0.4"
 reqwest = { version = "0.11.1", default-features = false }
 serde_json = "1"
-simplelog = "0.10"
 snafu = "0.6"
 tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread", "time"] }
 url = "2.1.1"

diff --git a/sources/models/Cargo.toml b/sources/models/Cargo.toml
@@ -15,7 +15,7 @@ bottlerocket-release = { path = "../bottlerocket-release" }
 lazy_static = "1.2"
 model-derive = { path = "model-derive" }
 regex = "1.1"
-semver = "0.11.0"
+semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_plain = "0.3.0"
 snafu = "0.6"

diff --git a/sources/models/model-derive/Cargo.toml b/sources/models/model-derive/Cargo.toml
@@ -14,7 +14,7 @@ path = "src/lib.rs"
 proc-macro = true
 
 [dependencies]
-darling = "0.12"
+darling = "0.13"
 proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0", default-features = false, features = ["full", "parsing", "printing", "proc-macro", "visit-mut"] }

diff --git a/sources/models/src/modeled_types/shared.rs b/sources/models/src/modeled_types/shared.rs
@@ -295,7 +295,7 @@ impl TryFrom<&str> for FriendlyVersion {
 }
 
 impl TryFrom<FriendlyVersion> for semver::Version {
-    type Error = semver::SemVerError;
+    type Error = semver::Error;
 
     fn try_from(input: FriendlyVersion) -> Result<semver::Version, Self::Error> {
         // If the string begins with a 'v', skip it before conversion
@@ -313,7 +313,7 @@ string_impls_for!(FriendlyVersion, "FriendlyVersion");
 #[cfg(test)]
 mod test_version {
     use super::FriendlyVersion;
-    use semver::{SemVerError, Version};
+    use semver::Version;
     use std::convert::TryFrom;
     use std::convert::TryInto;
 
@@ -326,8 +326,6 @@ mod test_version {
             "v1.0.1-alpha",
             "1.0.2-alpha+1.0",
             "v1.0.2-alpha+1.0",
-            "1.0.3-beta.1.01",
-            "v1.0.3-beta.1.01",
             "1.1.0-rc.1.1",
             "v1.1.0-rc.1.1",
             "latest",
@@ -346,9 +344,19 @@ mod test_version {
 
     #[test]
     fn bad_version_string() {
-        for err in &["hi", "1.0", "1", "v", "v1", "v1.0", "vv1.1.0"] {
+        for err in &[
+            "hi",
+            "1.0",
+            "1",
+            "v",
+            "v1",
+            "v1.0",
+            "vv1.1.0",
+            "1.0.3-beta.1.01",
+            "v1.0.3-beta.1.01",
+        ] {
             FriendlyVersion::try_from(*err).unwrap_err();
-            let res: Result<Version, SemVerError> = Version::try_from(FriendlyVersion {
+            let res: Result<Version, semver::Error> = Version::try_from(FriendlyVersion {
                 inner: err.to_string(),
             });
             res.unwrap_err();

diff --git a/sources/prairiedog/Cargo.toml b/sources/prairiedog/Cargo.toml
@@ -11,7 +11,7 @@ exclude = ["README.md"]
 [dependencies]
 argh = "0.1.3"
 log = "0.4"
-nix = "0.20.0"
+nix = "0.21"
 signpost = { path = "../updater/signpost" }
 simplelog = "0.10"
 snafu = "0.6"

diff --git a/sources/updater/update_metadata/Cargo.toml b/sources/updater/update_metadata/Cargo.toml
@@ -12,7 +12,7 @@ exclude = ["README.md"]
 chrono = { version = "0.4.9", features = ["serde"] }
 parse-datetime = { path = "../../parse-datetime" }
 regex = "1.1"
-semver = { version = "0.11.0", features = ["serde"] }
+semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0.100", features = ["derive"] }
 serde_json = "1.0.40"
 serde_plain = "0.3.0"