fix(security): use which instead of whereis (#220)

shipitjs · Nov 4, 2018 · 6f46cad · 6f46cad
1 parent 6ba6f00
commit 6f46cad
Show file tree

Hide file tree

Showing 6 changed files with 879 additions and 155 deletions.
diff --git a/packages/ssh-pool/__mocks__/whereis.js → packages/ssh-pool/__mocks__/which.js b/packages/ssh-pool/__mocks__/whereis.js → packages/ssh-pool/__mocks__/which.js
diff --git a/packages/ssh-pool/package.json b/packages/ssh-pool/package.json
@@ -10,6 +10,6 @@
   "dependencies": {
     "stream-line-wrapper": "^0.1.1",
     "tmp": "^0.0.33",
-    "whereis": "^0.4.0"
+    "which": "^1.3.1"
   }
 }
diff --git a/packages/ssh-pool/src/Connection.test.js b/packages/ssh-pool/src/Connection.test.js
@@ -1,12 +1,12 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import stdMocks from 'std-mocks'
 import { exec } from 'child_process'
-import { __setPaths__ } from 'whereis'
+import { __setPaths__ } from 'which'
 import * as util from './util'
 import Connection from './Connection'
 
 jest.mock('child_process')
-jest.mock('whereis')
+jest.mock('which')
 jest.mock('tmp')
 
 describe('Connection', () => {

diff --git a/packages/ssh-pool/src/ConnectionPool.test.js b/packages/ssh-pool/src/ConnectionPool.test.js
@@ -1,10 +1,10 @@
-import { __setPaths__ } from 'whereis'
+import { __setPaths__ } from 'which'
 import { exec } from 'child_process'
 import * as util from './util'
 import Connection from './Connection'
 import ConnectionPool from './ConnectionPool'
 
-jest.mock('whereis')
+jest.mock('which')
 jest.mock('child_process')
 
 describe('ConnectionPool', () => {

diff --git a/packages/ssh-pool/src/commands/rsync.js b/packages/ssh-pool/src/commands/rsync.js
@@ -1,8 +1,8 @@
-import whereis from 'whereis'
+import which from 'which'
 import { wrapCommand, joinCommandArgs, requireArgs } from './util'
 
 export async function isRsyncSupported() {
-  return new Promise(resolve => whereis('rsync', err => resolve(!err)))
+  return new Promise(resolve => which('rsync', err => resolve(!err)))
 }
 
 function formatExcludes(excludes) {