Merge pull request #344 from prey/custom-wipe

Custom directory wipe

lib/agent/actions/wipe/index.js

@@ -1,7 +1,9 @@
-var join    = require('path').join,
+var fs      = require('fs'),
+    path    = require('path'),
     Emitter = require('events').EventEmitter,
     wipe    = require('./wipe'),
     common  = require('./../../common'),
+    join    = path.join,
     os_name = common.os_name,
     logger  = common.logger.prefix('wipe'),
     system  = common.system;
@@ -14,13 +16,26 @@ var node_bin = join(system.paths.current, 'bin', 'node');
 if (os_name == 'windows')
   node_bin = node_bin + '.exe';
 
+var validDirs = function(dirs) {
+  dirs = dirs.split(',');
+
+  dirs.forEach(function(dir, index) {
+    dirs[index] = dir.trim();
+    if (path.isAbsolute(dirs[index])) {
+      exports.directories.push(dirs[index]);
+    } else logger.info("Invalid directory path: " + dirs[index]);
+  })
+  if (exports.directories.length == 0) return false;
+  return true;
+}
+
 var valid_types = function(hash) {
   var list = [];
 
   // hash keys should be 'wipe_cookies', 'wipe_passwords', etc
   for (var key in hash) {
     var val = hash[key].toString().trim();
-    if (val == 'on' ||  val == 'true') {
+    if ((val != 'false' && val != 'off' && key.includes('wipe_')) && ( val == 'on' ||  val == 'true' || validDirs(val) )) {
       var method = key.replace('wipe_', ''); // just 'cookies'
       if (typeof wipe[method] == 'function')
         list.push(method);
@@ -32,6 +47,7 @@ var valid_types = function(hash) {
 
 exports.start = function(opts, cb) {
 
+  exports.directories = [];
   var opts    = opts || {};
   var confirm = opts.confirm == 'ireallyknowwhatiamdoing';
   var items   = valid_types(opts);
@@ -63,7 +79,7 @@ exports.start = function(opts, cb) {
 
   // run it as another process, using impersonation (to avoid permission errors)
   var spawn = function() {
-    var args = [join(__dirname, 'runner.js')].concat(items);
+    var args = [join(__dirname, 'runner.js')].concat(items).concat(exports.directories.toString());
 
     system.spawn_as_logged_user(node_bin, args, function(err, child) {
       if (err) {
@@ -80,6 +96,8 @@ exports.start = function(opts, cb) {
           if (line.toString().match('File removed')) {
             logger.warn(line.trim());
             removed++;
+          } else if (line.toString().match('Error while removing dir')) {
+            logger.warn(line.trim());
           } else if (line.trim() != '') {
             logger.debug(line.trim());
           }
@@ -112,7 +130,7 @@ exports.start = function(opts, cb) {
 
   emitter = new Emitter;
   cb(null, emitter);
-  spawn();
+  fs.existsSync(node_bin) ? spawn() : finished(new Error('Node binary not present'));
 
 }
 
@@ -124,3 +142,6 @@ exports.stop = function(){
 
   emitter = null;
 }
+
+exports.valid_types = valid_types;
+exports.directories = [];

lib/agent/actions/wipe/linux/index.js

@@ -46,5 +46,6 @@ exports.paths = {
   ],
   cloud_files: [
     'Dropbox'
-  ]
+  ],
+  directories: []
 }

lib/agent/actions/wipe/mac/index.js

@@ -57,5 +57,6 @@ exports.paths = {
   cloud_files: [
     'Google\ Drive',
     'Dropbox'
-  ]
+  ],
+  directories: []
 }

lib/agent/actions/wipe/runner.js

@@ -1,11 +1,16 @@
 #!/usr/bin/env node
 
-var wipe  = require('./wipe'),
-    what  = process.argv;
+var wipe    = require('./wipe'),
+    os_name = require('./../../common').os_name,
+    os_wipe = require('./' + os_name),
+    what    = process.argv;
 
 // variable to store last error
 var last_err;
 
+// insert custom directories in the wipe paths
+os_wipe.paths.directories = what.pop().split(',');
+
 // pad node binary and script path
 what.shift();
 what.shift();

lib/agent/actions/wipe/windows/index.js

@@ -85,7 +85,8 @@ exports.paths = {
     'Google Drive',
     'Dropbox',
     'OneDrive'
-  ]
+  ],
+  directories: []
 }
 
 /*

lib/agent/actions/wipe/wipe.js

@@ -129,6 +129,10 @@ exports.cloud = function(cb) {
   })
 }
 
+exports.directories = function(cb) {
+  wipe('directories', cb)
+}
+
 exports.stop = function() {
   remover.stop();
 }
@@ -149,16 +153,21 @@ var wipe = function(what, cb) {
     --dirs || cb(last_err, removed);
   }
 
-  fs.readdir(root, function(err, list) {
-    if (err) return cb(err);
-
-    list.forEach(function(user) {
-      paths[what].forEach(function(dir) {
-        dirs++;
-        remover = remove(join(root, user, dir, '*'), secure_wipe_cmd, done)
-      })
+  if (what == 'directories') {
+    paths.directories.forEach(function(dir) {
+      dirs++;
+      remover = remove(join(dir, '*'), secure_wipe_cmd, done);
+    })
+  } else {
+    fs.readdir(root, function(err, list) {
+      if (err) return cb(err);
+
+      list.forEach(function(user) {
+        paths[what].forEach(function(dir) {
+          dirs++;
+          remover = remove(join(root, user, dir, '*'), secure_wipe_cmd, done)
+        })
+      });
     });
-
-  });
-
+  }
 }