Skip to content
This repository has been archived by the owner on Aug 11, 2022. It is now read-only.

Commit

Permalink
Fix #2230 Unpack in place. No folder renaming malarky
Browse files Browse the repository at this point in the history 
@igorzi Please test on windows UNC paths.
  • Loading branch information
@isaacs
isaacs committed Mar 13, 2012
1 parent d7ea7d0 commit cc0a00e
Showing 1 changed file with 56 additions and 112 deletions.
168 changes: 56 additions & 112 deletions lib/utils/tar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ var npm = require("../npm.js")
, zlib = require("zlib")
, fstream = require("fstream")

if (process.env.SUDO_UID && myUid === 0) {
if (!isNaN(process.env.SUDO_UID)) myUid = +process.env.SUDO_UID
if (!isNaN(process.env.SUDO_GID)) myGid = +process.env.SUDO_GID
}

exports.pack = pack
exports.unpack = unpack
exports.makeList = makeList
Expand Down Expand Up @@ -143,39 +148,26 @@ function unpack_ ( tarball, unpackTarget, dMode, fMode, uid, gid, cb ) {
// rename that to /path/to/foo, and delete /path/to/.foo.npm
var parent = path.dirname(unpackTarget)
, base = path.basename(unpackTarget)
, tmp = path.resolve(parent, "___" + base + ".npm")

mkdir(tmp, dMode || npm.modes.exec, uid, gid, function (er) {
log.verbose([uid, gid], "unpack_ uid, gid")
log.verbose(unpackTarget, "unpackTarget")
if (er) return log.er(cb, "Could not create "+tmp)(er)
// cp the gzip of the tarball, pipe the stdout into tar's stdin
// gzip {tarball} --decompress --stdout \
// | tar -mvxpf - --strip-components=1 -C {unpackTarget}
gunzTarPerm( tarball, tmp
, dMode, fMode
, uid, gid
, function (er, folder) {

rm(unpackTarget, function (er) {
if (er) return cb(er)

mkdir(unpackTarget, dMode || npm.modes.exec, uid, gid, function (er) {
log.verbose([uid, gid], "unpack_ uid, gid")
log.verbose(unpackTarget, "unpackTarget")
if (er) return cb(er)
log.verbose(folder, "gunzed")

rm(unpackTarget, function (er) {
// cp the gzip of the tarball, pipe the stdout into tar's stdin
// gzip {tarball} --decompress --stdout \
// | tar -mvxpf - --strip-components=1 -C {unpackTarget}
gunzTarPerm( tarball, unpackTarget
, dMode, fMode
, uid, gid
, function (er, folder) {
if (er) return cb(er)
log.verbose(unpackTarget, "rm'ed")

moveIntoPlace(folder, unpackTarget, function (er) {
if (er) return cb(er)
log.verbose([folder, unpackTarget], "renamed")
// curse you, nfs! It will lie and tell you that the
// mv is done, when in fact, it isn't. In theory,
// reading the file should cause it to wait until it's done.
readJson( path.resolve(unpackTarget, "package.json")
, function (er, data) {
// now we read the json, so we know it's there.
rm(tmp, function (er2) { cb(er || er2, data) })
})
})
})
log.verbose(folder, "gunzed")
readJson(path.resolve(folder, "package.json"), cb)
})
})
})
}
Expand All @@ -198,20 +190,45 @@ function moveIntoPlace (folder, unpackTarget, cb) {
}


function gunzTarPerm (tarball, tmp, dMode, fMode, uid, gid, cb) {
function gunzTarPerm (tarball, target, dMode, fMode, uid, gid, cb_) {
if (!dMode) dMode = npm.modes.exec
if (!fMode) fMode = npm.modes.file
log.silly([dMode.toString(8), fMode.toString(8)], "gunzTarPerm modes")

var cbCalled = false
function cb (er) {
if (cbCalled) return
cbCalled = true
cb_(er, target)
}

var fst = fs.createReadStream(tarball)

// figure out who we're supposed to be, if we're not pretending
// to be a specific user.
if (npm.config.get("unsafe-perm") && process.platform !== "win32") {
uid = myUid
gid = myGid
}

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.mode = entry.mode & (~npm.modes.umask)
entry.props.mode = entry.mode

// if there's a specific owner uid/gid that we want, then set that
if (process.platform !== "win32" &&
typeof uid === "number" &&
typeof gid === "number") {
entry.props.uid = entry.uid = uid
entry.props.gid = entry.gid = gid
}
}

var extractOpts = { type: "Directory", path: target, strip: 1 }

fst.on("error", log.er(cb, "error reading "+tarball))
fst.on("data", function OD (c) {
// detect what it is.
Expand All @@ -221,37 +238,34 @@ function gunzTarPerm (tarball, tmp, dMode, fMode, uid, gid, cb) {
if (c[0] === 0x1F &&
c[1] === 0x8B &&
c[2] === 0x08) {
var extracter = tar.Extract({ type: "Directory", path: tmp })
var extracter = tar.Extract(extractOpts)
fst
.pipe(zlib.Unzip())
.on("error", log.er(cb, "unzip error "+tarball))
.pipe(tar.Extract({ type: "Directory", path: tmp }))
.pipe(tar.Extract(extractOpts))
.on("entry", extractEntry)
.on("error", log.er(cb, "untar error "+tarball))
.on("close", afterUntar)
.on("close", cb)
} else if (c.toString().match(/^package\//)) {
// naked tar
fst
.pipe(tar.Extract({ type: "Directory", path: tmp }))
.pipe(tar.Extract(extractOpts))
.on("entry", extractEntry)
.on("error", log.er(cb, "untar error "+tarball))
.on("close", afterUntar)
.on("close", cb)
} else {
// naked js file
fst
.pipe(fstream.Writer({ path: path.resolve(tmp, "package/index.js") }))
.pipe(fstream.Writer({ path: path.resolve(target, "index.js") }))
.on("error", log.er(cb, "copy error "+tarball))
.on("close", function () {
var j = path.resolve(tmp, "package/package.json")
var j = path.resolve(target, "package.json")
readJson(j, function (er, d) {
if (er) {
log.error(tarball, "Not a package")
return cb(er)
}
fs.writeFile(j, JSON.stringify(d) + "\n", function (er) {
if (er) return cb(er)
return afterUntar()
})
fs.writeFile(j, JSON.stringify(d) + "\n", cb)
})
})
}
Expand All @@ -260,76 +274,6 @@ function gunzTarPerm (tarball, tmp, dMode, fMode, uid, gid, cb) {
fst.removeListener("data", OD)
fst.emit("data", c)
})

function afterUntar (er) {
log.silly(er || "ok", "afterUntar")
// if we're not doing ownership management,
// then we're done now.
if (er) return log.er(cb, "Failed unpacking "+tarball)(er)

// HACK skip on windows
if (npm.config.get("unsafe-perm") && process.platform !== "win32") {
uid = process.getuid()
gid = process.getgid()
if (uid === 0) {
if (process.env.SUDO_UID) uid = +process.env.SUDO_UID
if (process.env.SUDO_GID) gid = +process.env.SUDO_GID
}
}

if (process.platform === "win32") {
return fs.readdir(tmp, function (er, files) {
files = files.filter(function (f) {
return f && f.indexOf("\0") === -1
})
cb(er, files && path.resolve(tmp, files[0]))
})
}

find(tmp, function (f) {
return f !== tmp
}, function (er, files) {
if (er) return cb(er)
asyncMap(files, function (f, cb) {
f = path.resolve(f)
log.silly(f, "asyncMap in gTP")
fs.lstat(f, function (er, stat) {

if (er || stat.isSymbolicLink()) return cb(er)
if (typeof uid === "number" && typeof gid === "number") {
fs.chown(f, uid, gid, chown)
} else chown()

function chown (er) {
if (er) return cb(er)
var mode = stat.isDirectory() ? dMode : fMode
, oldMode = stat.mode & 0777
, newMode = (oldMode | mode) & (~npm.modes.umask)
if (mode && newMode !== oldMode) {
log.silly(newMode.toString(8), "chmod "+path.basename(f))
fs.chmod(f, newMode, cb)
} else cb()
}
})
}, function (er) {

if (er) return cb(er)
if (typeof myUid === "number" && typeof myGid === "number") {
fs.chown(tmp, myUid, myGid, chown)
} else chown()

function chown (er) {
if (er) return cb(er)
fs.readdir(tmp, function (er, folder) {
folder = folder && folder.filter(function (f) {
return f && !f.match(/^\._/)
})
cb(er, folder && path.resolve(tmp, folder[0]))
})
}
})
})
}
}

function makeList (dir, pkg, dfc, cb) {
Expand Down

2 comments on commit cc0a00e

@igorzi
Copy link

@igorzi igorzi commented on cc0a00e Mar 13, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@isaacs verified that this fixes the Windows UNC path issue. thanks!

@davidebbo
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great to hear, thanks!

Please sign in to comment.