1 files changed, 19 insertions, 106 deletions

diff --git a/deps/npm/lib/utils/correct-mkdir.js b/deps/npm/lib/utils/correct-mkdir.js
index 68c4a4ad79..2558de66f5 100644
--- a/deps/npm/lib/utils/correct-mkdir.js
+++ b/deps/npm/lib/utils/correct-mkdir.js
@@ -1,123 +1,36 @@
-var chownr = require('chownr')
-var dezalgo = require('dezalgo')
-var fs = require('graceful-fs')
-var inflight = require('inflight')
-var log = require('npmlog')
-var mkdirp = require('mkdirp')
+const chownr = require('chownr')
+const inflight = require('inflight')
+const log = require('npmlog')
+const mkdirp = require('mkdirp')
+const inferOwner = require('infer-owner')
+
+// retain ownership of the parent dir
+// this matches behavior in cacache to infer the cache ownership
+// based on the ownership of the cache folder or it is parent.
 
-// 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)
+  cb = inflight('correctMkdir: ' + path, cb)
   if (!cb) {
     return log.verbose('correctMkdir', path, 'correctMkdir already in flight; waiting')
   } else {
     log.verbose('correctMkdir', path, 'correctMkdir not in flight; initializing')
   }
 
-  if (stats[path]) return cb(null, stats[path])
-
-  fs.stat(path, function (er, st) {
-    if (er) return makeDirectory(path, cb)
-
-    if (!st.isDirectory()) {
-      log.error('correctMkdir', 'invalid dir %s', path)
-      return cb(er)
-    }
-
-    var ownerStats = calculateOwner()
-    // there's always a chance the permissions could have been frobbed, so fix
-    if (st.uid !== ownerStats.uid) {
-      stats[path] = ownerStats
-      setPermissions(path, ownerStats, cb)
-    } else {
-      stats[path] = st
-      cb(null, stats[path])
-    }
-  })
-}
-
-function calculateOwner () {
-  if (!effectiveOwner) {
-    effectiveOwner = { uid: 0, gid: 0 }
-
-    // Pretty much only on windows
-    if (!process.getuid) {
-      return effectiveOwner
-    }
-
-    effectiveOwner.uid = +process.getuid()
-    effectiveOwner.gid = +process.getgid()
-
-    if (effectiveOwner.uid === 0) {
-      if (process.env.SUDO_UID) effectiveOwner.uid = +process.env.SUDO_UID
-      if (process.env.SUDO_GID) effectiveOwner.gid = +process.env.SUDO_GID
-    }
-  }
-
-  return effectiveOwner
-}
-
-function makeDirectory (path, cb) {
-  cb = inflight('makeDirectory:' + path, cb)
-  if (!cb) {
-    return log.verbose('makeDirectory', path, 'creation already in flight; waiting')
-  } else {
-    log.verbose('makeDirectory', path, 'creation not in flight; initializing')
-  }
-
-  var owner = calculateOwner()
-
   if (!process.getuid) {
-    return mkdirp(path, function (er) {
-      log.verbose('makeCacheDir', 'UID & GID are irrelevant on', process.platform)
-
-      stats[path] = owner
-      return cb(er, stats[path])
-    })
+    log.verbose('makeCacheDir', 'UID & GID are irrelevant on', process.platform)
+    return mkdirp(path, (er, made) => cb(er, { uid: 0, gid: 0 }))
   }
 
-  if (owner.uid !== 0 || !process.env.HOME) {
-    log.silly(
-      'makeDirectory', path,
-      'uid:', owner.uid,
-      'gid:', owner.gid
-    )
-    stats[path] = owner
-    mkdirp(path, afterMkdir)
-  } else {
-    fs.stat(process.env.HOME, function (er, st) {
+  inferOwner(path).then(owner => {
+    mkdirp(path, (er, made) => {
       if (er) {
-        log.error('makeDirectory', 'homeless?')
+        log.error('correctMkdir', 'failed to make directory %s', path)
         return cb(er)
       }
-
-      log.silly(
-        'makeDirectory', path,
-        'uid:', st.uid,
-        'gid:', st.gid
-      )
-      stats[path] = st
-      mkdirp(path, afterMkdir)
+      chownr(made || path, owner.uid, owner.gid, (er) => cb(er, owner))
     })
-  }
-
-  function afterMkdir (er, made) {
-    if (er || !stats[path] || isNaN(stats[path].uid) || isNaN(stats[path].gid)) {
-      return cb(er, stats[path])
-    }
-
-    if (!made) return cb(er, stats[path])
-
-    setPermissions(made, stats[path], cb)
-  }
-}
-
-function setPermissions (path, st, cb) {
-  chownr(path, st.uid, st.gid, function (er) {
-    if (er && er.code === 'ENOENT') return cb(null, st)
-    return cb(er, st)
+  }, er => {
+    log.error('correctMkdir', 'failed to infer path ownership %s', path)
+    return cb(er)
   })
 }