Merge branch 'fix-cargo-audit' into 'dev'

Update libraries

See merge request memri/pod!168

Cargo.toml

@@ -12,23 +12,23 @@ publish = false # Prevent accidental publishing
 
 
 [dependencies]
-bytes = "0.5.6"
-chacha20poly1305 = "0.6.0"
+bytes = "0.6.0"
+chacha20poly1305 = "0.7.1"
 chrono = { version = "0.4.19", features = ["serde"] }
-env_logger = "0.7.1"
+env_logger = "0.8.1"
 hex = "0.4.2"
 lazy_static = "1.4.0"
-libc = "0.2.79"
+libc = "0.2.80"
 log = "0.4.11"
 rand = "0.7.3"
-refinery = { version = "0.3.0", features = ["rusqlite"] }
-regex = "1.3.9"
-rusqlite = { features = ["sqlcipher"] }
-serde = { version = "1.0.116", features = ["derive"] }
-serde_json = "1.0.58"
+refinery = { version = "0.4.0", features = ["rusqlite"] }
+regex = "1.4.2"
+rusqlite = { version = "0.24.1", features = ["sqlcipher"] }
+serde = { version = "1.0.117", features = ["derive"] }
+serde_json = "1.0.59"
 sha2 = "0.9.1"
-structopt = { version = "0.3.18", features = ["color"] }
-tokio = { version = "0.2.22", features = ["macros"] }
+structopt = { version = "0.3.20", features = ["color"] }
+tokio = { version = "0.3.3", features = ["macros", "rt", "rt-multi-thread"] }
 warp = { version = "0.2.5", default-features = false, features = ["tls"] }
 
 [dev-dependencies]

src/warp_api.rs

@@ -12,7 +12,6 @@ use crate::command_line_interface;
 use crate::command_line_interface::CLIOptions;
 use crate::internal_api;
 use crate::warp_endpoints;
-use bytes::Bytes;
 use log::error;
 use log::info;
 use log::warn;
@@ -28,6 +27,7 @@ use warp::http;
 use warp::http::header::HeaderMap;
 use warp::http::header::HeaderValue;
 use warp::http::status::StatusCode;
+use warp::hyper::body::Bytes;
 use warp::reply::Response;
 use warp::Filter;
 use warp::Reply;
@@ -226,7 +226,7 @@ pub async fn run_server(cli_options: &CLIOptions) {
         .and(warp::body::json())
         .map(move |owner: String, body: PayloadWrapper<GetFile>| {
             let result = warp_endpoints::get_file(owner, init_db.deref(), body);
-            respond_with_result(result.map(|result| result))
+            respond_with_result(result)
         });
 
     let insecure_http_headers = Arc::new(cli_options.insecure_http_headers);