oracledb 6.0.2 → 6.1.0

package/lib/thin/protocol/protocol.js

@@ -71,6 +71,7 @@ class Protocol {
     while (true) {     // eslint-disable-line
       if (this.nsi.isBreak) {
         await this.resetMessage();
+        delete this.readBuf.savedBuffers;
         await this.readBuf.waitForPackets();
       }
       try {
@@ -78,8 +79,10 @@ class Protocol {
         break;
       } catch (err) {
         if (err instanceof utils.OutOfPacketsError) {
-          await this.readBuf.waitForPackets();
-          this.readBuf.restorePoint();
+          if (!this.nsi.isBreak) {
+            await this.readBuf.waitForPackets();
+            this.readBuf.restorePoint();
+          }
           continue;
         }
         throw (err);
@@ -108,7 +111,7 @@ class Protocol {
     this.writeBuf.endRequest();
   }
 
-  async _recoverFromError(message) {
+  async _recoverFromError(caughtErr, message) {
     /*
      * We have NJS error(protocol related) detected during packet write/read
      * operation.  Issue a break and reset to clear channel . We receive the
@@ -121,10 +124,12 @@ class Protocol {
       await this.readBuf.waitForPackets();
       message.decode(this.readBuf);
     } catch (err) { // Recovery failed
-    // TODO: throw different error indicating that reset failed, probably
-    // put inside resetMessage()
       this.nsi.disconnect();
-      errors.throwErr(errors.ERR_CONNECTION_CLOSED);
+      const newErr = errors.getErr(errors.ERR_CONNECTION_CLOSED);
+      caughtErr.message = newErr.message +
+        "\nError recovery failed: " + err.message +
+        "\nOriginal error: " + caughtErr.message;
+      throw caughtErr;
     }
   }
 
@@ -150,7 +155,7 @@ class Protocol {
     } catch (err) {
       if (!this.connInProgress &&
           err.code !== errors.ERR_CONNECTION_CLOSED_CODE) {
-        await this._recoverFromError(message);
+        await this._recoverFromError(err, message);
       }
       throw err;
     } finally {

package/lib/thin/protocol/utils.js

@@ -43,7 +43,7 @@ function _convertBase64(result, value, size, offset) {
 function encodeRowID(rowID) {
   let offset = 0;
   if (rowID.rba !== 0 || rowID.partitionID !== 0 || rowID.blockNum !== 0 || rowID.slotNum != 0) {
-    let result = Buffer.alloc(constants.TNS_MAX_ROWID_LENGTH);
+    const result = Buffer.alloc(constants.TNS_MAX_ROWID_LENGTH);
     offset = _convertBase64(result, rowID.rba, 6, offset);
     offset = _convertBase64(result, rowID.partitionID, 3, offset);
     offset = _convertBase64(result, rowID.blockNum, 6, offset);
@@ -59,7 +59,7 @@ function setObfuscatedValue(value) {
   const bytes = Buffer.from(value, 'utf8');
   const len = Buffer.byteLength(value);
 
-  let arr = [];
+  const arr = [];
   for (let i = 0; i < len; i++) {
     arr.push(buf[i] ^ bytes[i]);
   }

package/lib/thin/resultSet.js

@@ -68,10 +68,10 @@ class ThinResultSetImpl extends ResultSetImpl {
   // Returns rows fetched to the common layer in array format
   //---------------------------------------------------------------------------
   _processRows(numRowsFetched) {
-    let rows = [];
-    let bufferRowIndex = this.statement.bufferRowIndex;
+    const rows = [];
+    const bufferRowIndex = this.statement.bufferRowIndex;
     for (let row = bufferRowIndex; row < bufferRowIndex + numRowsFetched; row++) {
-      let rowObj = [];
+      const rowObj = [];
       for (let col = 0; col < this.statement.numQueryVars; col++) {
         rowObj.push(this.statement.queryVars[col].values[row]);
       }
@@ -99,13 +99,13 @@ class ThinResultSetImpl extends ResultSetImpl {
     } else {
       // We fetch for the required number of row
       options.fetchArraySize = options.fetchArraySize - (this.statement.bufferRowCount - this.statement.bufferRowIndex);
-      let prevBufferRowCount = this.statement.bufferRowCount;
+      const prevBufferRowCount = this.statement.bufferRowCount;
       if (this.statement.moreRowsToFetch && options.fetchArraySize > 0) {
         await this._fetchMoreRows(options);
       }
       options.fetchArraySize = numRows || this.options.fetchArraySize;
       if (prevBufferRowCount === this.statement.bufferRowCount) {
-        let numRowsFetched = this.statement.bufferRowCount - this.statement.bufferRowIndex;
+        const numRowsFetched = this.statement.bufferRowCount - this.statement.bufferRowIndex;
         this.statement.bufferRowCount = 0;
         if (numRowsFetched > 0) {
           return this._processRows(numRowsFetched);
@@ -113,7 +113,7 @@ class ThinResultSetImpl extends ResultSetImpl {
         return [];
       }
     }
-    let numRowsFetched = this.statement.bufferRowCount - this.statement.bufferRowIndex;
+    const numRowsFetched = this.statement.bufferRowCount - this.statement.bufferRowIndex;
     return this._processRows(numRowsFetched);
   }
 

package/lib/thin/sqlnet/connStrategy.js

@@ -28,8 +28,7 @@
 
 const { NavAddress, NavAddressList, NavDescription, NavDescriptionList } = require("./navNodes.js");
 const { createNVPair } = require("./nvStrToNvPair.js");
-
-
+const errors = require("../../errors.js");
 
 /**
  * Class that holds all possible attributes under Description
@@ -55,6 +54,7 @@ class ConnectDescription {
 class ConnStrategy {
   constructor() {
     this.nextOptToTry = 0;
+    this.reorderDescriptionList = 0;
     this.retryCount = 0;
     this.lastRetryCounter = 0;
     this.lastRetryConnectDescription = 0;
@@ -96,9 +96,13 @@ class ConnStrategy {
         this.retryCount = config.retryCount;
       }
     }
+    if (!this.reorderDescriptionList) {
+      this.descriptionList = SOLE_INST_DHCACHE.reorderDescriptionList(this.descriptionList);
+      this.reorderDescriptionList = true;
+    }
     /* We try the address list at least once and upto (1 + retryCount) times */
     for (let d = this.lastRetryConnectDescription; d < this.descriptionList.length; d++) {
-      let desc = this.descriptionList[d];
+      const desc = this.descriptionList[d];
       let cOpts = new Array();
       cOpts = desc.getConnectOptions();
       let delay = desc.delayInMillis;
@@ -109,8 +113,13 @@ class ConnStrategy {
         }
       }
       for (let i = this.lastRetryCounter; i <= this.retryCount; ++i) {
+        //Conn options must be reordered only when all options are tried
+        // i.e for retry and before the first try.
+        if (this.nextOptToTry == 0) {
+          cOpts = SOLE_INST_DHCACHE.reorderAddresses(cOpts);
+        }
         while (this.nextOptToTry < cOpts.length) {
-          let copt = cOpts[this.nextOptToTry];
+          const copt = cOpts[this.nextOptToTry];
           this.lastRetryCounter = i;
           this.lastRetryConnectDescription = d;
           this.nextOptToTry++;
@@ -151,7 +160,7 @@ async function createNode(str) {
   else
     nvpair = str; //Already a NVPair
 
-  let arg = nvpair.name.toUpperCase();
+  const arg = nvpair.name.toUpperCase();
   let navobj = null;
   switch (arg) {
     case "ADDRESS":
@@ -166,10 +175,128 @@ async function createNode(str) {
     case "DESCRIPTION_LIST":
       navobj = new NavDescriptionList();
       break;
+    default:
+      errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_PARAMETERS,
+        `unknown top element ${arg}`);
   }
   navobj.initFromNVPair(nvpair);
-  let cs = new ConnStrategy();
+  const cs = new ConnStrategy();
   await navobj.navigate(cs);
   return cs;
 }
-module.exports = { createNode };
+
+
+class DownHostsCache {
+
+  constructor() {
+    // Timeout for each item in the cache
+    this.DOWN_HOSTS_TIMEOUT = 600;
+    // Minimum amount of time between each refresh
+    this.MIN_TIME_BETWEEN_REFRESH = 60;
+    // DownHostsCache Map
+    this.downHostsCacheMap = new Map();
+    // Last Refresh Time
+    this.lastRefreshTime = 0;
+  }
+
+  /**
+   * Add an address to the cache
+   *
+   * @param connOption
+   *            address to be cached
+   * @return Map with address as key and time of insertion as value
+   */
+  markDownHost(addr) {
+    return this.downHostsCacheMap.set(addr, Date.now());
+  }
+
+  // Remove elements older than DownHostsTimeout
+  refreshCache() {
+    if (Date.now() - this.MIN_TIME_BETWEEN_REFRESH * 1000 > this.lastRefreshTime) {
+      this.downHostsCacheMap.forEach((value, key) => {
+        const entryTime = value;
+        if (entryTime != null && ((Date.now() - this.DOWN_HOSTS_TIMEOUT * 1000) > entryTime)) {
+          this.downHostsCacheMap.delete(key);
+        }
+      });
+      this.lastRefreshTime = Date.now();
+    }
+  }
+
+  /**
+   * Reorder addresses such that cached elements
+   * occur at the end of the array.
+   */
+  reorderAddresses(cOpts) {
+    this.refreshCache();
+
+    let topIdx = 0, btmIdx = cOpts.length - 1;
+
+    while (topIdx < btmIdx) {
+
+      // increment topIdx if the address is not cached
+      while (topIdx <= btmIdx
+          && !this.isDownHostsCached(cOpts[topIdx]))
+        topIdx++;
+
+      // decrement btmIdx if address is cached
+      while (btmIdx >= topIdx
+          && this.isDownHostsCached(cOpts[btmIdx]))
+        btmIdx--;
+
+      // swap cached with uncached
+      if (topIdx < btmIdx)
+        [cOpts[topIdx], cOpts[btmIdx]] = [cOpts[btmIdx], cOpts[topIdx]];
+
+    }
+    return cOpts;
+  }
+  /**
+   * Return if a desc is cached.
+   * A desc is cached if all the connection options(addresses)
+   * in that description are cached.
+   */
+  isDownDescCached(desc) {
+    const cOpts = desc.getConnectOptions();
+    for (let i = 0; i < cOpts.length; i++) {
+      if (!this.isDownHostsCached(cOpts[i]))
+        return false;
+    }
+    return true;
+  }
+  /**
+   * Reorder description list such that description with all connection options in downcache
+   * is pushed to the end of the description list
+   */
+  reorderDescriptionList(descs) {
+    this.refreshCache();
+
+    let topIdx = 0, btmIdx = descs.length - 1;
+
+    while (topIdx < btmIdx) {
+
+      // increment topIdx if the desc is not cached
+      while (topIdx <= btmIdx
+          && !this.isDownDescCached(descs[topIdx]))
+        topIdx++;
+
+      // decrement btmIdx if desc is cached
+      while (btmIdx >= topIdx
+          && this.isDownDescCached(descs[btmIdx]))
+        btmIdx--;
+
+      // swap cached with uncached
+      if (topIdx < btmIdx) {
+        [descs[topIdx], descs[btmIdx]] = [descs[btmIdx], descs[topIdx]];
+      }
+    }
+    return descs;
+  }
+  // Return if a host is cached
+  isDownHostsCached(copt) {
+    return this.downHostsCacheMap.has(copt.host);
+  }
+}
+// Single instance
+const SOLE_INST_DHCACHE = new DownHostsCache();
+module.exports = { createNode, SOLE_INST_DHCACHE };

package/lib/thin/sqlnet/constants.js

@@ -107,6 +107,8 @@ module.exports =  {
   NSGRAW                    : 0x1000, // I/O is direct to/from transport
   TNS_VERSION_DESIRED       : 319,
   TNS_VERSION_MINIMUM       : 300,
+  TNS_VERSION_MIN_UUID      : 319,
+  TNS_UUID_OFFSET           : 45,
 
   /* Accept Packet */
   NSPACVSN : 8,   // connection version

package/lib/thin/sqlnet/ezConnectResolver.js

@@ -39,8 +39,7 @@ Test Case in oracle_private/ezconnectTest.js
 const HOSTNAMES_PATTERN = new RegExp("((?=(?<hostnames>(((\\[[A-z0-9:]+\\])|([A-z0-9][A-z0-9._-]+))[,]?)+)))\\k<hostnames>(:(?<port>\\d+)?)?", 'g');
 
 // The EZConnect pattern without the extended settings part.
-const EZ_URL_PATTERN = new RegExp("^((?<protocol>tcp|tcps):)?"
-    + "(//)?"
+const EZ_URL_PATTERN = new RegExp("^(((?<protocol>[A-z0-9]+):)?//)?"
     + "(?<hostinfo>(" + HOSTNAMES_PATTERN.source + "(?=([,]|[;]|[/]|[:]|$))([,]|[;])?)+)"
     + "(/(?<servicename>[A-z0-9][A-z0-9,-.]+)?)"
     + "?(:(?<servermode>dedicated|shared|pooled))"
@@ -72,7 +71,7 @@ const DESCRIPTION_PARAMS = ["ENABLE", "FAILOVER", "LOAD_BALANCE",
 class EZConnectResolver {
   constructor(url) {
     this.URL_PROPS_ALIAS = this.initializeUrlAlias();
-    let jdbcUrlPrefix = url.indexOf('@');
+    const jdbcUrlPrefix = url.indexOf('@');
     if (jdbcUrlPrefix != -1) {
       this.url = url.substring(jdbcUrlPrefix + 1);
       this.urlPrefix = url.substring(0, jdbcUrlPrefix + 1);
@@ -126,7 +125,7 @@ class EZConnectResolver {
     // URL is in the following format
     // [protocol://]host1[,host13][:port1][,host2:port2][/service_name][:server][/instance_name]
 
-    let urlWithoutWhiteSpaces = url.replace(/\s/g, "");
+    const urlWithoutWhiteSpaces = url.replace(/\s/g, "");
     let bool = 0;
     let protocol = null, hostInfo = null, serviceName = null, serverMode = null, instanceName = null;
     for (const match of urlWithoutWhiteSpaces.matchAll(EZ_URL_PATTERN)) {
@@ -145,15 +144,16 @@ class EZConnectResolver {
     if (protocol == null) {
       if (!(url.includes("//")))
         protocol = 'TCP';
+    } else if (protocol.toLowerCase() != 'tcp' && protocol.toLowerCase() != 'tcps') {
+      errors.throwErr(errors.ERR_INVALID_EZCONNECT_SYNTAX, 'Unsupported protocol in thin mode', protocol);
     }
-
     // Try to get the proxy information from URL properties
     const proxyHost = this.urlProps.get("HTTPS_PROXY");
     const proxyPort = this.urlProps.get("HTTPS_PROXY_PORT");
     const addressInfo =
       await this.buildAddressList(hostInfo, protocol, proxyHost, proxyPort);
 
-    let connectionIdPrefix =
+    const connectionIdPrefix =
       this.urlProps.get("CONNECTION_ID_PREFIX");
     // Build the available information in TNS format.
     const parts = [];
@@ -214,26 +214,30 @@ class EZConnectResolver {
     proxyHost, proxyPort) {
     let shost = '';
     let ipcnt = 0;
-    let builder = new Array();
+    const builder = new Array();
     let proxyInfo = '';
-    if (proxyHost != null && proxyPort != null) {
-      proxyInfo = `(HTTPS_PROXY=${proxyHost})(HTTPS_PROXY_PORT=${proxyPort})`;
+    if (proxyHost != null) {
+      if (proxyPort != null) {
+        proxyInfo = `(HTTPS_PROXY=${proxyHost})(HTTPS_PROXY_PORT=${proxyPort})`;
+      } else {
+        proxyInfo = `(HTTPS_PROXY=${proxyHost})`;
+      }
     }
 
     if (protocol == null) protocol = 'TCP';
     let naddr = 0;
     // ; groups the user into a ADDRESS_LIST
-    let addressLists = hostInfo.split(";");
-    for (let addressList in addressLists) {
+    const addressLists = hostInfo.split(";");
+    for (const addressList in addressLists) {
       let addressNodeCount = 0;
-      let addressListBuilder = new Array();
+      const addressListBuilder = new Array();
       for (const match of addressLists[addressList].matchAll(HOSTNAMES_PATTERN)) {
-        let hostnames = (match.groups.hostnames).split(',');
+        const hostnames = (match.groups.hostnames).split(',');
         let port = match.groups.port;
         if (port == null) {
           port = '1521' + '';
         }
-        for (let hname in hostnames) {
+        for (const hname in hostnames) {
           addressListBuilder.push(this.getAddrStr(hostnames[hname], port, protocol, proxyInfo));
           shost = hostnames[hname];
           addressNodeCount++;
@@ -296,7 +300,7 @@ class EZConnectResolver {
   buildDescriptionParams() {
     if (this.urlProps.size === 0)
       return '';
-    let builder = new Array();
+    const builder = new Array();
     this.urlProps.forEach(function(v, k) {
       if (DESCRIPTION_PARAMS.includes(k)) // Add only if it is a DESCRIPTION node parameter
         builder.push(`(${k}=${v})`);
@@ -314,10 +318,11 @@ class EZConnectResolver {
     if (protocol != null && protocol.toLowerCase() == "tcps") {
       // In EZConnect format if the DN match is not specified the enable it
       // by default for TCPS protocol.
-      const serverDNMatch = this.urlProps.get("SSL_SERVER_DN_MATCH") || 'TRUE';
+      const serverDNMatch = this.urlProps.get("SSL_SERVER_DN_MATCH");
       const serverCertDN = this.urlProps.get("SSL_SERVER_CERT_DN");
       const walletDir = this.urlProps.get("MY_WALLET_DIRECTORY");
-      securityInfo.push(`(SSL_SERVER_DN_MATCH=${serverDNMatch})`);
+      if (serverDNMatch != null)
+        securityInfo.push(`(SSL_SERVER_DN_MATCH=${serverDNMatch})`);
       if (serverCertDN != null)
         securityInfo.push(`(SSL_SERVER_CERT_DN=${serverCertDN}})`);
       if (walletDir != null)
@@ -338,8 +343,8 @@ class EZConnectResolver {
    * @return the parsed URL which does not contain the extended settings part.
    */
   parseExtendedSettings(urlStr) {
-    let urlBytes = Array.from(urlStr.trim());
-    let extendedSettingsIndex = this.findExtendedSettingPosition(urlBytes);
+    const urlBytes = Array.from(urlStr.trim());
+    const extendedSettingsIndex = this.findExtendedSettingPosition(urlBytes);
 
     if (extendedSettingsIndex == -1) {
       return urlStr; // No extended settings configuration found
@@ -356,7 +361,7 @@ class EZConnectResolver {
   parseExtendedProperties(urlChars, extIndex) {
     let key = null;
     let value = null;
-    let token = new Array(urlChars.length);
+    const token = new Array(urlChars.length);
     let tokenIndx = 0;
     let indices = '';
     for (let i = extIndex; i < urlChars.length; i++) {
@@ -417,7 +422,7 @@ class EZConnectResolver {
   parseQuotedString(startIndex, urlChars, tokenIndex, token) {
     let i = startIndex + 1; // look for closing '"' from the next index
     while (i < urlChars.length) {
-      let curChar = urlChars[i];
+      const curChar = urlChars[i];
       if (curChar == EXT_DOUBLE_QT) {
         // Got the " which ends the quoted block, so break the loop
         // Return the new indices, caller would resume from this new indices.
@@ -435,8 +440,8 @@ class EZConnectResolver {
    * @param value
    */
   addParam(key, value) {
-    let aliasKeyName = key.toLowerCase();
-    let propertyName = this.URL_PROPS_ALIAS.get(aliasKeyName);
+    const aliasKeyName = key.toLowerCase();
+    const propertyName = this.URL_PROPS_ALIAS.get(aliasKeyName);
     if (propertyName != null) {
       // if it is an URL alias then add to URL props
       this.urlProps.set(propertyName, value);
@@ -461,7 +466,7 @@ class EZConnectResolver {
    * @return url alias map
    */
   initializeUrlAlias() {
-    let aliasMap = new Map();
+    const aliasMap = new Map();
     aliasMap.set("enable", "ENABLE");
     aliasMap.set("failover", "FAILOVER");
     aliasMap.set("load_balance", "LOAD_BALANCE");

package/lib/thin/sqlnet/navNodes.js

@@ -32,6 +32,7 @@ const os = require("os");
 const net = require('net');
 const dns = require('dns');
 const dnsPromises = dns.promises;
+const cInfo = require("../util.js").CLIENT_INFO;
 
 const SchemaObjectFactoryInterface = {
   ADDR:0,
@@ -57,7 +58,7 @@ class Address {
    *               (ie, "(ADDRESS=(DESCRIPTION=...)) and  ")
    */
   initFromString(s) {
-    let nvp = createNVPair(s);
+    const nvp = createNVPair(s);
     this.initFromNVPair(nvp);
   }
 
@@ -69,11 +70,11 @@ class Address {
   initFromNVPair(nvp) {
     if (nvp == null || !(nvp.name.toUpperCase() == "ADDRESS"))
       errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
-    let protnvp = findNVPairRecurse(nvp, 'protocol');
-    let portnvp = findNVPairRecurse(nvp, 'port');
-    let hostnvp = findNVPairRecurse(nvp, 'host');
-    let httpsProxyNVP = findNVPairRecurse(nvp, 'https_proxy');
-    let httpsProxyPortNVP = findNVPairRecurse(nvp, 'https_proxy_port');
+    const protnvp = findNVPairRecurse(nvp, 'protocol');
+    const portnvp = findNVPairRecurse(nvp, 'port');
+    const hostnvp = findNVPairRecurse(nvp, 'host');
+    const httpsProxyNVP = findNVPairRecurse(nvp, 'https_proxy');
+    const httpsProxyPortNVP = findNVPairRecurse(nvp, 'https_proxy_port');
 
     if (portnvp)
       this.port = portnvp.atom;
@@ -120,7 +121,7 @@ class AddressList {
    *               (ie, "(ADDRESS=(DESCRIPTION=...))")
    */
   initFromString(s) {
-    let nvp = createNVPair(s);
+    const nvp = createNVPair(s);
     this.initFromNVPair(nvp);
   }
 
@@ -133,7 +134,7 @@ class AddressList {
     /* for each child of "ADDRESS_LIST", create child or set SR/LB/FO */
     this.children = [];
     let childnv, child;
-    let listsize = nvp.getListSize();
+    const listsize = nvp.getListSize();
     if (listsize == 0) /* atom can not be valid */
       errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
 
@@ -215,7 +216,7 @@ class Description {
     * Error thrown if invalid syntax (ie, "(ADDRESS=(DESCRIPTION=...))")
   */
   initFromString(s) {
-    let nvp = createNVPair(s);
+    const nvp = createNVPair(s);
     this.initFromNVPair(nvp);
   }
 
@@ -226,7 +227,7 @@ class Description {
    */
   //errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
   initFromNVPair(nvp) {
-    let listsize = nvp.getListSize();
+    const listsize = nvp.getListSize();
     let childnv, child;
     if (listsize == 0) // atom can not be valid
       errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
@@ -255,7 +256,7 @@ class Description {
         this.children.push(child);
       } else if (childnv.name.toUpperCase() == "CONNECT_DATA") {
         let tmpnv;
-        let listsize = childnv.getListSize();
+        const listsize = childnv.getListSize();
         for (let i = 0; i < listsize; i++) {
           tmpnv = childnv.getListElement(i);
           if (tmpnv.name.toUpperCase() == "CONNECTION_ID_PREFIX") {
@@ -293,7 +294,7 @@ class Description {
         if (childnv.atom > 0)
           this.params.expireTime = childnv.atom;
       } else if (childnv.name.toUpperCase() == "SECURITY") {
-        let listsize = childnv.getListSize();
+        const listsize = childnv.getListSize();
         let tmpnv;
         for (let i = 0; i < listsize; i++) {
           tmpnv = childnv.getListElement(i);
@@ -303,6 +304,10 @@ class Description {
             this.params.sslServerDNMatch = (tmpnv.atom.toLowerCase() == "yes"
             || tmpnv.atom.toLowerCase() == "on"
             || tmpnv.atom.toLowerCase() == "true");
+          } else if (tmpnv.name.toUpperCase() == "SSL_ALLOW_WEAK_DN_MATCH") {
+            this.params.sslAllowWeakDNMatch = (tmpnv.atom.toLowerCase() == "yes"
+            || tmpnv.atom.toLowerCase() == "on"
+            || tmpnv.atom.toLowerCase() == "true");
           } else if ((tmpnv.name.toUpperCase() == "WALLET_LOCATION") || (tmpnv.name.toUpperCase() == "MY_WALLET_DIRECTORY")) {
             this.params.walletLocation = tmpnv.atom;
           }
@@ -359,7 +364,7 @@ class DescriptionList {
    *               (ie, "(ADDRESS=(DESCRIPTION=...))")
    */
   initFromString(s) {
-    let nvp = createNVPair(s);
+    const nvp = createNVPair(s);
     this.initFromNVPair(nvp);
   }
 
@@ -369,7 +374,7 @@ class DescriptionList {
    *               (ie, "(ADDRESS=(DESCRIPTION=...))")
    */
   initFromNVPair(nvp) {
-    let listsize = nvp.getListSize();
+    const listsize = nvp.getListSize();
     let child, childnv;
     if (listsize == 0) /* atom can not be valid */
       errors.throwErr(errors.ERR_INVALID_CONNECT_STRING_SYNTAX);
@@ -443,7 +448,6 @@ const NavSchemaObject = {
   LB: "(LOAD_BALANCE=yes)",
   NFO: "(FAILOVER=false)",
   CD: "(CONNECT_DATA=",
-  CID: `(CID=(PROGRAM=nodejs)(HOST=${os.hostname()})(USER=${os.userInfo().username}))`,
   CONID: "(CONNECTION_ID="
 };
 const options = {
@@ -482,8 +486,8 @@ class NavAddress extends Address {
     if (!net.isIP(this.host)) {
       try {
         addresses = await dnsPromises.lookup(this.host, options);
-        for (let addr in addresses) {
-          let co = new ConnOption();
+        for (const addr in addresses) {
+          const co = new ConnOption();
           co.hostname = this.host;
           co.port = this.port;
           co.protocol = this.prot;
@@ -503,7 +507,7 @@ class NavAddress extends Address {
         // do nothing
       }
     } else {
-      let co = new ConnOption();
+      const co = new ConnOption();
       co.hostname = this.host;
       co.port = this.port;
       co.protocol = this.prot;
@@ -530,7 +534,7 @@ class NavAddress extends Address {
    * Address. Constructing a string is mainly needed when source route is ON.
    */
   addToString(cs) {
-    let NVString = this.toString();
+    const NVString = this.toString();
     let cOpts = new Array();
     cOpts = cs.getcurrentDescription().getConnectOptions();
     for (let i = 0;i < cOpts.length; i++) {
@@ -589,7 +593,7 @@ class NavAddressList extends AddressList {
 
   }
   addToString(cs) {
-    let NVString = this.toString();
+    const NVString = this.toString();
     let cOpts = new Array();
     cOpts = cs.getcurrentDescription().getConnectOptions();
     for (let i = 0;i < cOpts.length; i++) {
@@ -631,7 +635,7 @@ class NavAddressList extends AddressList {
 
   closeNVPair(cs) {
     let cOpts = new Array();
-    let childS = this.getChildrenSize();
+    const childS = this.getChildrenSize();
     if (cs.getcurrentDescription() != null) {
       cOpts = cs.getcurrentDescription().getConnectOptions();
       let numChildren = 0;
@@ -682,7 +686,7 @@ class NavDescription extends Description {
   async navigate(cs) {
     cs.sBuf.length = 0; //reset
     cs.sBuf.push("(DESCRIPTION=");
-    let desc = cs.newConnectionDescription(); //connectiondescription
+    const desc = cs.newConnectionDescription(); //connectiondescription
     if (this.retryCount != null) {
       cs.retryCount = this.getIntValue(this.retryCount, cs.retryCount);
       desc.retryCount = cs.retryCount;
@@ -711,7 +715,7 @@ class NavDescription extends Description {
     if ('enable' in this.params) {
       cs.sBuf.push("(ENABLE=" + this.params.enable + ")");
     }
-    if (('sslServerCertDN' in this.params) || ('sslServerDNMatch' in this.params) || ('walletLocation' in this.params)) {
+    if (('sslServerCertDN' in this.params) || ('sslServerDNMatch' in this.params) || ('walletLocation' in this.params) || ('sslAllowWeakDNMatch' in this.params)) {
       cs.sBuf.push("(SECURITY=");
       if ('sslServerCertDN' in this.params) {
         cs.sBuf.push("(SSL_SERVER_CERT_DN=" + this.params.sslServerCertDN + ")");
@@ -719,6 +723,9 @@ class NavDescription extends Description {
       if ('sslServerDNMatch' in this.params) {
         cs.sBuf.push("(SSL_SERVER_DN_MATCH=" + this.params.sslServerDNMatch + ")");
       }
+      if ('sslAllowWeakDNMatch' in this.params) {
+        cs.sBuf.push("(SSL_ALLOW_WEAK_DN_MATCH=" + this.params.sslAllowWeakDNMatch + ")");
+      }
       if ('walletLocation' in this.params) {
         cs.sBuf.push("(WALLET_LOCATION=" + this.params.walletLocation + ")");
       }
@@ -770,10 +777,10 @@ class NavDescription extends Description {
       if (this.connectData == null) {
         this.connectData = "(SERVICE_NAME=)";
       }
-
+      const cid = `(CID=(PROGRAM=${cInfo.program})(HOST=${cInfo.hostName})(USER=${cInfo.userName}))`;
       cOpts[i].CNdata.push(NavSchemaObject.CD);
       cOpts[i].CNdata.push(this.connectData);
-      cOpts[i].CNdata.push(NavSchemaObject.CID);
+      cOpts[i].CNdata.push(cid);
       cOpts[i].CNdata.push(")");
 
       if (this.SID != null) {
@@ -834,10 +841,10 @@ class NavDescriptionList extends DescriptionList {
    */
   static setActiveChildren(children, failover, loadBalance) {
     let randNumber;
-    let listSize = children.length;
+    const listSize = children.length;
     let tmpChildren = new Array();
-    let rand = Math.floor(Math.random() * 10);
-    let arr = new Array(listSize).fill(false);
+    const rand = Math.floor(Math.random() * 10);
+    const arr = new Array(listSize).fill(false);
 
     if (failover) {
       if (loadBalance) {