Make creation of known_hosts path more robust

Author: oskarhane

src/v1/internal/ch-node.js

@@ -37,27 +37,21 @@ function userHome() {
 }
 
 function mkFullPath(pathToCreate) {
-  let joinedDirs = [];
-  let pathToKnownHostsParts = pathToCreate.split(path.sep)
-  pathToKnownHostsParts = pathToKnownHostsParts.map((part) => {
-    if( !part.length ) return path.sep
-    return part;
-  });
-  pathToKnownHostsParts.forEach((dir) => {
-    joinedDirs.push(dir);
-    let newPath = path.join.apply(null, joinedDirs)
-    try {
-      fs.accessSync( newPath );
+  try {
+    fs.mkdirSync( pathToCreate );
+  } catch (e) {
+    if(e.code === 'ENOENT') {
+      // Create parent dir
+      mkFullPath(path.dirname( pathToCreate ));
+      // And now try again
+      mkFullPath( pathToCreate );
       return;
     }
-    catch (_) {
-      try {
-        fs.mkdirSync( newPath );
-      } catch(e) {
-        if ( e.code != 'EEXIST' ) throw e;
-      }
+    if (e.code === 'EEXIST') {
+      return;
     }
-  });
+    throw e;
+  }
 }
 
 function loadFingerprint( serverId, knownHostsPath, cb ) {
@@ -86,8 +80,7 @@ function storeFingerprint(serverId, knownHostsPath, fingerprint) {
   try {
     fs.accessSync(knownHostsPath);
   } catch (_) {
-    let pathWithoutFile = knownHostsPath.split(path.sep).slice(0, -1).join(path.sep);
-    mkFullPath(pathWithoutFile);
+    mkFullPath(path.dirname(knownHostsPath));
   }
   fs.appendFile(knownHostsPath, serverId + " " + fingerprint + EOL, "utf8", (err) => {
     if (err) {

test/internal/tls.test.js

@@ -19,6 +19,7 @@
 var NodeChannel = require('../../lib/v1/internal/ch-node.js');
 var neo4j = require("../../lib/v1");
 var fs = require("fs");
+var path = require('path');
 var hasFeature = require("../../lib/v1/internal/features");
 
 describe('trust-signed-certificates', function() {
@@ -85,8 +86,8 @@ describe('trust-on-first-use', function() {
 
     // Given
     // Non existing directory
-    var knownHostsDir = "build/hosts"
-    var knownHostsPath = knownHostsDir + "/known_hosts";
+    var knownHostsDir = path.join("build", "hosts");
+    var knownHostsPath = path.join(knownHostsDir, "known_hosts");
     try {
       fs.unlinkSync(knownHostsPath);
     } catch (_) { }
@@ -106,6 +107,11 @@ describe('trust-on-first-use', function() {
       // And then the known_hosts file should have been created
       expect( function() { fs.accessSync(knownHostsPath) }).not.toThrow()
       done();
+    }).catch( function(){
+      // Just here to gracefully exit test on failure so we don't get timeouts
+      // when done() isn't called.
+      expect( 'this' ).toBe( 'to never happen' );
+      done();
     });
   });