Merge remote-tracking branch 'upstream/1.0' into fix/known_hosts-fingerprint-duplication-error/1.0

# Conflicts:
#	src/v1/internal/ch-node.js

Author: Stefan-Gabriel Muscalu

neokit

@@ -36,10 +36,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({
@@ -64,11 +83,13 @@ function storeFingerprint( serverId, knownHostsPath, fingerprint, cb ) {
     return cb(null);
   }
 
-  // we make the line as appended
-  // ( 1 is more efficient to store than true because true is an oddball )
-  _lockFingerprintFromAppending[serverId] = 1;
+  // If file doesn't exist, create full path to it
+  try {
+    fs.accessSync(knownHostsPath);
+  } catch (_) {
+    mkFullPath(path.dirname(knownHostsPath));
+  }
 
-  // we append to file
   fs.appendFile(knownHostsPath, serverId + " " + fingerprint + EOL, "utf8", (err) => {
     delete _lockFingerprintFromAppending[serverId];
     if (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");
 
 describe('trust-signed-certificates', function() {
@@ -76,6 +77,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
@@ -141,60 +180,7 @@ describe('trust-on-first-use', function() {
       done();
     });
   });
-
-  it('should not duplicate fingerprint entries', function(done) {
-    // Assuming we only run this test on NodeJS with TOFU support
-    if( !hasFeature("trust_on_first_use") ) {
-      done();
-      return;
-    }
-
-    // Given
-    var knownHostsPath = "build/known_hosts";
-    if( fs.existsSync(knownHostsPath) ) {
-      fs.unlinkSync(knownHostsPath);
-    }
-    fs.writeFileSync(knownHostsPath, '');
-
-    driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
-      encrypted: true,
-      trust: "TRUST_ON_FIRST_USE",
-      knownHosts: knownHostsPath
-    });
-
-    // When
-    driver.session();
-    driver.session();
-
-    setTimeout(function() {
-      var lines = {};
-      fs.readFileSync(knownHostsPath, 'utf8')
-          .split('\n')
-          .filter(function(line) {
-            return !! (line.trim());
-          })
-          .forEach(function(line) {
-            if (!lines[line]) {
-              lines[line] = 0;
-            }
-            lines[line]++;
-          });
-
-      var duplicatedLines = Object
-          .keys(lines)
-          .map(function(line) {
-              return lines[line];
-          })
-          .filter(function(count) {
-              return count > 1;
-          })
-          .length;
-
-      expect( duplicatedLines ).toBe( 0 );
-      done();
-    }, 1000);
-  });
-
+  
   it('should should give helpful error if database cert does not match stored certificate', function(done) {
     // Assuming we only run this test on NodeJS with TOFU support
     if( !hasFeature("trust_on_first_use") ) {

test/internal/tls.test.js

@@ -56,14 +56,17 @@ module.exports = function () {
   this.Then(/^a `Protocol Error` is raised$/, function () {
     var message = this.err.fields[0].message
     var code = this.err.fields[0].code
-    var expectedStartOfMessage = 'No operations allowed until you send an INIT message successfully.'
-    var expectedCode = 'Neo.ClientError.Request.Invalid'
 
-    if (message.indexOf(expectedStartOfMessage) != 0) {
-      throw new Error("Wrong error messsage. Expected: '" + expectedStartOfMessage + "'. Got: '" + message + "'");
-    }
+    // TODO uncomment this once we fix the init sync
+    //var expectedStartOfMessage = 'No operations allowed until you send an INIT message successfully.'
+    var expectedCode = 'Neo.ClientError';
+
+    // TODO uncomment this once we fix the init sync
+    //if (message.indexOf(expectedStartOfMessage) != 0) {
+    //  throw new Error("Wrong error messsage. Expected: '" + expectedStartOfMessage + "'. Got: '" + message + "'");
+    //}
 
-    if ( code != expectedCode) {
+    if (code.indexOf(expectedCode) != 0) {
       throw new Error("Wrong error code. Expected: '" + expectedCode + "'. Got: '" + code + "'");
     }
   });