*: Switch from mkdirp to correctMkdir to preserve perms and owners

Switch to correctMkdir as much as possible to ensure that permissions on
directories are correct.

lib/config/core.js

@@ -8,7 +8,7 @@ var path = require('path')
 var nopt = require('nopt')
 var ini = require('ini')
 var Umask = configDefs.Umask
-var mkdirp = require('mkdirp')
+var correctMkdir = require('../utils/correct-mkdir.js')
 var umask = require('../utils/umask')
 var isWindows = require('../utils/is-windows.js')
 
@@ -153,7 +153,7 @@ function load_ (builtin, rc, cli, cb) {
     // annoying humans and their expectations!
     if (conf.get('prefix')) {
       var etc = path.resolve(conf.get('prefix'), 'etc')
-      mkdirp(etc, function () {
+      correctMkdir(etc, function () {
         defaults.globalconfig = path.resolve(etc, 'npmrc')
         defaults.globalignorefile = path.resolve(etc, 'npmignore')
         afterUserContinuation()
@@ -235,7 +235,7 @@ Conf.prototype.loadExtras = function (cb) {
     this.loadUid(function (er) {
       if (er) return cb(er)
       // Without prefix, nothing will ever work
-      mkdirp(this.prefix, cb)
+      correctMkdir(this.prefix, cb)
     }.bind(this))
   }.bind(this))
 }
@@ -292,7 +292,7 @@ Conf.prototype.save = function (where, cb) {
       done(null)
     })
   } else {
-    mkdirp(path.dirname(target.path), function (er) {
+    correctMkdir(path.dirname(target.path), function (er) {
       if (er) return then(er)
       fs.writeFile(target.path, data, 'utf8', function (er) {
         if (er) return then(er)

lib/config/set-user.js

@@ -3,7 +3,7 @@ module.exports = setUser
 var assert = require('assert')
 var path = require('path')
 var fs = require('fs')
-var mkdirp = require('mkdirp')
+var correctMkdir = require('../utils/correct-mkdir.js')
 
 function setUser (cb) {
   var defaultConf = this.root
@@ -19,7 +19,7 @@ function setUser (cb) {
   }
 
   var prefix = path.resolve(this.get('prefix'))
-  mkdirp(prefix, function (er) {
+  correctMkdir(prefix, function (er) {
     if (er) return cb(er)
     fs.stat(prefix, function (er, st) {
       defaultConf.user = st && st.uid

lib/install.js

@@ -102,7 +102,7 @@ var readPackageJson = require('read-package-json')
 var chain = require('slide').chain
 var asyncMap = require('slide').asyncMap
 var archy = require('archy')
-var mkdirp = require('mkdirp')
+var correctMkdir = require('./utils/correct-mkdir.js')
 var rimraf = require('rimraf')
 var iferr = require('iferr')
 var validate = require('aproba')
@@ -648,7 +648,7 @@ Installer.prototype.readGlobalPackageData = function (cb) {
   log.silly('install', 'readGlobalPackageData')
   var self = this
   this.loadArgMetadata(iferr(cb, function () {
-    mkdirp(self.where, iferr(cb, function () {
+    correctMkdir(self.where, iferr(cb, function () {
       var pkgs = {}
       self.args.forEach(function (pkg) {
         pkgs[pkg.name] = true
@@ -665,7 +665,7 @@ Installer.prototype.readLocalPackageData = function (cb) {
   validate('F', arguments)
   log.silly('install', 'readLocalPackageData')
   var self = this
-  mkdirp(this.where, iferr(cb, function () {
+  correctMkdir(this.where, iferr(cb, function () {
     readPackageTree(self.where, iferr(cb, function (currentTree) {
       self.currentTree = currentTree
       self.currentTree.warnings = []

lib/install/action/extract.js

@@ -5,7 +5,7 @@ const BB = require('bluebird')
 const stat = BB.promisify(require('graceful-fs').stat)
 const gentlyRm = BB.promisify(require('../../utils/gently-rm.js'))
 const log = require('npmlog')
-const mkdirp = BB.promisify(require('mkdirp'))
+const correctMkdir = BB.promisify(require('../../utils/correct-mkdir'))
 const moduleName = require('../../utils/module-name.js')
 const moduleStagingPath = require('../module-staging-path.js')
 const move = require('../../utils/move.js')
@@ -142,7 +142,7 @@ function stageBundledModule (bundler, child, staging, parentPath) {
 function finishModule (bundler, child, stageTo, stageFrom) {
   // If we were the one's who bundled this module…
   if (child.fromBundle === bundler) {
-    return mkdirp(path.dirname(stageTo)).then(() => {
+    return correctMkdir(path.dirname(stageTo)).then(() => {
       return move(stageFrom, stageTo)
     })
   } else {

lib/install/action/finalize.js

@@ -3,7 +3,6 @@ const path = require('path')
 const fs = require('graceful-fs')
 const Bluebird = require('bluebird')
 const rimraf = Bluebird.promisify(require('rimraf'))
-const mkdirp = Bluebird.promisify(require('mkdirp'))
 const lstat = Bluebird.promisify(fs.lstat)
 const readdir = Bluebird.promisify(fs.readdir)
 const symlink = Bluebird.promisify(fs.symlink)
@@ -14,6 +13,7 @@ const moveOpts = {fs: fs, Promise: Bluebird, maxConcurrency: 4}
 const getRequested = require('../get-requested.js')
 const log = require('npmlog')
 const packageId = require('../../utils/package-id.js')
+const correctMkdir = Bluebird.promisify(require('../../utils/correct-mkdir.js'))
 
 module.exports = function (staging, pkg, log) {
   log.silly('finalize', pkg.realpath)
@@ -48,7 +48,7 @@ module.exports = function (staging, pkg, log) {
   }
 
   function makeParentPath (dir) {
-    return mkdirp(path.dirname(dir))
+    return correctMkdir(path.dirname(dir))
   }
 
   function moveStagingToDestination () {
@@ -81,7 +81,7 @@ module.exports = function (staging, pkg, log) {
     if (!movedDestAway) return
     return readdir(path.join(delpath, 'node_modules')).catch(() => []).then((modules) => {
       if (!modules.length) return
-      return mkdirp(path.join(pkg.realpath, 'node_modules')).then(() => Bluebird.map(modules, (file) => {
+      return correctMkdir(path.join(pkg.realpath, 'node_modules')).then(() => Bluebird.map(modules, (file) => {
         const from = path.join(delpath, 'node_modules', file)
         const to = path.join(pkg.realpath, 'node_modules', file)
         return move(from, to, moveOpts)

lib/install/action/move.js

@@ -4,7 +4,7 @@ var path = require('path')
 var chain = require('slide').chain
 var iferr = require('iferr')
 var rimraf = require('rimraf')
-var mkdirp = require('mkdirp')
+var correctMkdir = require('../../utils/correct-mkdir')
 var rmStuff = require('../../unbuild.js').rmStuff
 var lifecycle = require('../../utils/lifecycle.js')
 var move = require('../../utils/move.js')
@@ -67,7 +67,7 @@ function moveModuleOnly (from, to, log, done) {
   function makeDestination (next) {
     return function () {
       log.silly('move', 'make sure destination parent exists', path.resolve(to, '..'))
-      mkdirp(path.resolve(to, '..'), iferr(done, moveNodeModules(next)))
+      correctMkdir(path.resolve(to, '..'), iferr(done, moveNodeModules(next)))
     }
   }
 
@@ -87,7 +87,7 @@ function moveModuleOnly (from, to, log, done) {
 
   function moveNodeModulesBack (next) {
     return function () {
-      mkdirp(from, iferr(done, function () {
+      correctMkdir(from, iferr(done, function () {
         log.silly('move', 'put source node_modules back', fromModules)
         move(tempFromModules, fromModules).then(next, done)
       }))

lib/install/action/remove.js

@@ -3,7 +3,7 @@ var path = require('path')
 var fs = require('graceful-fs')
 var rimraf = require('rimraf')
 var asyncMap = require('slide').asyncMap
-var mkdirp = require('mkdirp')
+var correctMkdir = require('../../utils/correct-mkdir')
 var npm = require('../../npm.js')
 var andIgnoreErrors = require('../and-ignore-errors.js')
 var move = require('../../utils/move.js')
@@ -52,7 +52,7 @@ function removeDir (pkg, log, next) {
   function makeTarget (readdirEr, files) {
     if (readdirEr) return cleanup()
     if (!files.length) return cleanup()
-    mkdirp(path.join(pkg.path, 'node_modules'), function (mkdirEr) { moveModules(mkdirEr, files) })
+    correctMkdir(path.join(pkg.path, 'node_modules'), function (mkdirEr) { moveModules(mkdirEr, files) })
   }
 
   function moveModules (mkdirEr, files) {

lib/utils/completion/file-completion.js

@@ -1,14 +1,14 @@
 module.exports = fileCompletion
 
-var mkdir = require('mkdirp')
+var correctMkdir = require('../correct-mkdir.js')
 var glob = require('glob')
 
 function fileCompletion (root, req, depth, cb) {
   if (typeof cb !== 'function') {
     cb = depth
     depth = Infinity
   }
-  mkdir(root, function (er) {
+  correctMkdir(root, function (er) {
     if (er) return cb(er)
 
     // can be either exactly the req, or a descendent

lib/utils/correct-mkdir.js

@@ -6,21 +6,21 @@ var log = require('npmlog')
 var mkdirp = require('mkdirp')
 
 // memoize the directories created by this step
-var stats = {}
 var effectiveOwner
 module.exports = function correctMkdir (path, cb) {
   cb = dezalgo(cb)
   cb = inflight('correctMkdir:' + path, cb)
   if (!cb) {
-    return log.verbose('correctMkdir', path, 'correctMkdir already in flight; waiting')
+    return log.silly('correctMkdir', path, 'correctMkdir already in flight; waiting')
   } else {
-    log.verbose('correctMkdir', path, 'correctMkdir not in flight; initializing')
+    log.silly('correctMkdir', path, 'correctMkdir not in flight; initializing')
   }
+  var stats = {}
 
   if (stats[path]) return cb(null, stats[path])
 
   fs.stat(path, function (er, st) {
-    if (er) return makeDirectory(path, cb)
+    if (er) return makeDirectory(path, stats, cb)
 
     if (!st.isDirectory()) {
       log.error('correctMkdir', 'invalid dir %s', path)
@@ -60,12 +60,12 @@ function calculateOwner () {
   return effectiveOwner
 }
 
-function makeDirectory (path, cb) {
+function makeDirectory (path, stats, cb) {
   cb = inflight('makeDirectory:' + path, cb)
   if (!cb) {
-    return log.verbose('makeDirectory', path, 'creation already in flight; waiting')
+    return log.silly('makeDirectory', path, 'creation already in flight; waiting')
   } else {
-    log.verbose('makeDirectory', path, 'creation not in flight; initializing')
+    log.silly('makeDirectory', path, 'creation not in flight; initializing')
   }
 
   var owner = calculateOwner()