Merge branch 'main' into dependabot/cargo/quick-xml-0.27

Cargo.toml

@@ -27,9 +27,20 @@ compress = ["async-compression"]
 trust-dns = ["reqwest/trust-dns"]
 
 # Enable rustls for TLS support
-rustls = ["reqwest/rustls-tls-native-roots", "ureq/tls", "ureq/native-certs"]
+rustls = [
+  "reqwest/rustls-tls-native-roots",
+  "ureq/tls",
+  "ureq/native-certs",
+  "suppaftp?/async-rustls",
+]
 # Enable native-tls for TLS support
-native-tls = ["reqwest/native-tls", "ureq/native-tls"]
+native-tls = [
+  "reqwest/native-tls",
+  "ureq/native-tls",
+  # Ideally, we need to use `suppaftp?/async-native-tls` here.
+  # But suppaftp's tls feature is not additive thus we can't use native here.
+  "suppaftp?/async-rustls",
+]
 # Enable vendored native-tls for TLS support
 native-tls-vendored = ["reqwest/native-tls-vendored", "ureq/native-tls"]
 
@@ -43,7 +54,7 @@ layers-tracing = ["tracing"]
 # Enable services hdfs support
 services-hdfs = ["hdrs"]
 # Enable services ftp support
-services-ftp = ["suppaftp", "bb8"]
+services-ftp = ["suppaftp", "bb8", "async-tls"]
 # Enable services ipfs support
 services-ipfs = ["prost"]
 # Enable services moka support
@@ -105,6 +116,7 @@ async-compression = { package = "async-compression-issue-150-workaround", versio
   "futures-io",
   "all-algorithms",
 ], optional = true }
+async-tls = { version = "0.11", optional = true }
 async-trait = "0.1"
 backon = "0.2"
 base64 = "0.20"
@@ -138,7 +150,9 @@ reqwest = { version = "0.11", features = [
 rocksdb = { version = "0.19", optional = true }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-suppaftp = { version = "=4.4", features = ["async-secure"], optional = true }
+suppaftp = { version = "4.5", default-features = false, features = [
+  "async-secure",
+], optional = true }
 time = { version = "0.3", features = ["serde"] }
 tokio = { version = "1.20", features = ["fs"] }
 tracing = { version = "0.1", optional = true }

src/services/ftp/backend.rs

@@ -18,20 +18,21 @@ use std::fmt::Formatter;
 use std::str;
 use std::str::FromStr;
 
+use async_tls::TlsConnector;
 use async_trait::async_trait;
 use bb8::PooledConnection;
 use bb8::RunError;
 use futures::io::copy;
 use futures::AsyncReadExt;
 use http::Uri;
 use log::debug;
-use suppaftp::async_native_tls::TlsConnector;
 use suppaftp::list::File;
 use suppaftp::types::FileType;
 use suppaftp::types::Response;
 use suppaftp::FtpError;
 use suppaftp::FtpStream;
 use suppaftp::Status;
+
 use time::OffsetDateTime;
 use tokio::sync::OnceCell;
 
@@ -209,7 +210,7 @@ impl bb8::ManageConnection for Manager {
         // switch to secure mode if ssl/tls is on.
         let mut ftp_stream = if self.enable_secure {
             stream
-                .into_secure(TlsConnector::new(), &self.endpoint)
+                .into_secure(TlsConnector::default().into(), &self.endpoint)
                 .await?
         } else {
             stream