oracledb 6.3.0 → 6.5.0

package/lib/thin/protocol/messages/{connectionCookie.js → fastAuth.js}

@@ -1,4 +1,4 @@
-// Copyright (c) 2023 Oracle and/or its affiliates.
+// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -31,46 +31,48 @@ const Message = require("./base.js");
 
 /**
  * Executes a Fast Negotiation RPC function.
- * It sends Protocol Negotiation, Cookie Message, Datatype Negotiation
+ * It sends Protocol Negotiation, Datatype Negotiation
  * and OSESS Key RPC in single round trip.
  *
- * @class ConnectionCookieMessage
+ * @class FastAuthMessage
  * @extends {Message}
  */
-class ConnectionCookieMessage extends Message {
+class FastAuthMessage extends Message {
 
   /**
-   * Serializes the ConnectionCookieMessage function arguments
+   * Serializes the FastAuthMessage function arguments
    *
    * @param {object} buf input arguments
    */
   encode(buf) {
+    buf.writeUInt8(constants.TNS_MSG_TYPE_FAST_AUTH);
+    buf.writeUInt8(1); // Fast Auth version
+    buf.writeUInt8(constants.TNS_SERVER_CONVERTS_CHARS); // flag 1
+    buf.writeUInt8(0); // flag 2
     this.protocolMessage.encode(buf);
-    buf.writeUInt8(constants.TNS_MSG_TYPE_COOKIE);
-    buf.writeUInt8(1);                  // cookie version
-    buf.writeUInt8(this.cookie.protocolVersion);
-    buf.writeUInt16LE(this.cookie.charsetID);
-    buf.writeUInt8(this.cookie.flags);
-    buf.writeUInt16LE(this.cookie.ncharsetID);
-    buf.writeBytesWithLength(this.cookie.serverBanner);
-    buf.writeBytesWithLength(this.cookie.compileCaps);
-    buf.writeBytesWithLength(this.cookie.runtimeCaps);
+    buf.writeUInt16BE(0); // server charset (unused)
+    buf.writeUInt8(0); // server charset flag (unused)
+    buf.writeUInt16BE(0); // server ncharset (unused)
+    buf.caps.ttcFieldVersion = constants.TNS_CCAP_FIELD_VERSION_19_1_EXT_1;
+    buf.writeUInt8(buf.caps.ttcFieldVersion);
     this.dataTypeMessage.encode(buf);
     this.authMessage.encode(buf);
+    buf.caps.ttcFieldVersion = constants.TNS_CCAP_FIELD_VERSION_MAX;
   }
 
   processMessage(buf, messageType) {
     if (messageType === constants.TNS_MSG_TYPE_RENEGOTIATE) {
-      this.cookie.populated = false;
+      this.reNegotiate = true;
     } else if (messageType === constants.TNS_MSG_TYPE_PROTOCOL) {
       this.protocolMessage.processMessage(buf, messageType);
     } else if (messageType === constants.TNS_MSG_TYPE_DATA_TYPES) {
       this.dataTypeMessage.processMessage(buf, messageType);
     } else {
       this.authMessage.processMessage(buf, messageType);
+      this.endOfResponse = this.authMessage.endOfResponse;
     }
   }
 
 }
 
-module.exports = ConnectionCookieMessage;
+module.exports = FastAuthMessage;

package/lib/thin/protocol/messages/fetch.js

@@ -28,6 +28,7 @@
 
 const constants = require("../constants.js");
 const MessageWithData = require("./withData.js");
+const errors = require("../../../errors.js");
 
 /**
  * Executes OFETCH RPC
@@ -51,6 +52,9 @@ class FetchMessage extends MessageWithData {
   //-------------------------------------------------------------------------
   encode(buf) {
     this.writeFunctionHeader(buf);
+    if (this.statement.cursorId === 0) {
+      errors.throwErr(errors.ERR_CURSOR_HAS_BEEN_CLOSED);
+    }
     buf.writeUB4(this.statement.cursorId);
     buf.writeUB4(this.options.fetchArraySize);
   }

package/lib/thin/protocol/messages/index.js

@@ -37,12 +37,12 @@ const PingMessage = require('./ping.js');
 const ProtocolMessage = require('./protocol.js');
 const RollbackMessage = require('./rollback.js');
 const SessionReleaseMessage = require('./sessionRelease.js');
-const ConnectionCookieMessage = require('./connectionCookie.js');
+const FastAuthMessage = require('./fastAuth.js');
 
 module.exports = {
   AuthMessage,
   CommitMessage,
-  ConnectionCookieMessage,
+  FastAuthMessage,
   DataTypeMessage,
   ExecuteMessage,
   FetchMessage,

package/lib/thin/protocol/messages/protocol.js

@@ -53,6 +53,7 @@ class ProtocolMessage extends Message {
   processMessage(buf, messageType) {
     if (messageType === constants.TNS_MSG_TYPE_PROTOCOL) {
       this.processProtocolInfo(buf);
+      this.endOfResponse = !this.connection.nscon.endOfRequestSupport;
     } else {
       super.processMessage(buf, messageType);
     }
@@ -75,7 +76,14 @@ class ProtocolMessage extends Message {
     const serverCompileCaps = buf.readBytesWithLength();
     if (serverCompileCaps) {
       this.serverCompileCaps = Buffer.from(serverCompileCaps);
-      buf.caps.adjustForServerCompileCaps(this.serverCompileCaps);
+      buf.caps.adjustForServerCompileCaps(this.serverCompileCaps, this.connection.nscon);
+
+      // Set the maximum OSON field name size
+      if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_23_1) {
+        this.connection._osonMaxFieldNameSize = 65535;
+      } else {
+        this.connection._osonMaxFieldNameSize = 255;
+      }
     }
     const serverRunTimeCaps = buf.readBytesWithLength();
     if (serverRunTimeCaps) {

package/lib/thin/protocol/messages/withData.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -85,6 +85,7 @@ class MessageWithData extends Message {
       this.processIOVector(buf);
     } else if (messageType === constants.TNS_MSG_TYPE_FLUSH_OUT_BINDS) {
       this.flushOutBinds = true;
+      this.endOfResponse = true;
     } else if (messageType === constants.TNS_MSG_TYPE_ERROR) {
       this.processErrorInfo(buf);
     } else {
@@ -92,10 +93,6 @@ class MessageWithData extends Message {
     }
   }
 
-  hasMoreData() {
-    return !this.processedError && !this.flushOutBinds;
-  }
-
   processErrorInfo(buf) {
     super.processErrorInfo(buf);
     if (this.errorInfo.cursorId !== 0) {
@@ -117,7 +114,7 @@ class MessageWithData extends Message {
       this.errorOccurred = false;
       this.statement.moreRowsToFetch = false;
     } else if (this.errorInfo.num !== 0 && this.errorInfo.cursorId !== 0) {
-      this.connection.statementCache.delete(this.statement.sql);
+      this.connection.statementCache._cachedStatements.delete(this.statement.sql);
       this.statement.returnToCache = false;
     }
     if (this.errorInfo.batchErrors) {
@@ -148,15 +145,16 @@ class MessageWithData extends Message {
       buf.skipUB1();
     }
     resultSet.metadata = [];
+    const metadata = [];
+    const queryVars = [];
     for (let i = 0; i < statement.numQueryVars; i++) {
       const variable = this.processColumnInfo(buf, i + 1);
       if (prevQueryVars && i < prevQueryVars.length) {
         this._adjustFetchType(prevQueryVars[i], variable);
       }
-      statement.queryVars.push(variable);
-      resultSet.metadata.push(variable.fetchInfo);
+      queryVars.push(variable);
+      metadata.push(variable.fetchInfo);
     }
-
     let numBytes = buf.readUB4();
     if (numBytes > 0) {
       buf.skipBytesChunked();                   // current date
@@ -170,6 +168,13 @@ class MessageWithData extends Message {
       buf.skipBytesChunked();
     }
 
+    /*
+     * The message state(resultSet) and statement state(queryVars) is modified
+     * at end of the DescribeInfo function so that an OutOfPacketsError
+     * won't cause partial information state to be stored.
+     */
+    resultSet.metadata = metadata;
+    statement.queryVars = queryVars;
     this.resultSetsToSetup.push(resultSet);
   }
 
@@ -223,6 +228,7 @@ class MessageWithData extends Message {
       nullable: nullable
     };
     fetchInfo.isJson = Boolean(udsFlags & constants.TNS_UDS_FLAGS_IS_JSON);
+    fetchInfo.isOson = Boolean(udsFlags & constants.TNS_UDS_FLAGS_IS_OSON);
     if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_23_1) {
       numBytes = buf.readUB4();
       if (numBytes > 0) {
@@ -254,6 +260,19 @@ class MessageWithData extends Message {
         buf.skipUB4();                          // flags
       }
     }
+    if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_23_4) {
+      const dimensions = buf.readUB4();
+      const vectorFormat = buf.readUInt8();
+      const vectorFlags = buf.readUInt8();
+      if (fetchInfo.dbType === types.DB_TYPE_VECTOR) {
+        if (!(vectorFlags & constants.VECTOR_META_FLAG_FLEXIBLE_DIM)) {
+          fetchInfo.vectorDimensions = dimensions;
+        }
+        if (vectorFormat !== constants.VECTOR_FORMAT_FLEX) {
+          fetchInfo.vectorFormat = vectorFormat;
+        }
+      }
+    }
 
     switch (fetchInfo.dbType) {
       case types.DB_TYPE_VARCHAR:
@@ -481,6 +500,8 @@ class MessageWithData extends Message {
       }
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_JSON) {
       colValue = buf.readOson();
+    } else if (oraTypeNum === constants.TNS_DATA_TYPE_VECTOR) {
+      colValue = buf.readVector();
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_INT_NAMED) {
       const obj = buf.readDbObject();
       if (obj.packedData) {
@@ -589,7 +610,8 @@ class MessageWithData extends Message {
         if (variable.type === types.DB_TYPE_CLOB ||
             variable.type === types.DB_TYPE_NCLOB ||
             variable.type === types.DB_TYPE_BLOB ||
-            variable.type === types.DB_TYPE_JSON) {
+            variable.type === types.DB_TYPE_JSON ||
+            variable.type === types.DB_TYPE_VECTOR) {
           if (variable.type !== variable.fetchInfo.fetchType) {
             variable.type = variable.fetchInfo.fetchType;
             variable.maxSize = constants.TNS_MAX_LONG_LENGTH;
@@ -674,6 +696,9 @@ class MessageWithData extends Message {
       } else if (variable.type === types.DB_TYPE_JSON) {
         contFlag = constants.TNS_LOB_PREFETCH_FLAG;
         maxSize = lobPrefetchLength = constants.TNS_JSON_MAX_LENGTH;
+      } else if (variable.type === types.DB_TYPE_VECTOR) {
+        contFlag = constants.TNS_LOB_PREFETCH_FLAG;
+        maxSize = lobPrefetchLength = constants.TNS_VECTOR_MAX_LENGTH;
       }
       buf.writeUInt8(oraTypeNum);
       buf.writeUInt8(flag);
@@ -794,8 +819,10 @@ class MessageWithData extends Message {
     ) {
       buf.writeOracleDate(value, variable.type);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_BINARY_DOUBLE) {
+      buf.writeUInt8(8);
       buf.writeBinaryDouble(value);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_BINARY_FLOAT) {
+      buf.writeUInt8(4);
       buf.writeBinaryFloat(value);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_CURSOR) {
       let cursor = value;
@@ -822,7 +849,9 @@ class MessageWithData extends Message {
     } else if ([constants.TNS_DATA_TYPE_ROWID, constants.TNS_DATA_TYPE_UROWID].includes(oraTypeNum)) {
       buf.writeBytesWithLength(Buffer.from(value));
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_JSON) {
-      buf.writeOson(value);
+      buf.writeOson(value, this.connection._osonMaxFieldNameSize);
+    } else if (oraTypeNum === constants.TNS_DATA_TYPE_VECTOR) {
+      buf.writeVector(value);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_INT_NAMED) {
       buf.writeDbObject(value);
     } else {

package/lib/thin/protocol/packet.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -26,14 +26,18 @@
 
 'use strict';
 
-const { BaseBuffer } = require('./buffer.js');
+const { BaseBuffer } = require('../../impl/datahandlers/buffer.js');
 const { Buffer } = require('buffer');
-const constants = require("./constants.js");
-const oson = require('./oson.js');
+const constants = require('./constants.js');
+const oson = require('../../impl/datahandlers/oson.js');
 const utils = require('./utils.js');
+const vector = require('../../impl/datahandlers/vector.js');
 const errors = require("../../errors.js");
 
 const TNS_BASE64_ALPHABET_ARRAY = Buffer.from("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 'utf8');
+const FAST_AUTH_END_OF_RPC_VALUE = 0x800;
+const FAST_AUTH_END_OF_RPC_OFFSET = 0x8;
+const MSG_TYPE_OFFSET = 11;
 
 /**
  * Class used for byte chunks used in the ChunkedBytesBuffer.
@@ -289,14 +293,38 @@ class ReadPacket extends BaseBuffer {
     this.packetNum = packet.num;
   }
 
-  async waitForPackets() {
-    const packet = await this.nsi.recvPacket();
+  /**
+   * Read packets from network.
+   * If checkRequestBoundary is passed as true, it
+   * would read all packets until end of request
+   * boundary is seen in nwk header.
+   */
+  async waitForPackets(checkRequestBoundary = false) {
+    let packet = await this.nsi.recvPacket();
     if (!this.savedPackets) {
       this.savedPackets = [packet];
       this.savedPacketPos = 0;
     } else {
       this.savedPackets.push(packet);
     }
+    if (checkRequestBoundary && this.nsi.endOfRequestSupport) {
+      while (packet.type === constants.TNS_PACKET_TYPE_DATA) {
+        // End Marker
+        if ((packet.buf.readUInt16BE(8) &
+            constants.TNS_DATA_FLAGS_END_OF_REQUEST)) {
+          break;
+        }
+
+        // Single Byte 1D packet
+        if (packet.buf.length === MSG_TYPE_OFFSET &&
+            packet.buf[MSG_TYPE_OFFSET - 1] ===
+            constants.TNS_MSG_TYPE_END_OF_REQUEST) {
+          break;
+        }
+        packet = await this.nsi.recvPacket();
+        this.savedPackets.push(packet);
+      }
+    }
     this.startPacket(this.savedPackets[this.savedPacketPos++]);
   }
 
@@ -395,6 +423,22 @@ class ReadPacket extends BaseBuffer {
     return {rba, partitionID, blockNum, slotNum};
   }
 
+  /**
+   * Reads VECTOR data (QLocator followed by data) and decodes it into a
+   * JavaScript object.
+   */
+  readVector() {
+    const numBytes = this.readUB4();
+    if (numBytes === 0) {
+      return null;
+    }
+    this.skipUB8();                     // size (unused)
+    this.skipUB4();                     // chunk size (unused)
+    const decoder = new vector.VectorDecoder(this.readBytesWithLength());
+    this.skipBytesChunked();            // locator (unused)
+    return decoder.decode();
+  }
+
   skipBytesChunked() {
     const numBytes = this.readUInt8();
     if (numBytes === 0 || numBytes === constants.TNS_NULL_LENGTH_INDICATOR) {
@@ -478,6 +522,13 @@ class WritePacket extends BaseBuffer {
     if (!finalPacket) {
       buf = Buffer.from(buf);
       this.startPacket();
+    } else {
+      // Write End of RPC bit in last packet used only for fastAuth Message.
+      this.buf.writeUInt16BE(FAST_AUTH_END_OF_RPC_VALUE,
+        FAST_AUTH_END_OF_RPC_OFFSET);
+    }
+    if (!this.nsi.ntAdapter) {
+      errors.throwErr(errors.ERR_INVALID_CONNECTION);
     }
     this.nsi.ntAdapter.send(buf);
   }
@@ -525,9 +576,9 @@ class WritePacket extends BaseBuffer {
    * Encodes a JavaScript object into OSON and then writes it (QLocator
    * followed by data) to the buffer.
    */
-  writeOson(value) {
+  writeOson(value, osonMaxFieldSize) {
     const encoder = new oson.OsonEncoder();
-    const buf = encoder.encode(value);
+    const buf = encoder.encode(value, osonMaxFieldSize);
     this.writeQLocator(buf.length);
     this.writeBytesWithLength(buf);
   }
@@ -537,6 +588,40 @@ class WritePacket extends BaseBuffer {
     this.protocol.sequenceId = (this.protocol.sequenceId + 1) % 256;
   }
 
+  /**
+   * Encodes a JavaScript object into VECTOR data and then writes it (QLocator
+   * followed by data) to the buffer.
+   */
+  writeVector(value) {
+    const encoder = new vector.VectorEncoder();
+    const buf = encoder.encode(value);
+    this.writeQLocator(buf.length);
+    this.writeBytesWithLength(buf);
+  }
+
+  //---------------------------------------------------------------------------
+  // writeQLocator()
+  //
+  // Writes a QLocator. QLocators are always 40 bytes in length.
+  //---------------------------------------------------------------------------
+  writeQLocator(numBytes) {
+    this.writeUB4(40);                  // QLocator length
+    this.writeUInt8(40);                // repeated length
+    this.writeUInt16BE(38);             // internal length
+    this.writeUInt16BE(constants.TNS_LOB_QLOCATOR_VERSION);
+    this.writeUInt8(constants.TNS_LOB_LOC_FLAGS_VALUE_BASED |
+      constants.TNS_LOB_LOC_FLAGS_BLOB | constants.TNS_LOB_LOC_FLAGS_ABSTRACT);
+    this.writeUInt8(constants.TNS_LOB_LOC_FLAGS_INIT);
+    this.writeUInt16BE(0);              // additional flags
+    this.writeUInt16BE(1);              // byt1
+    this.writeUInt64BE(numBytes);
+    this.writeUInt16BE(0);              // unused
+    this.writeUInt16BE(0);              // csid
+    this.writeUInt16BE(0);              // unused
+    this.writeUInt64BE(0);              // unused
+    this.writeUInt64BE(0);              // unused
+  }
+
 }
 
 module.exports = {

package/lib/thin/protocol/protocol.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -49,7 +49,7 @@ class Protocol {
      * Compile and Runtime capabilities negotiated with Server
      * @type {object}
      */
-    this.caps = new Capabilities(conn.nscon.sAtts.version);
+    this.caps = new Capabilities(conn.nscon);
     this.writeBuf = new WritePacket(conn.nscon, this.caps, this);
     this.readBuf = new ReadPacket(conn.nscon, this.caps);
     this.callTimeout = 0;
@@ -67,11 +67,11 @@ class Protocol {
    */
   async _decodeMessage(message) {
     message.preProcess();
-    await this.readBuf.waitForPackets();
+    await this.readBuf.waitForPackets(true);
     while (true) {     // eslint-disable-line
       if (this.nsi.isBreak) {
         await this.resetMessage();
-        delete this.readBuf.savedBuffers;
+        delete this.readBuf.savedPackets;
         await this.readBuf.waitForPackets();
       }
       try {
@@ -164,7 +164,12 @@ class Protocol {
     if (message.flushOutBinds) {
       await this.flushOutBindMessage(message);
     }
-    this.txnInProgress = message.callStatus & constants.TNS_TXN_IN_PROGRESS;
+    this.txnInProgress = Boolean(message.callStatus & constants.TNS_EOCS_FLAGS_TXN_IN_PROGRESS);
+    // processes the call status flags returned by the server.
+    if (message.callStatus & constants.TNS_EOCS_FLAGS_SESS_RELEASE) {
+      message.connection.statementCache.clearCursors();
+    }
+
     if (message.errorOccurred) {
       if (callTimeoutExpired) {
         errors.throwErr(errors.ERR_CALL_TIMEOUT_EXCEEDED, this.callTimeout);

package/lib/thin/protocol/utils.js

@@ -52,30 +52,23 @@ function encodeRowID(rowID) {
   }
 }
 
-// obfuscate value and clear memory for Buffers as they are from Buffer pool
-// and are possible to stay longer
+// obfuscate value
 function setObfuscatedValue(value) {
-  const buf = crypto.randomBytes(Buffer.byteLength(value));
-  const bytes = Buffer.from(value, 'utf8');
-  const len = Buffer.byteLength(value);
-
-  const arr = [];
-  for (let i = 0; i < len; i++) {
-    arr.push(buf[i] ^ bytes[i]);
+  const valueBytes = Buffer.from(value);
+  const obfuscatedBytes = crypto.randomBytes(valueBytes.length);
+  for (let i = 0; i < valueBytes.length; i++) {
+    valueBytes[i] = obfuscatedBytes[i] ^ valueBytes[i];
   }
-  bytes.fill(0);
-  return {obfuscatedValue: buf, value: arr};
+  return {obfuscatedValue: obfuscatedBytes, value: valueBytes};
 }
 
-// returns the Deobfuscated value, after removing the obfuscation
+// returns the deobfuscated value, after removing the obfuscation
 // and clear memory of temporary Buffers coming from Buffer pool
-function getDeobfuscatedValue(value, obfuscatedValue) {
-  const arr = [];
-  for (let i = 0; i < value.length; i++) {
-    arr.push(value[i] ^ obfuscatedValue[i]);
+function getDeobfuscatedValue(valueBytes, obfuscatedBytes) {
+  const buf = Buffer.from(valueBytes);
+  for (let i = 0; i < valueBytes.length; i++) {
+    buf[i] = valueBytes[i] ^ obfuscatedBytes[i];
   }
-  const buf = Buffer.from(arr);
-  arr.fill(0);
   const retVal = buf.toString();
   buf.fill(0);
   return retVal;

package/lib/thin/sqlnet/constants.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -107,7 +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_VERSION_MIN_DATA_FLAGS: 318,
+  TNS_VERSION_MIN_END_OF_RESPONSE: 319,
   TNS_UUID_OFFSET: 45,
 
   /* Accept Packet */
@@ -143,6 +144,8 @@ module.exports =  {
   // Accept flag2
   NSPACOOB: 0x00000001, // OOB support check at connection time
   NSGPCHKSCMD: 0x01000000, // Support for Poll and Check logic
+  TNS_ACCEPT_FLAG_HAS_END_OF_REQUEST: 0x02000000,
+  TNS_ACCEPT_FLAG_FAST_AUTH: 0x10000000, // Support Fast Auth
 
   /* Redirect packet */
   NSPRDLEN: 8,   // Length of redirect data

package/lib/thin/sqlnet/ezConnectResolver.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -164,6 +164,7 @@ class EZConnectResolver {
     const poolConnectionClass = this.urlProps.get("POOL_CONNECTION_CLASS");
     const poolPurity = this.urlProps.get("POOL_PURITY");
     const serviceTag = this.urlProps.get("SERVICE_TAG");
+    const poolBoundary = this.urlProps.get("POOL_BOUNDARY");
 
     const parts = [];
     if (serviceName)
@@ -182,6 +183,8 @@ class EZConnectResolver {
       parts.push(`(SERVICE_TAG=${serviceTag})`);
     if (connectionIdPrefix)
       parts.push(`(CONNECTION_ID_PREFIX=${connectionIdPrefix})`);
+    if (poolBoundary)
+      parts.push(`(POOL_BOUNDARY=${poolBoundary})`);
     return `(CONNECT_DATA=${parts.join("")})`;
   }
 
@@ -211,17 +214,17 @@ class EZConnectResolver {
     let naddr = 0;
     // ; groups the user into a ADDRESS_LIST
     const addressLists = hostInfo.split(";");
-    for (const addressList in addressLists) {
+    for (const addressList of addressLists) {
       let addressNodeCount = 0;
       const addressListBuilder = new Array();
-      for (const match of addressLists[addressList].matchAll(HOSTNAMES_PATTERN)) {
+      for (const match of addressList.matchAll(HOSTNAMES_PATTERN)) {
         const hostnames = (match.groups.hostnames).split(',');
         let port = match.groups.port;
         if (port == null) {
           port = '1521';    //default port
         }
-        for (const hname in hostnames) {
-          addressListBuilder.push(this.getAddrStr(hostnames[hname], port, protocol, proxyInfo));
+        for (const hname of hostnames) {
+          addressListBuilder.push(this.getAddrStr(hname, port, protocol, proxyInfo));
           addressNodeCount++;
         }
       }
@@ -455,6 +458,7 @@ class EZConnectResolver {
     aliasMap.set("pool_purity", "POOL_PURITY");
     aliasMap.set("service_tag", "SERVICE_TAG");
     aliasMap.set("connection_id_prefix", "CONNECTION_ID_PREFIX");
+    aliasMap.set("pool_boundary", "POOL_BOUNDARY");
     return aliasMap;
   }
 }module.exports = EZConnectResolver;

package/lib/thin/sqlnet/navNodes.js

@@ -486,7 +486,7 @@ class NavAddress extends Address {
     if (!net.isIP(this.host)) {
       try {
         addresses = await dnsPromises.lookup(this.host, options);
-        for (const addr in addresses) {
+        for (const addr of addresses) {
           const co = new ConnOption();
           co.hostname = this.host;
           co.port = this.port;
@@ -499,7 +499,7 @@ class NavAddress extends Address {
             co.CNdata.push('(address=(protocol=' + this.prot + ')(host=' + this.host + ')(port=' + this.port + '))');
           else
             co.CNdata.push(this.toString());
-          co.host = addresses[addr].address;
+          co.host = addr.address;
           co.addr = this.addr;
           cs.getcurrentDescription().addConnectOption(co);
         }
@@ -777,7 +777,8 @@ class NavDescription extends Description {
       if (this.connectData == null) {
         this.connectData = "(SERVICE_NAME=)";
       }
-      const cid = `(CID=(PROGRAM=${cInfo.program})(HOST=${cInfo.hostName})(USER=${cInfo.userName}))`;
+      const pgmName = "\"'" + cInfo.program + "'\"";
+      const cid = `(CID=(PROGRAM=${pgmName})(HOST=${cInfo.hostName})(USER=${cInfo.userName}))`;
       cOpts[i].CNdata.push(NavSchemaObject.CD);
       cOpts[i].CNdata.push(this.connectData);
       cOpts[i].CNdata.push(cid);