Merge branch '1.0' into 1.1

Author: Zhen Li

neokit

@@ -37,10 +37,29 @@ function userHome() {
   return process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'];
 }
 
+function mkFullPath(pathToCreate) {
+  try {
+    fs.mkdirSync( pathToCreate );
+  } catch (e) {
+    if(e.code === 'ENOENT') {
+      // Create parent dir
+      mkFullPath(path.dirname( pathToCreate ));
+      // And now try again
+      mkFullPath( pathToCreate );
+      return;
+    }
+    if (e.code === 'EEXIST') {
+      return;
+    }
+    throw e;
+  }
+}
+
 function loadFingerprint( serverId, knownHostsPath, cb ) {
-  if( !fs.existsSync( knownHostsPath )) {
-    cb(null);
-    return;
+  try {
+    fs.accessSync( knownHostsPath );
+  } catch(e) {
+    return cb(null)
   }
   let found = false;
   require('readline').createInterface({
@@ -58,6 +77,12 @@ function loadFingerprint( serverId, knownHostsPath, cb ) {
 }
 
 function storeFingerprint(serverId, knownHostsPath, fingerprint) {
+  // If file doesn't exist, create full path to it
+  try {
+    fs.accessSync(knownHostsPath);
+  } catch (_) {
+    mkFullPath(path.dirname(knownHostsPath));
+  }
   fs.appendFile(knownHostsPath, serverId + " " + fingerprint + EOL, "utf8", (err) => {
     if (err) {
       console.log(err);

src/v1/internal/ch-node.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");
 var isLocalHost = require("../../lib/v1/internal/util").isLocalHost;
 
@@ -77,6 +78,44 @@ describe('trust-on-first-use', function() {
 
   var driver;
 
+  it("should create known_hosts file including full path if it doesn't exist", function(done) {
+    // Assuming we only run this test on NodeJS with TOFU support
+    if( !hasFeature("trust_on_first_use") ) {
+      done();
+      return;
+    }
+
+    // Given
+    // Non existing directory
+    var knownHostsDir = path.join("build", "hosts");
+    var knownHostsPath = path.join(knownHostsDir, "known_hosts");
+    try {
+      fs.unlinkSync(knownHostsPath);
+    } catch (_) { }
+    try {
+      fs.rmdirSync(knownHostsDir);
+    } catch (_) { }
+
+    var driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
+      encrypted: true,
+      trust: "TRUST_ON_FIRST_USE",
+      knownHosts: knownHostsPath
+    });
+
+    // When
+    driver.session().run( "RETURN 1").then( function() {
+      // Then we get to here.
+      // 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();
+    });
+  });
+
   it('should not throw an error if the host file contains two host duplicates', function(done) {
     'use strict';
     // Assuming we only run this test on NodeJS with TOFU support