From 4b3b4fda44b0bbe6eb3495983d22e942b76127c4 Mon Sep 17 00:00:00 2001
From: Mathijs van de Nes <git@mathijs.vd-nes.nl>
Date: Mon, 13 Oct 2014 22:46:21 +0200
Subject: [PATCH] Fix ../ in paths and add folder support

---
 src/bin/extract.rs      | 56 +++++++++++++++++++++++++++++++++--------
 src/bin/write_sample.rs |  8 ++++++
 2 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/bin/extract.rs b/src/bin/extract.rs
index bd7b3e87..cfec8953 100644
--- a/src/bin/extract.rs
+++ b/src/bin/extract.rs
@@ -3,26 +3,60 @@ extern crate zip;
 fn main()
 {
     let args = std::os::args();
+    if args.len() < 2 {
+        println!("Usage: {} <filename>", args[0]);
+        std::os::set_exit_status(1);
+        return;
+    }
     let fname = Path::new(args[1].as_slice());
-    let file = std::io::File::open(&fname);
+    let file = std::io::File::open(&fname).unwrap();
 
     let zipcontainer = zip::ZipReader::new(file).unwrap();
 
     for file in zipcontainer.files()
     {
-        println!("{}", file.file_name);
+        let outpath = sanitize_filename(file.file_name.as_slice());
+        println!("{}", outpath.display());
+
         let comment = &file.file_comment;
         if comment.len() > 0 { println!("  File comment: {}", comment); }
 
-        if file.uncompressed_size == 0 { continue }
+        std::io::fs::mkdir_recursive(&outpath.dir_path(), std::io::USER_DIR).unwrap();
 
-        let outpath = Path::new(file.file_name.as_slice());
-        let dirname = Path::new(outpath.dirname());
-
-        std::io::fs::mkdir_recursive(&dirname, std::io::USER_DIR).unwrap();
-
-        let mut outfile = std::io::File::create(&outpath);
-        let mut reader = zipcontainer.read_file(file);
-        std::io::util::copy(&mut reader, &mut outfile).unwrap();
+        if file.file_name.as_slice().ends_with("/") {
+            create_directory(outpath);
+        }
+        else {
+            write_file(&zipcontainer, file, outpath);
+        }
     }
 }
+
+fn write_file(zipcontainer: &zip::ZipReader<std::io::File>, file: &zip::ZipFile, outpath: Path)
+{
+    let mut outfile = std::io::File::create(&outpath);
+    let mut reader = zipcontainer.read_file(file);
+    std::io::util::copy(&mut reader, &mut outfile).unwrap();
+    std::io::fs::chmod(&outpath, std::io::USER_FILE).unwrap();
+}
+
+fn create_directory(outpath: Path)
+{
+    std::io::fs::mkdir_recursive(&outpath, std::io::USER_DIR).unwrap();
+}
+
+fn sanitize_filename(filename: &str) -> Path
+{
+    let no_null_filename = match filename.find('\0') {
+        Some(index) => filename.slice_to(index),
+        None => filename,
+    };
+
+    Path::new(no_null_filename)
+        .components()
+        .skip_while(|component| *component == b"..")
+        .fold(Path::new(""), |mut p, cur| {
+            p.push(cur);
+            p
+        })
+}
diff --git a/src/bin/write_sample.rs b/src/bin/write_sample.rs
index 4c25f4e6..d20a88be 100644
--- a/src/bin/write_sample.rs
+++ b/src/bin/write_sample.rs
@@ -3,6 +3,12 @@ extern crate zip;
 fn main()
 {
     let args = std::os::args();
+    if args.len() < 2 {
+        println!("Usage: {} <filename>", args[0]);
+        std::os::set_exit_status(1);
+        return;
+    }
+
     let filename = args[1].as_slice();
     match doit(filename)
     {
@@ -18,6 +24,8 @@ fn doit(filename: &str) -> std::io::IoResult<()>
 
     let mut zip = zip::ZipWriter::new(file);
 
+    try!(zip.start_file("test/", zip::compression::Stored));
+
     try!(zip.start_file("test/☃.txt", zip::compression::Stored));
     try!(zip.write(b"Hello, World!\n"));