add strip password flag (#33)

* add strip password flag

* fix pack test

* prevent strip if flag is not set

* use set password

* None instead of Some()

* change to no_strip_password and use context for errors

* change to no_strip_password and use context for errors

* cleaner handling of password stipping

* fix formatting

---------

Co-authored-by: Muhamad Azamy <muhamad@incubaid.com>

Author: rawdaGastan

src/lib.rs

@@ -64,7 +64,7 @@ mod test {
         store.add(0x00, 0x7f, Box::new(store0));
         store.add(0x80, 0xff, Box::new(store1));
 
-        pack(writer, store, &source).await.unwrap();
+        pack(writer, store, &source, false).await.unwrap();
 
         println!("packing complete");
         // recreate the stores for reading.

src/main.rs

@@ -67,6 +67,11 @@ struct PackOptions {
     #[clap(short, long, action=ArgAction::Append)]
     store: Vec<String>,
 
+		/// no_strip_password strips password from store url, otherwise password will be stored in the fl and then shipped
+		/// some stores like ZDB has a public namespace which means writing requires a password
+		#[clap(long, default_value_t = false)]
+    no_strip_password: bool,
+
     /// target directory to upload
     target: String,
 }
@@ -120,7 +125,7 @@ fn pack(opts: PackOptions) -> Result<()> {
     rt.block_on(async move {
         let store = parse_router(opts.store.as_slice()).await?;
         let meta = fungi::Writer::new(opts.meta).await?;
-        rfs::pack(meta, store, opts.target).await?;
+        rfs::pack(meta, store, opts.target, !opts.no_strip_password).await?;
 
         Ok(())
     })

src/pack.rs

@@ -18,16 +18,33 @@ struct Item(Ino, PathBuf, OsString, Metadata);
 /// it's logically incorrect to store multiple filessytem in the same FL.
 /// All file chunks will then be uploaded to the provided store
 ///
-pub async fn pack<P: Into<PathBuf>, S: Store>(writer: Writer, store: S, root: P) -> Result<()> {
+pub async fn pack<P: Into<PathBuf>, S: Store>(
+    writer: Writer,
+    store: S,
+    root: P,
+    strip_password: bool,
+) -> Result<()> {
     use tokio::fs;
 
     // building routing table from store information
     for route in store.routes() {
+        let mut store_url = route.url;
+
+        if strip_password {
+            let mut url = url::Url::parse(&store_url).context("failed to parse store url")?;
+            if url.password().is_some() {
+                url.set_password(None)
+                    .map_err(|_| anyhow::anyhow!("failed to strip password"))?;
+
+                store_url = url.to_string();
+            }
+        }
+
         writer
             .route(
                 route.start.unwrap_or(u8::MIN),
                 route.end.unwrap_or(u8::MAX),
-                route.url,
+                store_url,
             )
             .await?;
     }