Release 0.12.7, includes update to latest libunftp with split extensions

Author: hannesdejager

.travis.yml

@@ -20,9 +20,9 @@ before_script:
   - if $DEPLOY; then rustup target add x86_64-unknown-linux-musl; fi
 
 script:
-  - cargo build --verbose --all --features rest_auth,jsonfile_auth,cloud_storage
-  - cargo test --verbose --all --features rest_auth,jsonfile_auth,cloud_storage
-  - if $DEPLOY; then cargo test --verbose --all --all-features --target=x86_64-unknown-linux-musl; else true; fi
+  - cargo build --verbose --workspace --features rest_auth,jsonfile_auth,cloud_storage
+  - cargo test --verbose --workspace --features rest_auth,jsonfile_auth,cloud_storage
+  - if $DEPLOY; then cargo test --verbose --workspace --all-features --target=x86_64-unknown-linux-musl; else true; fi
   - if $DEPLOY; then make docker-image; else true; fi
 
 deploy:

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "unftp"
-version = "0.12.6"
+version = "0.12.7"
 authors = [
     "Agoston Horvath <[email protected]>",
     "Dávid Kosztka <[email protected]>",
@@ -33,19 +33,27 @@ futures = "0.3.13"
 http = "0.2.3"
 hyper = { version = "0.14.4", features = ["server", "http1"] }
 lazy_static = "1.4.0"
-libunftp = "0.16.2"
-prometheus = "0.11.0"
+libunftp = "0.17.0"
+prometheus = "0.12.0"
 slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_info"] }
 slog-async = "2.6.0"
 slog-term = "2.8.0"
-tokio = { version = "1.2.0", features = ["full"] }
+tokio = { version = "1.4.0", features = ["full"] }
+unftp-sbe-fs = "0.1"
+unftp-sbe-gcs = { version = "0.1", optional = true }
+unftp-auth-rest = { version = "0.1", optional = true }
+unftp-auth-jsonfile = { version = "0.1", optional = true }
+
+[target.'cfg(unix)'.dependencies]
+unftp-auth-pam = { version = "0.1", optional = true }
 
 [features]
 all = ["pam_auth", "rest_auth", "jsonfile_auth", "cloud_storage"]
-cloud_storage = ["libunftp/cloud_storage"]
-jsonfile_auth = ["libunftp/jsonfile_auth"]
-pam_auth = ["libunftp/pam_auth"]
-rest_auth = ["libunftp/rest_auth"]
+cloud_storage = ["unftp-sbe-gcs"]
+jsonfile_auth = ["unftp-auth-jsonfile"]
+pam_auth = ["unftp-auth-pam"]
+rest_auth = ["unftp-auth-rest"]
+
 
 # build everything by default to make sure build works
 default = ["rest_auth", "cloud_storage", "jsonfile_auth"]

Cargo.toml

@@ -1,4 +1,4 @@
-RUST_VERSION=1.50.0
+RUST_VERSION=1.51.0
 DOCKER_TAG=$(shell git describe --tags)
 DOCKER_TEMPLATES:=$(wildcard *.Dockerfile.template)
 DOCKER_FILES=$(DOCKER_TEMPLATES:%.template=%)
@@ -62,8 +62,8 @@ docker-list: # List the available docker images
 pr-prep: # Runs checks to ensure you're ready for a pull request
 	cargo fmt --all -- --check
 	cargo clippy --all-features -- -D warnings
-	cargo build --verbose --all --features rest_auth,jsonfile_auth,cloud_storage
-	cargo test --verbose --all --features rest_auth,jsonfile_auth,cloud_storage
+	cargo build --verbose --all --all-features
+	cargo test --verbose --all --all-features
 	cargo doc --all-features --no-deps
 
 .PHONY: release-artifacts

Makefile

@@ -12,9 +12,6 @@ homepage = "https://github.com/bolcom/unFTP/tree/master/crates/redislog"
 repository = "https://github.com/bolcom/unFTP/tree/master/crates/redislog"
 readme = "README.md"
 
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 chrono = "0.4.6"
 r2d2 = "0.8.3"

crates/redislog/Cargo.toml

@@ -30,11 +30,11 @@ use tokio::{
     runtime::Runtime,
     signal::unix::{signal, SignalKind},
 };
+use unftp_sbe_gcs::options::AuthMethod;
 use user::LookupAuthenticator;
 
 #[cfg(feature = "pam_auth")]
-use libunftp::auth::pam;
-use libunftp::storage::cloud_storage::options::AuthMethod;
+use unftp_auth_pam as pam;
 
 fn make_auth(m: &clap::ArgMatches) -> Result<Arc<dyn auth::Authenticator<user::User> + Send + Sync>, String> {
     match m.value_of(args::AUTH_TYPE) {
@@ -60,7 +60,7 @@ fn make_pam_auth(m: &clap::ArgMatches) -> Result<Arc<dyn auth::Authenticator<use
     #[cfg(feature = "pam_auth")]
     {
         if let Some(service) = m.value_of(args::AUTH_PAM_SERVICE) {
-            let pam_auth = pam::PAMAuthenticator::new(service);
+            let pam_auth = pam::PamAuthenticator::new(service);
             return Ok(Arc::new(LookupAuthenticator::new(pam_auth)));
         }
         Err(format!("--{} is required when using pam auth", args::AUTH_PAM_SERVICE))
@@ -88,7 +88,7 @@ fn make_rest_auth(m: &clap::ArgMatches) -> Result<Arc<dyn auth::Authenticator<us
                     return Err("REST authenticator error: no body provided for rest request".to_string());
                 }
 
-                let authenticator: auth::rest::RestAuthenticator = match auth::rest::Builder::new()
+                let authenticator: unftp_auth_rest::RestAuthenticator = match unftp_auth_rest::Builder::new()
                     .with_username_placeholder("{USER}".to_string())
                     .with_password_placeholder("{PASS}".to_string())
                     .with_url(String::from(url))
@@ -124,17 +124,17 @@ fn make_json_auth(m: &clap::ArgMatches) -> Result<Arc<dyn auth::Authenticator<us
             .value_of(args::AUTH_JSON_PATH)
             .ok_or_else(|| "please provide the json credentials file by specifying auth-json-path".to_string())?;
 
-        let authenticator = auth::jsonfile::JsonFileAuthenticator::new(path).map_err(|e| e.to_string())?;
+        let authenticator = unftp_auth_jsonfile::JsonFileAuthenticator::new(path).map_err(|e| e.to_string())?;
         Ok(Arc::new(LookupAuthenticator::new(authenticator)))
     }
 }
 
 // Creates the filesystem storage back-end
-fn fs_storage_backend(log: &Logger, m: &clap::ArgMatches) -> Box<dyn (Fn() -> storage::StorageBE) + Send + Sync> {
+fn fs_storage_backend(log: &Logger, m: &clap::ArgMatches) -> Box<dyn (Fn() -> storage::StorageBe) + Send + Sync> {
     let p: PathBuf = m.value_of(args::ROOT_DIR).unwrap().into();
     let sub_log = Arc::new(log.new(o!("module" => "storage")));
-    Box::new(move || storage::StorageBE {
-        inner: storage::InnerStorage::File(libunftp::storage::filesystem::Filesystem::new(p.clone())),
+    Box::new(move || storage::StorageBe {
+        inner: storage::InnerStorage::File(unftp_sbe_fs::Filesystem::new(p.clone())),
         log: sub_log.clone(),
     })
 }
@@ -143,7 +143,7 @@ fn fs_storage_backend(log: &Logger, m: &clap::ArgMatches) -> Box<dyn (Fn() -> st
 fn gcs_storage_backend(
     log: &Logger,
     m: &clap::ArgMatches,
-) -> Result<Box<dyn (Fn() -> storage::StorageBE) + Send + Sync>, String> {
+) -> Result<Box<dyn (Fn() -> storage::StorageBe) + Send + Sync>, String> {
     let bucket: String = m
         .value_of(args::GCS_BUCKET)
         .ok_or_else(|| format!("--{} is required when using storage type gcs", args::GCS_BUCKET))?
@@ -177,8 +177,8 @@ fn gcs_storage_backend(
     slog::info!(log, "GCS back-end auth method: {}", auth_method);
 
     let sub_log = Arc::new(log.new(o!("module" => "storage")));
-    Ok(Box::new(move || storage::StorageBE {
-        inner: storage::InnerStorage::Cloud(libunftp::storage::cloud_storage::CloudStorage::with_api_base(
+    Ok(Box::new(move || storage::StorageBe {
+        inner: storage::InnerStorage::Cloud(unftp_sbe_gcs::CloudStorage::with_api_base(
             base_url.clone(),
             bucket.clone(),
             root_dir.clone(),
@@ -220,12 +220,12 @@ fn get_passive_host_option(log: &Logger, arg_matches: &ArgMatches) -> Result<opt
     match passive_host_str {
         None | Some("from-connection") => Ok(options::PassiveHost::FromConnection),
         Some(ip_or_dns) => match ip_or_dns.parse() {
-            Ok(IpAddr::V4(ip)) => Ok(options::PassiveHost::IP(ip)),
+            Ok(IpAddr::V4(ip)) => Ok(options::PassiveHost::Ip(ip)),
             Ok(IpAddr::V6(_)) => Err(format!(
                 "an IP is valid for the '--{}' argument, but it needs to be an IP v4 address",
                 args::PASSIVE_HOST
             )),
-            Err(_) => resolve_dns(log, ip_or_dns).map(options::PassiveHost::IP),
+            Err(_) => resolve_dns(log, ip_or_dns).map(options::PassiveHost::Ip),
         },
     }
 }