diff --git a/CHANGELOG.md b/CHANGELOG.md index ee0c6f98..5afc693e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### 2022-10-26 libunftp 0.18.7 + +- [#430](https://github.com/bolcom/libunftp/pull/430) Fix issue with proxy protocol hash construction +- [#432](https://github.com/bolcom/libunftp/pull/432) Show Trace ID as hex in debug output +- [#434](https://github.com/bolcom/libunftp/issues/434) Time out if client doesn't connect on data port after PASV +- Upgraded dependencies + ### 2022-09-25 libunftp 0.18.6 - [#429](https://github.com/bolcom/libunftp/pull/429) Await proxy protocol header in a separate task, fixes issue [#208](https://github.com/bolcom/libunftp/issues/208) diff --git a/Cargo.toml b/Cargo.toml index ed5eec37..ded2e65b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libunftp" -version = "0.18.6" # remember to update html_root_url +version = "0.18.7" # remember to update html_root_url authors = [ "Agoston Horvath ", "Dávid Kosztka ", @@ -30,32 +30,32 @@ members = [ ] [dependencies] -async-trait = "0.1.57" +async-trait = "0.1.58" bitflags = "1.3.2" bytes = "1.2.1" chrono = { version = "0.4.22", default-features = false, features = ["std"] } derive_more = { version = "0.99.17", features = ["display"] } -futures-util = { version = "0.3.24", default-features = false, features = ["alloc", "sink"] } -getrandom = "0.2.7" +futures-util = { version = "0.3.25", default-features = false, features = ["alloc", "sink"] } +getrandom = "0.2.8" lazy_static = "1.4.0" md-5 = "0.10.5" moka = "0.9.4" -prometheus = { version = "0.13.2", default-features = false } +prometheus = { version = "0.13.3", default-features = false } proxy-protocol = "0.5.0" -rustls = "0.20.6" +rustls = "0.20.7" rustls-pemfile = "1.0.1" slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_info"] } slog-stdlog = "4.1.1" -thiserror = "1.0.35" -tokio = { version = "1.21.1", features = ["macros", "rt", "net", "sync", "io-util", "time"] } +thiserror = "1.0.37" +tokio = { version = "1.21.2", features = ["macros", "rt", "net", "sync", "io-util", "time"] } tokio-rustls = "0.23.4" tokio-util = { version = "0.7.4", features = ["codec"] } -tracing = { version = "0.1.36", default-features = false } -tracing-attributes = "0.1.22" -uuid = { version = "1.1.2", features = ["v4"] } +tracing = { version = "0.1.37", default-features = false } +tracing-attributes = "0.1.23" +uuid = { version = "1.2.1", features = ["v4"] } x509-parser = "0.14.0" [dev-dependencies] pretty_assertions = "1.3.0" -tokio = { version = "1.21.1", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] } unftp-sbe-fs = { path = "../libunftp/crates/unftp-sbe-fs"} diff --git a/README.md b/README.md index 08c18016..199123e9 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ add. Here we choose the [file system back-end](https://crates.io/crates/unftp-sb ```toml [dependencies] -libunftp = "0.18.6" +libunftp = "0.18.7" unftp-sbe-fs = "0.2" tokio = { version = "1", features = ["full"] } ``` diff --git a/crates/unftp-auth-jsonfile/Cargo.toml b/crates/unftp-auth-jsonfile/Cargo.toml index 50483031..6d1bebca 100644 --- a/crates/unftp-auth-jsonfile/Cargo.toml +++ b/crates/unftp-auth-jsonfile/Cargo.toml @@ -18,21 +18,21 @@ repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-auth-j readme = "README.md" [dependencies] -async-trait = "0.1.57" -base64 = "0.13.0" +async-trait = "0.1.58" +base64 = "0.13.1" bytes = "1.2.1" ipnet = "2.5.0" iprange = "0.6.7" -libunftp = { version="0.18.6", path="../../"} +libunftp = { version="0.18.7", path="../../"} ring = "0.16.20" -serde = { version = "1.0.145", features = ["derive"] } -serde_json = "1.0.85" -tokio = { version = "1.21.1", features = ["rt", "time"] } -tracing = { version = "0.1.36", default-features = false } -tracing-attributes = "0.1.22" +serde = { version = "1.0.147", features = ["derive"] } +serde_json = "1.0.87" +tokio = { version = "1.21.2", features = ["rt", "time"] } +tracing = { version = "0.1.37", default-features = false } +tracing-attributes = "0.1.23" valid = "0.3.1" [dev-dependencies] pretty_env_logger = "0.4.0" -tokio = { version = "1.21.1", features = ["macros"] } +tokio = { version = "1.21.2", features = ["macros"] } unftp-sbe-fs = { version="0.2.1", path="../unftp-sbe-fs"} diff --git a/crates/unftp-auth-pam/Cargo.toml b/crates/unftp-auth-pam/Cargo.toml index 1cd6c8aa..2e46379a 100644 --- a/crates/unftp-auth-pam/Cargo.toml +++ b/crates/unftp-auth-pam/Cargo.toml @@ -19,13 +19,13 @@ repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-auth-p readme = "README.md" [dependencies] -async-trait = "0.1.57" -libunftp = { version="0.18.6", path="../../"} -tracing = { version = "0.1.36", default-features = false } -tracing-attributes = "0.1.22" +async-trait = "0.1.58" +libunftp = { version="0.18.7", path="../../"} +tracing = { version = "0.1.37", default-features = false } +tracing-attributes = "0.1.23" [target.'cfg(target_family = "unix")'.dependencies] pam-auth = { package = "pam", version = "0.7.0" } [dev-dependencies] -tokio = { version = "1.21.1", features = ["macros"] } +tokio = { version = "1.21.2", features = ["macros"] } diff --git a/crates/unftp-auth-rest/Cargo.toml b/crates/unftp-auth-rest/Cargo.toml index 831997ab..c3397954 100644 --- a/crates/unftp-auth-rest/Cargo.toml +++ b/crates/unftp-auth-rest/Cargo.toml @@ -18,20 +18,20 @@ repository = "https://github.com/bolcom/libunftp/tree/hannes/crates/unftp-auth-r readme = "README.md" [dependencies] -async-trait = "0.1.57" +async-trait = "0.1.58" hyper = { version = "0.14.20", features = ["client", "runtime", "stream", "http1"] } hyper-rustls = "0.23.0" -libunftp = { version="0.18.6", path="../../"} +libunftp = { version="0.18.7", path="../../"} percent-encoding = "2.2.0" regex = "1.6.0" -serde = { version = "1.0.145", features = ["derive"] } -serde_json = "1.0.85" -tokio = { version = "1.21.1", features = ["rt", "net", "sync", "io-util", "time"] } -tracing = { version = "0.1.36", default-features = false } -tracing-attributes = "0.1.22" +serde = { version = "1.0.147", features = ["derive"] } +serde_json = "1.0.87" +tokio = { version = "1.21.2", features = ["rt", "net", "sync", "io-util", "time"] } +tracing = { version = "0.1.37", default-features = false } +tracing-attributes = "0.1.23" [dev-dependencies] pretty_env_logger = "0.4.0" -tokio = { version = "1.21.1", features = ["macros"] } +tokio = { version = "1.21.2", features = ["macros"] } unftp-sbe-fs = { version="0.2.1", path="../unftp-sbe-fs"} diff --git a/crates/unftp-sbe-fs/Cargo.toml b/crates/unftp-sbe-fs/Cargo.toml index e9ee5e9a..9442501e 100644 --- a/crates/unftp-sbe-fs/Cargo.toml +++ b/crates/unftp-sbe-fs/Cargo.toml @@ -19,23 +19,23 @@ repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-sbe-fs readme = "README.md" [dependencies] -async-trait = "0.1.57" -futures = { version = "0.3.24", default-features = false, features = ["std"] } -libunftp = { version="0.18.6", path="../../"} +async-trait = "0.1.58" +futures = { version = "0.3.25", default-features = false, features = ["std"] } +libunftp = { version="0.18.7", path="../../"} path_abs = "0.5.1" -tokio = { version = "1.21.1", features = ["rt", "net", "sync", "io-util", "time", "fs"] } -tokio-stream = "0.1.10" -tracing = { version = "0.1.36", default-features = false } -tracing-attributes = "0.1.22" +tokio = { version = "1.21.2", features = ["rt", "net", "sync", "io-util", "time", "fs"] } +tokio-stream = "0.1.11" +tracing = { version = "0.1.37", default-features = false } +tracing-attributes = "0.1.23" [dev-dependencies] async_ftp = "6.0.0" -more-asserts = "0.3.0" +more-asserts = "0.3.1" pretty_assertions = "1.3.0" pretty_env_logger = "0.4.0" slog-async = "2.7.0" slog-term = "2.9.0" tempfile = "3.3.0" -tokio = { version = "1.21.1", features = ["macros", "rt-multi-thread"] } -tracing-subscriber = "0.3.15" -getrandom = "0.2.7" +tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] } +tracing-subscriber = "0.3.16" +getrandom = "0.2.8" diff --git a/crates/unftp-sbe-fs/README.md b/crates/unftp-sbe-fs/README.md index 4e049e43..39134172 100644 --- a/crates/unftp-sbe-fs/README.md +++ b/crates/unftp-sbe-fs/README.md @@ -21,7 +21,7 @@ Add the libunftp and tokio crates to your project's dependencies in `Cargo.toml` ```toml [dependencies] -libunftp = "0.18.6" +libunftp = "0.18.7" unftp-sbe-fs = "0.2.1" tokio = { version = "1", features = ["full"] } ``` diff --git a/crates/unftp-sbe-gcs/Cargo.toml b/crates/unftp-sbe-gcs/Cargo.toml index e6b83f69..4196ef9d 100644 --- a/crates/unftp-sbe-gcs/Cargo.toml +++ b/crates/unftp-sbe-gcs/Cargo.toml @@ -18,31 +18,31 @@ repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-sbe-gc readme = "README.md" [dependencies] -async-trait = "0.1.57" -base64 = "0.13.0" +async-trait = "0.1.58" +base64 = "0.13.1" bytes = "1.2.1" chrono = { version = "0.4.22", default-features = false, features = ["std", "serde"] } -futures = { version = "0.3.24", default-features = false, features = ["std"] } +futures = { version = "0.3.25", default-features = false, features = ["std"] } hyper = { version = "0.14.20", features = ["client", "runtime", "stream", "http1"] } hyper-rustls = "0.23.0" -libunftp = { version="0.18.6", path="../../"} +libunftp = { version="0.18.7", path="../../"} mime = "0.3.16" percent-encoding = "2.2.0" -serde = { version = "1.0.145", features = ["derive"] } -serde_json = "1.0.85" -time = "0.3.15" -tokio = { version = "1.21.1", features = ["rt", "net", "sync", "io-util", "time", "fs"] } -tokio-stream = "0.1.10" +serde = { version = "1.0.147", features = ["derive"] } +serde_json = "1.0.87" +time = "0.3.16" +tokio = { version = "1.21.2", features = ["rt", "net", "sync", "io-util", "time", "fs"] } +tokio-stream = "0.1.11" tokio-util = { version = "0.7.4", features = ["codec", "compat"] } -tracing = { version = "0.1.36", default-features = false } -tracing-attributes = "0.1.22" +tracing = { version = "0.1.37", default-features = false } +tracing-attributes = "0.1.23" yup-oauth2 = "7.0.1" [dev-dependencies] async_ftp = "6.0.0" clap = { version = "3.2.22", features = ["env"] } lazy_static = "1.4.0" -more-asserts = "0.3.0" +more-asserts = "0.3.1" path_abs = "0.5.1" pretty_assertions = "1.3.0" pretty_env_logger = "0.4.0" @@ -51,5 +51,5 @@ slog-async = "2.7.0" slog-stdlog = "4.1.1" slog-term = "2.9.0" tempfile = "3.3.0" -tokio = { version = "1.21.1", features = ["macros", "rt-multi-thread"] } -tracing-subscriber = "0.3.15" +tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] } +tracing-subscriber = "0.3.16" diff --git a/crates/unftp-sbe-gcs/README.md b/crates/unftp-sbe-gcs/README.md index 64c4cc71..15026e02 100644 --- a/crates/unftp-sbe-gcs/README.md +++ b/crates/unftp-sbe-gcs/README.md @@ -14,7 +14,7 @@ Add the needed dependencies to Cargo.toml: ```toml [dependencies] - libunftp = "0.18.6" + libunftp = "0.18.7" unftp-sbe-gcs = "0.2.1" tokio = { version = "1", features = ["full"] } ``` diff --git a/crates/unftp-sbe-gcs/src/lib.rs b/crates/unftp-sbe-gcs/src/lib.rs index 46484568..f7c576db 100644 --- a/crates/unftp-sbe-gcs/src/lib.rs +++ b/crates/unftp-sbe-gcs/src/lib.rs @@ -12,7 +12,7 @@ //! //! ```toml //! [dependencies] -//! libunftp = "0.18.6" +//! libunftp = "0.18.7" //! unftp-sbe-gcs = "0.2.1" //! tokio = { version = "1", features = ["full"] } //! ``` diff --git a/src/lib.rs b/src/lib.rs index 34b2ff6a..a9d530b5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,7 @@ #![deny(clippy::all)] #![deny(missing_docs)] #![forbid(unsafe_code)] -#![doc(html_root_url = "https://docs.rs/libunftp/0.18.6")] +#![doc(html_root_url = "https://docs.rs/libunftp/0.18.7")] //! libunftp is an extensible, async, cloud orientated FTP(S) server library. //! @@ -20,7 +20,7 @@ //! //! ```toml //! [dependencies] -//! libunftp = "0.18.6" +//! libunftp = "0.18.7" //! unftp-sbe-fs = "0.2.0" //! tokio = { version = "1", features = ["full"] } //! ```