Skip to content

Commit 3038f2f

Browse files
isaacsisaacs
committed
Prevent root-owned files in user-owned locations, and vice versa.
1 parent 732c115 commit 3038f2f

File tree

19 files changed

+136
-41
lines changed

19 files changed

+136
-41
lines changed

‎lib/config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var ini = require('ini')
1111
var editor = require('editor')
1212
var os = require('os')
1313
var path = require('path')
14-
var mkdirp = require('mkdirp')
14+
var mkdirp = require('gentle-fs').mkdir
1515
var umask = require('./utils/umask')
1616
var usage = require('./utils/usage')
1717
var output = require('./utils/output')

‎lib/config/core.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var path = require('path')
88
var nopt = require('nopt')
99
var ini = require('ini')
1010
var Umask = configDefs.Umask
11-
var mkdirp = require('mkdirp')
11+
var mkdirp = require('gentle-fs').mkdir
1212
var umask = require('../utils/umask')
1313
var isWindows = require('../utils/is-windows.js')
1414

‎lib/config/set-user.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module.exports = setUser
33
var assert = require('assert')
44
var path = require('path')
55
var fs = require('fs')
6-
var mkdirp = require('mkdirp')
6+
var mkdirp = require('gentle-fs').mkdir
77

88
function setUser (cb) {
99
var defaultConf = this.root

‎lib/install.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ var readPackageJson = require('read-package-json')
104104
var chain = require('slide').chain
105105
var asyncMap = require('slide').asyncMap
106106
var archy = require('archy')
107-
var mkdirp = require('mkdirp')
107+
var mkdirp = require('gentle-fs').mkdir
108108
var rimraf = require('rimraf')
109109
var iferr = require('iferr')
110110
var validate = require('aproba')

‎lib/install/action/extract.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const BB = require('bluebird')
55
const figgyPudding = require('figgy-pudding')
66
const stat = BB.promisify(require('graceful-fs').stat)
77
const gentlyRm = BB.promisify(require('../../utils/gently-rm.js'))
8-
const mkdirp = BB.promisify(require('mkdirp'))
8+
const mkdirp = BB.promisify(require('gentle-fs').mkdir)
99
const moduleName = require('../../utils/module-name.js')
1010
const moduleStagingPath = require('../module-staging-path.js')
1111
const move = require('../../utils/move.js')

‎lib/install/action/finalize.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const path = require('path')
33
const fs = require('graceful-fs')
44
const Bluebird = require('bluebird')
55
const rimraf = Bluebird.promisify(require('rimraf'))
6-
const mkdirp = Bluebird.promisify(require('mkdirp'))
6+
const mkdirp = Bluebird.promisify(require('gentle-fs').mkdir)
77
const lstat = Bluebird.promisify(fs.lstat)
88
const readdir = Bluebird.promisify(fs.readdir)
99
const symlink = Bluebird.promisify(fs.symlink)

‎lib/install/action/move.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var path = require('path')
44
var chain = require('slide').chain
55
var iferr = require('iferr')
66
var rimraf = require('rimraf')
7-
var mkdirp = require('mkdirp')
7+
var mkdirp = require('gentle-fs').mkdir
88
var rmStuff = require('../../unbuild.js').rmStuff
99
var lifecycle = require('../../utils/lifecycle.js')
1010
var move = require('../../utils/move.js')

‎lib/install/action/remove.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var path = require('path')
33
var fs = require('graceful-fs')
44
var rimraf = require('rimraf')
55
var asyncMap = require('slide').asyncMap
6-
var mkdirp = require('mkdirp')
6+
var mkdirp = require('gentle-fs').mkdir
77
var npm = require('../../npm.js')
88
var andIgnoreErrors = require('../and-ignore-errors.js')
99
var move = require('../../utils/move.js')

‎lib/search/all-package-metadata.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const figgyPudding = require('figgy-pudding')
99
const fs = require('graceful-fs')
1010
const JSONStream = require('JSONStream')
1111
const log = require('npmlog')
12-
const mkdir = BB.promisify(require('mkdirp'))
12+
const mkdir = BB.promisify(require('gentle-fs').mkdir)
1313
const ms = require('mississippi')
1414
const npmFetch = require('libnpm/fetch')
1515
const path = require('path')

‎lib/utils/cache-file.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// XXX use infer-owner or gentle-fs.mkdir here
12
const npm = require('../npm.js')
23
const path = require('path')
34
const chownr = require('chownr')

0 commit comments

Comments
 (0)