Bump actix-web from 0.7.19 to 1.0.4

Bumps [actix-web](https://github.com/actix/actix-web) from 0.7.19 to 1.0.4.
- [Release notes](https://github.com/actix/actix-web/releases)
- [Changelog](https://github.com/actix/actix-web/blob/master/CHANGES.md)
- [Commits](https://github.com/actix/actix-web/compare/v0.7.19...web-v1.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Dockerfile

@@ -1,22 +0,0 @@
-FROM lukemathwalker/cargo-chef as planner
-WORKDIR app
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json
-
-FROM lukemathwalker/cargo-chef as cacher
-WORKDIR app
-COPY --from=planner /app/recipe.json recipe.json
-RUN cargo chef cook --release --recipe-path recipe.json
-
-FROM rust as builder
-WORKDIR app
-COPY . .
-# Copy over the cached dependencies
-COPY --from=cacher /app/target target
-COPY --from=cacher $CARGO_HOME $CARGO_HOME
-RUN cargo build --release --bin bind9-api
-
-FROM rust as runtime
-WORKDIR app
-COPY --from=builder /app/target/release/bind9-api /usr/local/bin
-ENTRYPOINT ["/usr/local/bin/bind9-api"]

README.md

@@ -7,19 +7,6 @@
 This is an attempt to implement an API to create, update or delete DNS records
 on a BIND9 DNS server.
 
-## Building
-
-To compile the code, you first need to [install Rust](https://rustup.rs/). Then
-you can run
-
-```
-cargo build --release
-```
-
-in the project root. The server and client binary will be located in
-`./target/release/bind9-api` and `./target/release/bind9-api-client`
-respectively.
-
 ## Server
 
 The server will wait for incoming requests and uses the `nsupdate` command to

client/Cargo.toml

@@ -14,7 +14,7 @@ hyper = "0.12.35"
 log = "0.4.8"
 openssl-probe = "0.1.2"
 pretty_env_logger = "0.4.0"
-reqwest = "0.9.24"
+reqwest = "0.9.22"
 serde = "1.0.104"
 serde_derive = "1.0.104"
 serde_json = "1.0.50"

client/src/main.rs

@@ -106,7 +106,7 @@ fn call_api<D: serde::Serialize>(
     let data_s = serde_json::to_string(&data)?;
     info!("body: {}", data_s);
     let signature = crypto::sign(config.secret.as_bytes(), data_s.as_bytes());
-    let signature = crypto::bytes_to_hex_str(&signature);
+    let signature = crypto::bytes_to_hex_str(&signature)?;
     let client = reqwest::Client::new();
     let url = format!("{}/record", config.host);
     Ok(if method == Method::POST {

crypto/src/lib.rs

@@ -55,8 +55,10 @@ use ring::{digest, hmac};
 type Result<T> = std::result::Result<T, Error>;
 
 /// Converts a byte slice to a lowercase hex string.
-pub fn bytes_to_hex_str(bytes: &[u8]) -> String {
+pub fn bytes_to_hex_str(bytes: &[u8]) -> Result<String> {
-    bytes.encode_hex::<String>()
+    let mut output = String::new();
+    bytes.write_hex(&mut output)?;
+    Ok(output)
 }
 
 /// Converts a hey string to a vec of bytes.

server/Cargo.toml

@@ -6,7 +6,7 @@ description = "Web API to create, update and remove DNS entries in bind9"
 license = "MIT/Apache-2.0"
 
 [dependencies]
-actix-web = "0.7.19"
+actix-web = "1.0.4"
 clap = "2.33.0"
 crypto = { path = "../crypto" }
 data = { path = "../data" }

server/src/util.rs

@@ -104,7 +104,7 @@ pub struct Validated<T>(T);
 
 impl<T: 'static + ::serde::de::DeserializeOwned> FromRequest<Arc<Config>> for Validated<T> {
     type Config = ();
-    type Result = Box<dyn Future<Item = Self, Error = Error>>;
+    type Result = Box<Future<Item = Self, Error = Error>>;
 
     fn from_request(req: &HttpRequest<Arc<Config>>, _: &Self::Config) -> Self::Result {
         let state = req.state().clone();
@@ -134,8 +134,7 @@ impl<T> Deref for Validated<T> {
 }
 
 fn extract_signature<S>(req: &HttpRequest<S>) -> Result<Vec<u8>> {
-    Ok(req
+    Ok(req.headers()
-        .headers()
         .get(::data::TOKEN_HEADER)
         .as_ref()
         .ok_or_else(|| ErrorUnauthorized(ParseError::Header))?