Using libunftp 0.12.0

Author: hannesdejager

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "unftp"
-version = "0.11.0"
+version = "0.12.0"
 authors = [
     "Agoston Horvath <[email protected]>",
     "Dávid Kosztka <[email protected]>",
@@ -18,7 +18,7 @@ readme = "README.md"
 
 [dependencies]
 async-trait = "0.1.37"
-libunftp = {git = "https://github.com/bolcom/libunftp.git", rev = "e4ef636ecf8f5ba31ec083bb15f288f31e05ffb2"}
+libunftp = "0.12.0"
 redis = "0.9.0"
 serde_json = "1.0.57"
 chrono = "0.4.6"

Cargo.toml

@@ -251,7 +251,6 @@ fn start_ftp_with_storage<S>(
 ) -> Result<(), String>
 where
     S: StorageBackend<user::User> + Send + Sync + 'static,
-    S::File: tokio::io::AsyncRead + Send + Sync,
     S::Metadata: Sync + Send,
 {
     let addr = String::from(arg_matches.value_of(args::BIND_ADDRESS).unwrap());

src/main.rs

@@ -6,7 +6,6 @@ use std::fmt::Debug;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::SystemTime;
-use tokio::io::AsyncRead;
 
 #[derive(Debug)]
 pub enum InnerStorage {
@@ -90,7 +89,6 @@ impl StorageBE {
 
 #[async_trait]
 impl StorageBackend<User> for StorageBE {
-    type File = Box<dyn AsyncRead + Sync + Send + Unpin>;
     type Metadata = SBEMeta;
 
     async fn metadata<P: AsRef<Path> + Send + Debug>(&self, user: &Option<User>, path: P) -> Result<Self::Metadata> {
@@ -134,11 +132,11 @@ impl StorageBackend<User> for StorageBE {
         user: &Option<User>,
         path: P,
         start_pos: u64,
-    ) -> Result<Self::File> {
+    ) -> Result<Box<dyn tokio::io::AsyncRead + Send + Sync + Unpin>> {
         slog::info!(self.log(user, &path), "Client requested to retrieve a file");
         match &self.inner {
-            InnerStorage::Cloud(i) => i.get(user, path, start_pos).await.map(castc),
-            InnerStorage::File(i) => i.get(user, path, start_pos).await.map(castf),
+            InnerStorage::Cloud(i) => i.get(user, path, start_pos).await,
+            InnerStorage::File(i) => i.get(user, path, start_pos).await,
         }
     }
 
@@ -197,11 +195,3 @@ impl StorageBackend<User> for StorageBE {
         }
     }
 }
-
-fn castf(f: tokio::io::BufReader<tokio::fs::File>) -> Box<dyn AsyncRead + Sync + Send + Unpin> {
-    Box::new(f)
-}
-
-fn castc(f: libunftp::storage::cloud_storage::object::Object) -> Box<dyn AsyncRead + Sync + Send + Unpin> {
-    Box::new(f)
-}

src/storage.rs

@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use libunftp::auth::{AuthenticationError, DefaultUser, UserDetail};
+use libunftp::auth::{DefaultUser, UserDetail};
 use std::fmt::Formatter;
 
 #[derive(Debug, PartialEq)]
@@ -49,7 +49,11 @@ impl LookupAuthenticator {
 
 #[async_trait]
 impl libunftp::auth::Authenticator<User> for LookupAuthenticator {
-    async fn authenticate(&self, username: &str, password: &str) -> Result<User, AuthenticationError> {
+    async fn authenticate(
+        &self,
+        username: &str,
+        password: &str,
+    ) -> Result<User, Box<dyn std::error::Error + Send + Sync>> {
         self.inner.authenticate(username, password).await?;
         // TODO: User successfully authenticated, now lookup user details from repository e.g. PostgreSql
         Ok(User {