Proper ssh key file modes and callback usage

tessel · Jun 13, 2015 · ac90f9d · ac90f9d
1 parent fc14996
commit ac90f9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/bin/tessel-2.js b/bin/tessel-2.js
@@ -194,6 +194,7 @@ parser.command('key')
   .callback(function(opts) {
     key(opts)
       .then(function() {
+        logs.info('Key successfully generated.');
         process.exit(0);
       })
       .catch(function(err) {

diff --git a/lib/tessel/provision.js b/lib/tessel/provision.js
@@ -50,16 +50,17 @@ function setupLocal(callback) {
 
         function createKeyFile(filepath, key, successString, callback) {
           // Put SSH keys for Tessel in that folder
-          fs.writeFile(filepath, key, function(err) {
+          fs.writeFile(filepath, key, {
+            mode: '0600'
+          }, function(err) {
             // Handle any errors that may have occurred
-            if (Tessel._commonErrorHandler(err)) {
+            if (Tessel._commonErrorHandler(err, callback)) {
               return;
+            } else {
+              if (typeof callback === 'function') {
+                callback();
+              }
             }
-
-            fs.chmod(filepath + '.pub', '600', function() {
-              logs.info(successString);
-              callback();
-            });
           });
         }
 
@@ -70,7 +71,7 @@ function setupLocal(callback) {
           ],
           function(err) {
             // Handle any errors that may have occurred
-            if (Tessel._commonErrorHandler(err)) {
+            if (Tessel._commonErrorHandler(err, callback)) {
               return;
             } else {
               if (typeof callback === 'function') {