Never create un-listable directories

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/utils/tar.js b/lib/utils/tar.js
index 8ff2b01a6..1666325a5 100644
--- a/lib/utils/tar.js
+++ b/lib/utils/tar.js
@@ -205,6 +205,13 @@ function gunzTarPerm (tarball, tmp, dMode, fMode, uid, gid, cb) {
 
   var fst = fs.createReadStream(tarball)
 
+  function extractEntry (entry) {
+    // never create things that are user-unreadable,
+    // or dirs that are user-un-listable. Only leads to headaches.
+    entry.mode = entry.mode | (entry.type === "Directory" ? dMode : fMode)
+    entry.props.mode = entry.mode
+  }
+
   fst.on("error", log.er(cb, "error reading "+tarball))
   fst.on("data", function OD (c) {
     // detect what it is.
@@ -219,12 +226,14 @@ function gunzTarPerm (tarball, tmp, dMode, fMode, uid, gid, cb) {
         .pipe(zlib.Unzip())
         .on("error", log.er(cb, "unzip error "+tarball))
         .pipe(tar.Extract({ type: "Directory", path: tmp }))
+        .on("entry", extractEntry)
         .on("error", log.er(cb, "untar error "+tarball))
         .on("close", afterUntar)
     } else if (c.toString().match(/^package\//)) {
       // naked tar
       fst
         .pipe(tar.Extract({ type: "Directory", path: tmp }))
+        .on("entry", extractEntry)
         .on("error", log.er(cb, "untar error "+tarball))
         .on("close", afterUntar)
     } else {