chore(release): version v0.13.2

close #19

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.13.2] - 2022-06-06
+
+### Bug Fixes
+
+- Filename xml escaping
+- Escape path-prefix/url-prefix different
+
+## [0.13.1] - 2022-06-05
+
+### Bug Fixes
+
+- Escape filename ([#21](https://github.com/sigoden/duf/issues/21))
+
+### Refactor
+
+- Use logger ([#22](https://github.com/sigoden/duf/issues/22))
+
 ## [0.13.0] - 2022-06-05
 
 ### Bug Fixes

Cargo.lock

@@ -286,18 +286,20 @@ dependencies = [
 
 [[package]]
 name = "duf"
-version = "0.13.0"
+version = "0.13.2"
 dependencies = [
  "async-walkdir",
  "async_zip",
  "base64",
  "chrono",
  "clap",
+ "env_logger",
  "futures",
  "get_if_addrs",
  "headers",
  "hyper",
  "lazy_static",
+ "log",
  "md5",
  "mime_guess",
  "percent-encoding",
@@ -309,7 +311,19 @@ dependencies = [
  "tokio-rustls",
  "tokio-stream",
  "tokio-util",
+ "urlencoding",
  "uuid",
+ "xml-rs",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+dependencies = [
+ "humantime",
+ "log",
 ]
 
 [[package]]
@@ -572,6 +586,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "0.14.19"
@@ -1154,6 +1174,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "urlencoding"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821"
+
 [[package]]
 name = "uuid"
 version = "1.1.1"
@@ -1343,6 +1369,12 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
 
+[[package]]
+name = "xml-rs"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
+
 [[package]]
 name = "xz2"
 version = "0.1.6"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "duf"
-version = "0.13.0"
+version = "0.13.2"
 edition = "2021"
 authors = ["sigoden <sigoden@gmail.com>"]
 description = "Duf is a simple file server."
@@ -34,6 +34,10 @@ rustls-pemfile = "1"
 md5 = "0.7.0"
 lazy_static = "1.4.0"
 uuid = { version = "1.1.1", features = ["v4", "fast-rng"] }
+urlencoding = "2.1.0"
+xml-rs = "0.8"
+env_logger = { version = "0.9.0", default-features = false, features = ["humantime"] }
+log = "0.4.17"
 
 [profile.release]
 lto = true

src/main.rs

@@ -2,8 +2,14 @@ mod args;
 mod auth;
 mod server;
 
+#[macro_use]
+extern crate log;
+
 pub type BoxResult<T> = Result<T, Box<dyn std::error::Error>>;
 
+use std::env;
+use std::io::Write;
+
 use crate::args::{matches, Args};
 use crate::server::serve;
 
@@ -13,6 +19,16 @@ async fn main() {
 }
 
 async fn run() -> BoxResult<()> {
+    if env::var("RUST_LOG").is_err() {
+        env::set_var("RUST_LOG", "info")
+    }
+    env_logger::builder()
+        .format(|buf, record| {
+            let timestamp = buf.timestamp();
+            writeln!(buf, "[{} {}] {}", timestamp, record.level(), record.args())
+        })
+        .init();
+
     let args = Args::parse(matches())?;
     tokio::select! {
         ret = serve(args) => {

src/server.rs

@@ -1,10 +1,11 @@
 use crate::auth::{generate_www_auth, valid_digest};
 use crate::{Args, BoxResult};
+use xml::escape::escape_str_pcdata;
 
 use async_walkdir::WalkDir;
 use async_zip::write::{EntryOptions, ZipFileWriter};
 use async_zip::Compression;
-use chrono::{Local, TimeZone, Utc};
+use chrono::{TimeZone, Utc};
 use futures::stream::StreamExt;
 use futures::TryStreamExt;
 use get_if_addrs::get_if_addrs;
@@ -120,20 +121,16 @@ impl InnerService {
         let uri = req.uri().clone();
         let cors = self.args.cors;
 
-        let timestamp = Local::now().format("%d/%b/%Y %H:%M:%S");
         let mut res = match self.handle(req).await {
             Ok(res) => {
-                println!(r#"[{}] "{} {}" - {}"#, timestamp, method, uri, res.status());
+                info!(r#""{} {}" - {}"#, method, uri, res.status());
                 res
             }
             Err(err) => {
                 let mut res = Response::default();
                 let status = StatusCode::INTERNAL_SERVER_ERROR;
                 status!(res, status);
-                eprintln!(
-                    r#"[{}] "{} {}" - {} {}"#,
-                    timestamp, method, uri, status, err
-                );
+                error!(r#""{} {}" - {} {}"#, method, uri, status, err);
                 res
             }
         };
@@ -363,14 +360,18 @@ impl InnerService {
         let path = path.to_owned();
         tokio::spawn(async move {
             if let Err(e) = zip_dir(&mut writer, &path).await {
-                eprintln!("Failed to zip {}, {}", path.display(), e);
+                error!("Failed to zip {}, {}", path.display(), e);
             }
         });
         let stream = ReaderStream::new(reader);
         *res.body_mut() = Body::wrap_stream(stream);
         res.headers_mut().insert(
             CONTENT_DISPOSITION,
-            HeaderValue::from_str(&format!("attachment; filename=\"{}.zip\"", filename,)).unwrap(),
+            HeaderValue::from_str(&format!(
+                "attachment; filename=\"{}.zip\"",
+                encode_uri(filename),
+            ))
+            .unwrap(),
         );
         Ok(())
     }
@@ -821,7 +822,10 @@ impl PathItem {
 <D:status>HTTP/1.1 200 OK</D:status>
 </D:propstat>
 </D:response>"#,
-                prefix, self.name, self.base_name, mtime
+                escape_str_pcdata(prefix),
+                escape_str_pcdata(&self.name),
+                escape_str_pcdata(&self.base_name),
+                mtime
             ),
             PathType::File | PathType::SymlinkFile => format!(
                 r#"<D:response>
@@ -836,9 +840,9 @@ impl PathItem {
 <D:status>HTTP/1.1 200 OK</D:status>
 </D:propstat>
 </D:response>"#,
-                prefix,
-                self.name,
-                self.base_name,
+                escape_str_pcdata(prefix),
+                escape_str_pcdata(&self.name),
+                escape_str_pcdata(&self.base_name),
                 self.size.unwrap_or_default(),
                 mtime
             ),
@@ -971,7 +975,7 @@ fn to_content_range(range: &Range, complete_length: u64) -> Option<ContentRange>
 }
 
 fn print_listening(address: &str, port: u16, prefix: &str, tls: bool) {
-    let prefix = prefix.trim_end_matches('/');
+    let prefix = encode_uri(prefix.trim_end_matches('/'));
     let addrs = retrieve_listening_addrs(address);
     let protocol = if tls { "https" } else { "http" };
     if addrs.len() == 1 {
@@ -1002,3 +1006,8 @@ fn retrieve_listening_addrs(address: &str) -> Vec<String> {
     }
     vec![address.to_owned()]
 }
+
+fn encode_uri(v: &str) -> String {
+    let parts: Vec<_> = v.split('/').map(urlencoding::encode).collect();
+    parts.join("/")
+}