Remove ENCRYPTION_NON_LOCAL

It was added in one of 1.1.0 pre-releases and can be removed without prior
deprecation.

Author: lutovich

src/v1/index.js

@@ -58,11 +58,8 @@ let USER_AGENT = "neo4j-javascript/" + VERSION;
  * options are as follows:
  *
  *     {
- *       // Encryption level: one of ENCRYPTION_ON, ENCRYPTION_OFF or ENCRYPTION_NON_LOCAL.
- *       // ENCRYPTION_NON_LOCAL is on by default in modern NodeJS installs,
- *       // but off by default in the Web Bundle and old (<=1.0.0) NodeJS installs
- *       // due to technical limitations on those platforms.
- *       encrypted: ENCRYPTION_ON|ENCRYPTION_OFF|ENCRYPTION_NON_LOCAL
+ *       // Encryption level: ENCRYPTION_ON or ENCRYPTION_OFF.
+ *       encrypted: ENCRYPTION_ON|ENCRYPTION_OFF
  *
  *       // Trust strategy to use if encryption is enabled. There is no mode to disable
  *       // trust other than disabling encryption altogether. The reason for

src/v1/internal/ch-node.js

@@ -23,7 +23,7 @@ import fs from 'fs';
 import path from 'path';
 import {EOL} from 'os';
 import {NodeBuffer} from './buf';
-import {isLocalHost, ENCRYPTION_NON_LOCAL, ENCRYPTION_OFF} from './util';
+import {ENCRYPTION_OFF} from './util';
 import {newError, SESSION_EXPIRED} from './../error';
 
 let _CONNECTION_IDGEN = 0;
@@ -226,8 +226,7 @@ const TrustStrategy = {
 
 function connect( opts, onSuccess, onFailure=(()=>null) ) {
   //still allow boolean for backwards compatibility
-  if (opts.encrypted === false || opts.encrypted === ENCRYPTION_OFF ||
-    (opts.encrypted === ENCRYPTION_NON_LOCAL && isLocalHost(opts.host))) {
+  if (opts.encrypted === false || opts.encrypted === ENCRYPTION_OFF) {
     var conn = net.connect(opts.port, opts.host, onSuccess);
     conn.on('error', onFailure);
     return conn;

src/v1/internal/ch-websocket.js

@@ -17,10 +17,9 @@
  * limitations under the License.
  */
 
-import debug from "./log";
-import {HeapBuffer} from "./buf";
+import {HeapBuffer} from './buf';
 import {newError} from './../error';
-import {isLocalHost, ENCRYPTION_NON_LOCAL, ENCRYPTION_ON, ENCRYPTION_OFF} from './util';
+import {ENCRYPTION_ON, ENCRYPTION_OFF} from './util';
 
 /**
  * Create a new WebSocketChannel to be used in web browsers.
@@ -45,8 +44,7 @@ class WebSocketChannel {
 
     let scheme = "ws";
     //Allow boolean for backwards compatibility
-    if( opts.encrypted === true || opts.encrypted === ENCRYPTION_ON ||
-      (opts.encrypted === ENCRYPTION_NON_LOCAL && !isLocalHost(opts.host)) ) {
+    if( opts.encrypted === true || opts.encrypted === ENCRYPTION_ON) {
       if((!opts.trust) || opts.trust === "TRUST_CUSTOM_CA_SIGNED_CERTIFICATES" ) {
         scheme = "wss";
       } else {

src/v1/internal/connector.js

@@ -16,17 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-import WebSocketChannel from "./ch-websocket";
-import NodeChannel from "./ch-node";
+import WebSocketChannel from './ch-websocket';
+import NodeChannel from './ch-node';
 import {Dechunker, Chunker} from "./chunking";
-import hasFeature from "./features";
-import {Packer,Unpacker} from "./packstream";
-import {alloc, CombinedBuffer} from "./buf";
-import {Node, Relationship, UnboundRelationship, Path, PathSegment} from '../graph-types';
-import {int, isInt} from '../integer';
+import hasFeature from './features';
+import {Packer, Unpacker} from './packstream';
+import {alloc} from './buf';
+import {Node, Relationship, UnboundRelationship, Path, PathSegment} from '../graph-types'
 import {newError} from './../error';
-import {ENCRYPTION_NON_LOCAL, ENCRYPTION_OFF, shouldEncrypt} from './util';
 
 let Channel;
 if( WebSocketChannel.available ) {
@@ -470,8 +467,8 @@ function connect( url, config = {}) {
   return new Connection( new Ch({
     host: parseHost(url),
     port: parsePort(url) || 7687,
-    // Default to using ENCRYPTION_NON_LOCAL if trust-on-first-use is available
-    encrypted : shouldEncrypt(config.encrypted, (hasFeature("trust_on_first_use") ? ENCRYPTION_NON_LOCAL : ENCRYPTION_OFF), parseHost(url)),
+    // Default to using encryption if trust-on-first-use is available
+    encrypted : (config.encrypted == null) ?  hasFeature("trust_on_first_use") : config.encrypted,
     // Default to using TRUST_ON_FIRST_USE if it is available
     trust : config.trust || (hasFeature("trust_on_first_use") ? "TRUST_ON_FIRST_USE" : "TRUST_CUSTOM_CA_SIGNED_CERTIFICATES"),
     trustedCertificates : config.trustedCertificates || [],

src/v1/internal/util.js

@@ -17,35 +17,10 @@
  * limitations under the License.
  */
 
-let LOCALHOST_MATCHER = /^(localhost|127(\.\d+){3})$/i;
-let ENCRYPTION_ON = "ENCRYPTION_ON";
-let ENCRYPTION_OFF = "ENCRYPTION_OFF";
-let ENCRYPTION_NON_LOCAL = "ENCRYPTION_NON_LOCAL";
-
-function isLocalHost(host)  {
-  return LOCALHOST_MATCHER.test(host);
-}
-
-/* Coerce an encryption setting to a definitive boolean value,
- * given a valid default and a target host. If encryption is
- * explicitly set on or off, then the mapping is a simple
- * conversion to true or false respectively. If set to
- * ENCRYPTION_NON_LOCAL then respond according to whether or
- * not the host is localhost/127.x.x.x. In all other cases
- * (including undefined) then fall back to the default and
- * re-evaluate.
- */
-function shouldEncrypt(encryption, encryptionDefault, host) {
-  if (encryption === ENCRYPTION_ON || encryption === true) return true;
-  if (encryption === ENCRYPTION_OFF || encryption === false) return false;
-  if (encryption === ENCRYPTION_NON_LOCAL) return !isLocalHost(host);
-  return shouldEncrypt(encryptionDefault, ENCRYPTION_OFF, host);
-}
+const ENCRYPTION_ON = "ENCRYPTION_ON";
+const ENCRYPTION_OFF = "ENCRYPTION_OFF";
 
 export {
-    isLocalHost,
-    shouldEncrypt,
     ENCRYPTION_ON,
-    ENCRYPTION_OFF,
-    ENCRYPTION_NON_LOCAL
+    ENCRYPTION_OFF
 }

test/internal/tls.test.js

@@ -21,7 +21,6 @@ var neo4j = require("../../lib/v1");
 var fs = require("fs");
 var path = require('path');
 var hasFeature = require("../../lib/v1/internal/features").default;
-var isLocalHost = require("../../lib/v1/internal/util").isLocalHost;
 
 describe('trust-signed-certificates', function() {
 
@@ -359,19 +358,6 @@ describe('trust-on-first-use', function() {
     });
   });
 
-  it('should detect localhost', function() {
-    expect(isLocalHost('localhost')).toBe(true);
-    expect(isLocalHost('LOCALHOST')).toBe(true);
-    expect(isLocalHost('localHost')).toBe(true);
-    expect(isLocalHost('127.0.0.1')).toBe(true);
-    expect(isLocalHost('127.0.0.11')).toBe(true);
-    expect(isLocalHost('127.1.0.0')).toBe(true);
-
-    expect(isLocalHost('172.1.0.0')).toBe(false);
-    expect(isLocalHost('127.0.0.0.0')).toBe(false);
-    expect(isLocalHost("google.com")).toBe(false);
-  });
-
   afterEach(function(){
     if( driver ) {
       driver.close();