From 286e9364ec4f0b530ae6afda179c022b57307c2d Mon Sep 17 00:00:00 2001 From: MedzikUser Date: Mon, 25 Apr 2022 21:09:22 +0200 Subject: [PATCH] fix(deps): update rust crate tower-http to 0.3.0 --- Cargo.lock | 66 +++++++++++++++++++++++++++-------------------- server/Cargo.toml | 2 +- server/src/lib.rs | 4 +-- 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2d3bcf..5d0f0ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -115,7 +115,7 @@ dependencies = [ "sync_wrapper", "tokio", "tower", - "tower-http", + "tower-http 0.2.5", "tower-layer", "tower-service", ] @@ -147,15 +147,15 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" +checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.4.4", + "miniz_oxide", "object", "rustc-demangle", ] @@ -251,7 +251,7 @@ dependencies = [ "libc", "num-integer", "num-traits", - "time 0.1.43", + "time 0.1.44", "winapi", ] @@ -394,7 +394,7 @@ dependencies = [ "cfg-if", "crc32fast", "libc", - "miniz_oxide 0.5.1", + "miniz_oxide", ] [[package]] @@ -519,7 +519,7 @@ checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -631,7 +631,7 @@ dependencies = [ "rust_utilities", "serde", "thiserror", - "tower-http", + "tower-http 0.3.0", ] [[package]] @@ -799,9 +799,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.123" +version = "0.2.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb691a747a7ab48abc15c5b42066eaafde10dc427e3b6ee2a1cf43db04c763bd" +checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" [[package]] name = "libsqlite3-sys" @@ -873,16 +873,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - [[package]] name = "miniz_oxide" version = "0.5.1" @@ -985,9 +975,9 @@ dependencies = [ [[package]] name = "object" -version = "0.27.1" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" dependencies = [ "memchr", ] @@ -1556,11 +1546,12 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -1585,9 +1576,9 @@ checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -1696,6 +1687,25 @@ name = "tower-http" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79dd37121c38240c4b4fe6520332406218bbf876f2f690fe9e406020189366fd" dependencies = [ "async-compression", "base64", @@ -1870,9 +1880,9 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasi" diff --git a/server/Cargo.toml b/server/Cargo.toml index c2d6edb..ce965db 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -8,7 +8,7 @@ axum = "0.5.3" log = "0.4.16" thiserror = "1.0.30" serde = { version = "1.0.136", features = ["derive"] } -tower-http = { version = "0.2.5", features = ["full"] } +tower-http = { version = "0.3.0", features = ["full"] } hyper = { version = "0.14.18", features = ["full"] } rust_utilities = { version = "0.2.0", features = ["jsonwebtoken"] } homedisk-database = { path = "../database" } diff --git a/server/src/lib.rs b/server/src/lib.rs index f3f585e..e74f090 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -8,7 +8,7 @@ use axum::{http::HeaderValue, routing::get, Extension, Router, Server}; use homedisk_database::Database; use homedisk_types::config::types::Config; use log::{debug, info}; -use tower_http::cors::{CorsLayer, Origin}; +use tower_http::cors::{CorsLayer, AllowOrigin}; async fn health_check() -> &'static str { "I'm alive!" @@ -27,7 +27,7 @@ pub async fn serve( .route("/health-check", get(health_check)) .nest("/auth", auth::app()) .nest("/fs", fs::app()) - .layer(CorsLayer::new().allow_origin(Origin::list(origins))) + .layer(CorsLayer::new().allow_origin(AllowOrigin::list(origins))) .layer(Extension(db)) .layer(Extension(config));