From 67d0b69bf601bf52d4ccebc712068ab036910f67 Mon Sep 17 00:00:00 2001 From: Robby klein Gunnewiek Date: Sun, 15 Dec 2024 14:55:11 +0100 Subject: [PATCH] Release all crates (#525) - libunftp 0.20.2 - unftp-auth-jsonfile v0.3.5 - unftp-auth-pam v0.2.6 - unftp-auth-rest v0.2.7 - unftp-sbe-fs v0.2.6 - unftp-sbe-gcs v0.2.7 --- CHANGELOG.md | 24 ++++++++++++++ Cargo.toml | 38 +++++++++++----------- README.md | 2 +- crates/unftp-auth-jsonfile/Cargo.toml | 24 +++++++------- crates/unftp-auth-jsonfile/tests/main.rs | 2 ++ crates/unftp-auth-pam/Cargo.toml | 12 +++---- crates/unftp-auth-rest/Cargo.toml | 22 ++++++------- crates/unftp-auth-rest/src/lib.rs | 1 - crates/unftp-sbe-fs/CHANGELOG.md | 11 ------- crates/unftp-sbe-fs/Cargo.toml | 40 ++++++++++++------------ crates/unftp-sbe-fs/README.md | 4 +-- crates/unftp-sbe-fs/tests/main.rs | 2 ++ crates/unftp-sbe-gcs/Cargo.toml | 40 ++++++++++++------------ crates/unftp-sbe-gcs/README.md | 4 +-- crates/unftp-sbe-gcs/src/lib.rs | 2 +- src/lib.rs | 4 +-- src/server/ftpserver.rs | 1 - tests/common.rs | 2 ++ tests/pass_security.rs | 2 ++ 19 files changed, 128 insertions(+), 109 deletions(-) delete mode 100644 crates/unftp-sbe-fs/CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md index feec8372..1975c578 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## 2024-12-15 Release of all crates + +### libunftp 0.20.2 + +_tag: libunftp-0.20.2_ + +- Upgraded dependencies + +### unftp-auth-jsonfile v0.3.5, unftp-auth-pam v0.2.6 + +- Compiled against libunftp v0.20.2 +- Upgraded dependencies + +### unftp-auth-rest v0.2.7 + +- [520](https://github.com/bolcom/libunftp/pull/520) Allow https for auth rest url +- Compiled against libunftp v0.20.2 +- Upgraded dependencies + +### unftp-sbe-fs v0.2.6, unftp-sbe-gcs v0.2.7 + +- Compiled against libunftp v0.20.2 +- Upgraded dependencies + ### libunftp 0.20.1 - Fixed a build issue on Windows diff --git a/Cargo.toml b/Cargo.toml index b3cf73bc..53f1548e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libunftp" -version = "0.20.1" # remember to update html_root_url +version = "0.20.2" # remember to update html_root_url authors = [ "Agoston Horvath ", "Dávid Kosztka ", @@ -37,37 +37,37 @@ missing_docs = "deny" all = "deny" [dependencies] -async-trait = "0.1.80" -bitflags = "2.5.0" -bytes = "1.6.0" -chrono = { version = "0.4.38", default-features = false, features = ["clock", "std"] } +async-trait = "0.1.83" +bitflags = "2.6.0" +bytes = "1.9.0" +chrono = { version = "0.4.39", default-features = false, features = ["clock", "std"] } derive_more = { version = "0.99.18", features = ["display"] } -futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "sink"] } +futures-util = { version = "0.3.31", default-features = false, features = ["alloc", "sink"] } getrandom = "0.2.15" -lazy_static = "1.4.0" +lazy_static = "1.5.0" md-5 = "0.10.6" -moka = { version = "0.12.7", default-features = false, features = ["sync"] } +moka = { version = "0.12.8", default-features = false, features = ["sync"] } nix = { version = "0.29.0", default-features = false, features = ["fs"] } prometheus = { version = "0.13.4", default-features = false } proxy-protocol = "0.5.0" -rustls = "0.23.10" -rustls-pemfile = "2.1.2" +rustls = "0.23.20" +rustls-pemfile = "2.2.0" slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_info"] } slog-stdlog = "4.1.1" -thiserror = "1.0.61" -tokio = { version = "1.38.0", features = ["macros", "rt", "net", "process", "sync", "io-util", "time"] } -tokio-rustls = "0.26.0" -tokio-util = { version = "0.7.11", features = ["codec"] } -tracing = { version = "0.1.40", default-features = false } -tracing-attributes = "0.1.27" -uuid = { version = "1.8.0", features = ["v4"] } +thiserror = "1.0.69" +tokio = { version = "1.42.0", features = ["macros", "rt", "net", "process", "sync", "io-util", "time"] } +tokio-rustls = "0.26.1" +tokio-util = { version = "0.7.13", features = ["codec"] } +tracing = { version = "0.1.41", default-features = false } +tracing-attributes = "0.1.28" +uuid = { version = "1.11.0", features = ["v4"] } x509-parser = "0.16.0" dashmap = "5.5.3" libc = "0.2" [dev-dependencies] -pretty_assertions = "1.4.0" -tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] } +pretty_assertions = "1.4.1" +tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] } unftp-sbe-fs = { path = "../libunftp/crates/unftp-sbe-fs" } [lints] diff --git a/README.md b/README.md index 28617f8c..96d18034 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ add. Here we choose the [file system back-end](https://crates.io/crates/unftp-sb ```toml [dependencies] -libunftp = "0.20.1" +libunftp = "0.20.2" 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 707e9198..62cfc833 100644 --- a/crates/unftp-auth-jsonfile/Cargo.toml +++ b/crates/unftp-auth-jsonfile/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "unftp-auth-jsonfile" -version = "0.3.4" +version = "0.3.5" description = "An authentication back-end for libunftp that authenticates against credentials in JSON format" authors = [ "Agoston Horvath ", @@ -18,24 +18,24 @@ repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-auth-j readme = "README.md" [dependencies] -async-trait = "0.1.80" +async-trait = "0.1.83" base64 = "0.21.7" -bytes = "1.6.0" -ipnet = "2.9.0" +bytes = "1.9.0" +ipnet = "2.10.1" iprange = "0.6.7" -libunftp = { version = "0.20.1", path = "../../" } +libunftp = { version = "0.20.2", path = "../../" } ring = "0.16.20" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" -tokio = { version = "1.38.0", features = ["rt", "time"] } -tracing = { version = "0.1.40", default-features = false } -tracing-attributes = "0.1.27" +serde = { version = "1.0.216", features = ["derive"] } +serde_json = "1.0.133" +tokio = { version = "1.42.0", features = ["rt", "time"] } +tracing = { version = "0.1.41", default-features = false } +tracing-attributes = "0.1.28" valid = "0.3.1" -flate2 = "1.0.30" +flate2 = "1.0.35" [dev-dependencies] pretty_env_logger = "0.5.0" -tokio = { version = "1.38.0", features = ["macros"] } +tokio = { version = "1.42.0", features = ["macros"] } unftp-sbe-fs = { version = "0.2.2", path = "../unftp-sbe-fs" } [lints] diff --git a/crates/unftp-auth-jsonfile/tests/main.rs b/crates/unftp-auth-jsonfile/tests/main.rs index 1d9579ce..8af46de3 100644 --- a/crates/unftp-auth-jsonfile/tests/main.rs +++ b/crates/unftp-auth-jsonfile/tests/main.rs @@ -1,3 +1,5 @@ +#![allow(missing_docs)] + use libunftp::auth::{Authenticator, DefaultUser}; use std::path::PathBuf; use unftp_auth_jsonfile::JsonFileAuthenticator; diff --git a/crates/unftp-auth-pam/Cargo.toml b/crates/unftp-auth-pam/Cargo.toml index a3901873..f46726e3 100644 --- a/crates/unftp-auth-pam/Cargo.toml +++ b/crates/unftp-auth-pam/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "unftp-auth-pam" -version = "0.2.5" +version = "0.2.6" description = "An authentication back-end for libunftp that authenticates using PAM" authors = [ "Agoston Horvath ", @@ -19,16 +19,16 @@ repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-auth-p readme = "README.md" [dependencies] -async-trait = "0.1.80" -libunftp = { version = "0.20.1", path = "../../" } -tracing = { version = "0.1.40", default-features = false } -tracing-attributes = "0.1.27" +async-trait = "0.1.83" +libunftp = { version = "0.20.2", path = "../../" } +tracing = { version = "0.1.41", default-features = false } +tracing-attributes = "0.1.28" [target.'cfg(target_family = "unix")'.dependencies] pam-auth = { package = "pam", version = "0.7.0" } [dev-dependencies] -tokio = { version = "1.38.0", features = ["macros"] } +tokio = { version = "1.42.0", features = ["macros"] } [lints] workspace = true diff --git a/crates/unftp-auth-rest/Cargo.toml b/crates/unftp-auth-rest/Cargo.toml index 405a0b98..3cdad97a 100644 --- a/crates/unftp-auth-rest/Cargo.toml +++ b/crates/unftp-auth-rest/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "unftp-auth-rest" -version = "0.2.6" +version = "0.2.7" description = "An authentication back-end for libunftp that consumes an HTTP API to authenticate" authors = [ "Agoston Horvath ", @@ -18,22 +18,22 @@ repository = "https://github.com/bolcom/libunftp/tree/hannes/crates/unftp-auth-r readme = "README.md" [dependencies] -async-trait = "0.1.80" -hyper = { version = "0.14.29", features = ["client", "runtime", "stream", "http1"] } +async-trait = "0.1.83" +hyper = { version = "0.14.31", features = ["client", "runtime", "stream", "http1"] } hyper-rustls = "0.24.2" -libunftp = { version = "0.20.1", path = "../../" } +libunftp = { version = "0.20.2", path = "../../" } percent-encoding = "2.3.1" -regex = "1.10.5" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" -tokio = { version = "1.38.0", features = ["rt", "net", "sync", "io-util", "time"] } -tracing = { version = "0.1.40", default-features = false } -tracing-attributes = "0.1.27" +regex = "1.11.1" +serde = { version = "1.0.216", features = ["derive"] } +serde_json = "1.0.133" +tokio = { version = "1.42.0", features = ["rt", "net", "sync", "io-util", "time"] } +tracing = { version = "0.1.41", default-features = false } +tracing-attributes = "0.1.28" [dev-dependencies] pretty_env_logger = "0.5.0" -tokio = { version = "1.38.0", features = ["macros"] } +tokio = { version = "1.42.0", features = ["macros"] } unftp-sbe-fs = { version = "0.2.2", path = "../unftp-sbe-fs" } [lints] diff --git a/crates/unftp-auth-rest/src/lib.rs b/crates/unftp-auth-rest/src/lib.rs index f0a8e504..761f9f3b 100644 --- a/crates/unftp-auth-rest/src/lib.rs +++ b/crates/unftp-auth-rest/src/lib.rs @@ -56,7 +56,6 @@ impl Builder { /// `with_body` . /// /// - pub fn new() -> Builder { Builder { ..Default::default() } } diff --git a/crates/unftp-sbe-fs/CHANGELOG.md b/crates/unftp-sbe-fs/CHANGELOG.md deleted file mode 100644 index 46d15cb8..00000000 --- a/crates/unftp-sbe-fs/CHANGELOG.md +++ /dev/null @@ -1,11 +0,0 @@ -# Changelog - -## 2021-05-22 unftp-sbe-fs 0.1.1 - -_tag: unftp-sbe-fs-0.1.1_ - -- Support for the SITE MD5 command has been added. For the Filesystem - backend it relies on the default libunftp implementation. Please - note that it needs to be explicitly enabled by passing one of the - `libunftp::options::SiteMd5` options to the `.sitemd5()` method of - the Server struct. diff --git a/crates/unftp-sbe-fs/Cargo.toml b/crates/unftp-sbe-fs/Cargo.toml index d6412ecd..ba60b84d 100644 --- a/crates/unftp-sbe-fs/Cargo.toml +++ b/crates/unftp-sbe-fs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "unftp-sbe-fs" -version = "0.2.5" +version = "0.2.6" description = "A storage back-end for libunftp, storing files on local disk" authors = [ "Agoston Horvath ", @@ -19,39 +19,39 @@ repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-sbe-fs readme = "README.md" [dependencies] -async-trait = "0.1.80" +async-trait = "0.1.83" cfg-if = "1.0" -cap-std = "3.1" -futures = { version = "0.3.30", default-features = false, features = ["std"] } -lazy_static = "1.4.0" -libunftp = { version = "0.20.1", path = "../../" } +cap-std = "3.4" +futures = { version = "0.3.31", default-features = false, features = ["std"] } +lazy_static = "1.5.0" +libunftp = { version = "0.20.2", path = "../../" } path_abs = "0.5.1" -tokio = { version = "1.38.0", features = ["rt", "net", "sync", "io-util", "time", "fs"] } -tokio-stream = "0.1.15" -tracing = { version = "0.1.40", default-features = false } -tracing-attributes = "0.1.27" +tokio = { version = "1.42.0", features = ["rt", "net", "sync", "io-util", "time", "fs"] } +tokio-stream = "0.1.17" +tracing = { version = "0.1.41", default-features = false } +tracing-attributes = "0.1.28" [dev-dependencies] async_ftp = "6.0.0" -async-trait = "0.1.80" -chrono = "0.4.0" +async-trait = "0.1.83" +chrono = "0.4.39" more-asserts = "0.3.1" nix = { version = "0.29.0", default-features = false, features = ["user"] } -pretty_assertions = "1.4.0" +pretty_assertions = "1.4.1" pretty_env_logger = "0.5.0" -regex = "1.10.5" +regex = "1.11.1" rstest = "0.18.2" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" +serde = { version = "1.0.216", features = ["derive"] } +serde_json = "1.0.133" slog-async = "2.8.0" slog-term = "2.9.1" -tempfile = "3.10.1" -tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] } -tracing-subscriber = "0.3.18" +tempfile = "3.14.0" +tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] } +tracing-subscriber = "0.3.19" getrandom = "0.2.15" [target.'cfg(target_os = "freebsd")'.dev-dependencies] -capsicum = { version = "0.4.2", features = ["casper"] } +capsicum = { version = "0.4.4", features = ["casper"] } capsicum-net = { version = "0.1.0", features = ["tokio"] } [lints] diff --git a/crates/unftp-sbe-fs/README.md b/crates/unftp-sbe-fs/README.md index 6fe60a85..0fd7731c 100644 --- a/crates/unftp-sbe-fs/README.md +++ b/crates/unftp-sbe-fs/README.md @@ -21,8 +21,8 @@ Add the libunftp and tokio crates to your project's dependencies in `Cargo.toml` ```toml [dependencies] -libunftp = "0.20.1" -unftp-sbe-fs = "0.2.5" +libunftp = "0.20.2" +unftp-sbe-fs = "0.2.6" tokio = { version = "1", features = ["full"] } ``` diff --git a/crates/unftp-sbe-fs/tests/main.rs b/crates/unftp-sbe-fs/tests/main.rs index 6af1d00d..1156c914 100644 --- a/crates/unftp-sbe-fs/tests/main.rs +++ b/crates/unftp-sbe-fs/tests/main.rs @@ -1,3 +1,5 @@ +#![allow(missing_docs)] + use async_ftp::{types::Result, FtpStream}; use libunftp::{auth::DefaultUser, options::FtpsRequired, ServerBuilder}; use pretty_assertions::assert_eq; diff --git a/crates/unftp-sbe-gcs/Cargo.toml b/crates/unftp-sbe-gcs/Cargo.toml index 513c61a8..69be444b 100644 --- a/crates/unftp-sbe-gcs/Cargo.toml +++ b/crates/unftp-sbe-gcs/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "unftp-sbe-gcs" description = "A storage back-end for libunftp, storing files in Google Cloud Storage (GCS)" -version = "0.2.6" +version = "0.2.7" authors = [ "Agoston Horvath ", "Dávid Kosztka ", @@ -18,38 +18,38 @@ repository = "https://github.com/bolcom/libunftp/tree/master/crates/unftp-sbe-gc readme = "README.md" [dependencies] -async-trait = "0.1.80" +async-trait = "0.1.83" base64 = "0.21.7" -bytes = "1.6.0" -chrono = { version = "0.4.38", default-features = false, features = ["std", "serde"] } -futures = { version = "0.3.30", default-features = false, features = ["std"] } -hyper = { version = "0.14.29", features = ["client", "runtime", "stream", "http1"] } +bytes = "1.9.0" +chrono = { version = "0.4.39", default-features = false, features = ["std", "serde"] } +futures = { version = "0.3.31", default-features = false, features = ["std"] } +hyper = { version = "0.14.31", features = ["client", "runtime", "stream", "http1"] } hyper-rustls = "0.24.2" -libunftp = { version = "0.20.1", path = "../../" } +libunftp = { version = "0.20.2", path = "../../" } mime = "0.3.17" percent-encoding = "2.3.1" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.117" -time = "0.3.36" -tokio = { version = "1.38.0", features = ["rt", "net", "sync", "io-util", "time", "fs"] } -tokio-stream = "0.1.15" -tokio-util = { version = "0.7.11", features = ["codec", "compat"] } -tracing = { version = "0.1.40", default-features = false } -tracing-attributes = "0.1.27" +serde = { version = "1.0.216", features = ["derive"] } +serde_json = "1.0.133" +time = "0.3.37" +tokio = { version = "1.42.0", features = ["rt", "net", "sync", "io-util", "time", "fs"] } +tokio-stream = "0.1.17" +tokio-util = { version = "0.7.13", features = ["codec", "compat"] } +tracing = { version = "0.1.41", default-features = false } +tracing-attributes = "0.1.28" yup-oauth2 = "8.3.2" [dev-dependencies] async_ftp = "6.0.0" clap = { version = "3.2.25", features = ["env"] } -lazy_static = "1.4.0" +lazy_static = "1.5.0" more-asserts = "0.3.1" path_abs = "0.5.1" -pretty_assertions = "1.4.0" +pretty_assertions = "1.4.1" pretty_env_logger = "0.5.0" slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_info"] } slog-async = "2.8.0" slog-stdlog = "4.1.1" slog-term = "2.9.1" -tempfile = "3.10.1" -tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] } -tracing-subscriber = "0.3.18" +tempfile = "3.14.0" +tokio = { version = "1.42.0", features = ["macros", "rt-multi-thread"] } +tracing-subscriber = "0.3.19" diff --git a/crates/unftp-sbe-gcs/README.md b/crates/unftp-sbe-gcs/README.md index 52104e08..2cb4c774 100644 --- a/crates/unftp-sbe-gcs/README.md +++ b/crates/unftp-sbe-gcs/README.md @@ -15,8 +15,8 @@ Add the needed dependencies to Cargo.toml: ```toml [dependencies] -libunftp = "0.20.1" -unftp-sbe-gcs = "0.2.6" +libunftp = "0.20.2" +unftp-sbe-gcs = "0.2.7" tokio = { version = "1", features = ["full"] } ``` diff --git a/crates/unftp-sbe-gcs/src/lib.rs b/crates/unftp-sbe-gcs/src/lib.rs index dc059cd5..53638ee6 100644 --- a/crates/unftp-sbe-gcs/src/lib.rs +++ b/crates/unftp-sbe-gcs/src/lib.rs @@ -9,7 +9,7 @@ //! //! ```toml //! [dependencies] -//! libunftp = "0.20.1" +//! libunftp = "0.20.2" //! unftp-sbe-gcs = "0.2.5" //! tokio = { version = "1", features = ["full"] } //! ``` diff --git a/src/lib.rs b/src/lib.rs index f2b210ab..80ac472d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/libunftp/0.20.1")] +#![doc(html_root_url = "https://docs.rs/libunftp/0.20.2")] //! libunftp is an extensible, async, cloud orientated FTP(S) server library. //! @@ -17,7 +17,7 @@ //! //! ```toml //! [dependencies] -//! libunftp = "0.20.1" +//! libunftp = "0.20.2" //! unftp-sbe-fs = "0.2.0" //! tokio = { version = "1", features = ["full"] } //! ``` diff --git a/src/server/ftpserver.rs b/src/server/ftpserver.rs index 875e061f..1a7ded56 100644 --- a/src/server/ftpserver.rs +++ b/src/server/ftpserver.rs @@ -274,7 +274,6 @@ where /// .ftps_client_auth(FtpsClientAuth::Require) /// .ftps_trust_store("/srv/unftp/trusted.pem"); /// ``` - pub fn ftps_client_auth(mut self, auth: C) -> Self where C: Into, diff --git a/tests/common.rs b/tests/common.rs index aa3f50b2..bc0341ac 100644 --- a/tests/common.rs +++ b/tests/common.rs @@ -1,3 +1,5 @@ +#![allow(missing_docs)] + use async_trait::async_trait; use lazy_static::*; use libunftp::auth::{AuthenticationError, Authenticator, Credentials, DefaultUser}; diff --git a/tests/pass_security.rs b/tests/pass_security.rs index 81858ed3..4c14104f 100644 --- a/tests/pass_security.rs +++ b/tests/pass_security.rs @@ -1,3 +1,5 @@ +#![allow(missing_docs)] + pub mod common; use std::io::Error; use tokio::net::TcpStream;