oracledb 6.0.1 → 6.0.2

package/README.md

@@ -1,10 +1,10 @@
-# node-oracledb version 6.0.1
+# node-oracledb version 6.0.2
 
 The node-oracledb add-on for Node.js powers high performance Oracle Database
 applications.  Applications can be written in TypeScript, or directly in
 JavaScript.
 
-Use node-oracledb 6.0.1 to connect Node.js 14.6, or later, to Oracle
+Use node-oracledb 6.0.2 to connect Node.js 14.6, or later, to Oracle
 Database.  Older versions of node-oracledb may work with older versions of
 Node.js.
 
@@ -20,7 +20,8 @@ See [Getting Started with Node-oracledb][1] and [Quick Start Node-oracledb Insta
 
 ## Documentation
 
-See [Documentation for the Oracle Database Node.js Add-on][32] and the [CHANGELOG][33].
+See [Documentation for the Oracle Database Node.js Add-on][32] and the [release
+notes][33].
 
 ## Examples
 
@@ -28,8 +29,8 @@ See the [examples][30] directory.  Start with [examples/example.js][31].
 
 ## Help
 
-Issues and questions about node-oracledb can be posted on [GitHub][3] or
-[Slack][5] ([link to join Slack][6]).
+Questions about node-oracledb can be posted on [GitHub][3] or [Slack][5] ([link
+to join Slack][6]).
 
 ## <a name="testing"></a> Tests
 
@@ -74,13 +75,13 @@ limitations under the License.
 
 [1]: https://node-oracledb.readthedocs.io/en/latest/user_guide/introduction.html#getstarted
 [2]: https://node-oracledb.readthedocs.io/en/latest/user_guide/installation.html#quickstart
-[3]: https://github.com/oracle/node-oracledb/issues
+[3]: https://github.com/oracle/node-oracledb/discussions
 [4]: https://oracle.github.io/node-oracledb
 [5]: https://node-oracledb.slack.com/
 [6]: https://join.slack.com/t/node-oracledb/shared_invite/enQtNDU4Mjc2NzM5OTA2LWMzY2ZlZDY5MDdlMGZiMGRkY2IzYjI5OGU4YTEzZWM5YjQ3ODUzMjcxNWQyNzE4MzM5YjNkYjVmNDk5OWU5NDM
 [30]: https://github.com/oracle/node-oracledb/blob/main/examples
 [31]: https://github.com/oracle/node-oracledb/blob/main/examples/example.js
 [32]: https://node-oracledb.readthedocs.io/en/latest/
-[33]: https://github.com/oracle/node-oracledb/blob/main/CHANGELOG.md
+[33]: https://node-oracledb.readthedocs.io/en/latest/release_notes.html
 [34]: https://github.com/oracle/node-oracledb/blob/main/test/README.md
 [35]: https://github.com/oracle/node-oracledb/blob/main/CONTRIBUTING.md

package/build/Release/oracledb-6.0.2-darwin-x64.node-buildinfo.txt

@@ -0,0 +1 @@
+oracledb-6.0.2-darwin-x64.node v18.16.0 5caec79c2095133bc3d39b0e08d0d7a7952a4352 ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Tue, 20 Jun 2023 15:14:06 GMT

package/build/Release/oracledb-6.0.2-js-buildinfo.txt

@@ -0,0 +1 @@
+5caec79c2095133bc3d39b0e08d0d7a7952a4352

package/build/Release/oracledb-6.0.2-linux-arm64.node-buildinfo.txt

@@ -0,0 +1 @@
+oracledb-6.0.2-linux-arm64.node v14.16.0 5caec79c2095133bc3d39b0e08d0d7a7952a4352 ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Tue, 20 Jun 2023 16:56:30 GMT

package/build/Release/oracledb-6.0.2-linux-x64.node-buildinfo.txt

@@ -0,0 +1 @@
+oracledb-6.0.2-linux-x64.node v16.20.0 5caec79c2095133bc3d39b0e08d0d7a7952a4352 ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Tue, 20 Jun 2023 15:29:14 GMT

package/build/Release/oracledb-6.0.2-win32-x64.node-buildinfo.txt

@@ -0,0 +1 @@
+oracledb-6.0.2-win32-x64.node v16.19.0 5caec79c2095133bc3d39b0e08d0d7a7952a4352 ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Tue, 20 Jun 2023 15:13:50 GMT

package/lib/connection.js

@@ -146,6 +146,7 @@ class Connection extends EventEmitter {
       cls = this._buildDbObjectClass(objType);
       cls._connection = this;
       cls._objType = objType;
+      objType._connection = this._impl;
       this._dbObjectClasses.set(objType, cls);
     }
     return (cls);

package/lib/thin/dbObject.js

@@ -35,6 +35,19 @@ const { GrowableBuffer } = require('./protocol/buffer.js');
 
 class DbObjectPickleBuffer extends GrowableBuffer {
 
+  //---------------------------------------------------------------------------
+  // _readBytesWithLength()
+  //
+  // Helper function that processes the number of bytes (if needed) and then
+  // acquires the specified number of bytes from the buffer.
+  //---------------------------------------------------------------------------
+  _readBytesWithLength(numBytes) {
+    if (numBytes === constants.TNS_LONG_LENGTH_INDICATOR) {
+      numBytes = this.readUInt32BE();
+    }
+    return this.readBytes(numBytes);
+  }
+
   //---------------------------------------------------------------------------
   // getIsAtomicNull()
   //
@@ -354,7 +367,7 @@ class ThinDbObjectImpl extends DbObjectImpl {
       case types.DB_TYPE_NCHAR:
         return buf.readStr(constants.TNS_CS_NCHAR);
       case types.DB_TYPE_RAW:
-        return buf.readBytesWithLength();
+        return Buffer.from(buf.readBytesWithLength());
       case types.DB_TYPE_BINARY_DOUBLE:
         return buf.readBinaryDouble();
       case types.DB_TYPE_BINARY_FLOAT:
@@ -365,7 +378,6 @@ class ThinDbObjectImpl extends DbObjectImpl {
       case types.DB_TYPE_TIMESTAMP_LTZ:
       case types.DB_TYPE_TIMESTAMP_TZ:
         return buf.readOracleDate(false);
-      case types.DB_TYPE_BLOB:
       case types.DB_TYPE_BOOLEAN:
         return buf.readBool();
       case types.DB_TYPE_OBJECT:
@@ -374,7 +386,7 @@ class ThinDbObjectImpl extends DbObjectImpl {
           return null;
         obj = new ThinDbObjectImpl(typeClass);
         if (obj._objType.isCollection || this._objType.isCollection) {
-          obj.packedData = buf.readBytesWithLength();
+          obj.packedData = Buffer.from(buf.readBytesWithLength());
         } else {
           obj._unpackDataFromBuf(buf);
         }

package/lib/thin/pool.js

@@ -144,13 +144,13 @@ class ThinPoolImpl extends PoolImpl {
   }
 
   //---------------------------------------------------------------------------
-  // get connection from pool
+  // credentials are obfuscated and stored in an object(userConfig) during
+  // pool creation. _getConnAttrs() method is used to deobfuscate encrypted
+  // credentials for creating new connections
   //---------------------------------------------------------------------------
-  async _connect(connAttrs) {
+  async _getConnAttrs() {
     let accessToken;
-    const conn = new ThinConnectionImpl();
-    conn._pool = this;
-    let clonedAttrs = Object.assign({}, connAttrs);
+    const clonedAttrs = Object.assign({}, this._userConfig);
     if (clonedAttrs.password === null) {
       clonedAttrs.password = protocolUtil.getDeobfuscatedValue(this._password,
         this._obfuscatedPassword);
@@ -204,9 +204,7 @@ class ThinPoolImpl extends PoolImpl {
         protocolUtil.getDeobfuscatedValue(this._privateKey,
           this._obfuscatedPrivateKey);
     }
-    await conn.connect(clonedAttrs);
-    clonedAttrs = null;
-    return conn;
+    return clonedAttrs;
   }
 
   //---------------------------------------------------------------------------
@@ -318,8 +316,11 @@ class ThinPoolImpl extends PoolImpl {
   // Grows the pool to include the specified number of connections.
   //---------------------------------------------------------------------------
   async _growPool(numConns) {
+    const clonedAttrs = await this._getConnAttrs();
     while (numConns > 0) {
-      let conn = await this._connect(this._userConfig);
+      const conn = new ThinConnectionImpl();
+      conn._pool = this;
+      await conn.connect(clonedAttrs);
       conn._newSession = true;
       conn._dropSess = false;
       conn._lastTimeUsed = Date.now();

package/lib/thin/protocol/buffer.js

@@ -375,18 +375,18 @@ class BaseBuffer {
     const obj = {};
     let numBytes = this.readUB4();
     if (numBytes > 0)
-      obj.toid = this.readBytesWithLength();
+      obj.toid = Buffer.from(this.readBytesWithLength());
     numBytes = this.readUB4();
     if (numBytes > 0)
-      obj.oid = this.readBytesWithLength();
+      obj.oid = Buffer.from(this.readBytesWithLength());
     numBytes = this.readUB4();
     if (numBytes > 0)
-      obj.snapshot = this.readBytesWithLength();
+      obj.snapshot = Buffer.from(this.readBytesWithLength());
     this.skipUB2();                     // version
     numBytes = this.readUB4();
     this.skipUB2();                     // flags
     if (numBytes > 0)
-      obj.packedData = this.readBytesWithLength();
+      obj.packedData = Buffer.from(this.readBytesWithLength());
     return obj;
   }
 

package/lib/thin/protocol/encryptDecrypt.js

@@ -138,18 +138,30 @@ class EncryptDecrypt {
     if (newPassword) {
       newPasswordBytes = Buffer.from(newPassword, 'utf8');
     }
-    let sessionKeyParta = this._decrypt(passwordHash, encodedServerKey);
-    let sessionKeyPartb = Buffer.alloc(32);
-    crypto.randomFillSync(sessionKeyPartb, 0, 32);
-    let encodedClientKey = this._encrypt(passwordHash, sessionKeyPartb);
-    authObj.sessionKey = encodedClientKey.slice().toString('hex').toUpperCase().slice(0, 64);
-
-    iterations = Number(sessionData['AUTH_PBKDF2_SDER_COUNT']);
-    let mixingSalt = Buffer.from(sessionData['AUTH_PBKDF2_CSK_SALT'], 'hex');
-    let partABKey = Buffer.concat([sessionKeyPartb.slice(0, keyLen), sessionKeyParta.slice(0, keyLen)]);
-    let partABKeyStr = partABKey.toString('hex').toUpperCase();
-    let partABKeyBuffer = Buffer.from(partABKeyStr, 'utf8');
-    authObj.comboKey = crypto.pbkdf2Sync(partABKeyBuffer, mixingSalt, iterations, keyLen, 'sha512');
+    const sessionKeyParta = this._decrypt(passwordHash, encodedServerKey);
+    const sessionKeyPartb = Buffer.alloc(sessionKeyParta.length);
+    crypto.randomFillSync(sessionKeyPartb);
+    const encodedClientKey = this._encrypt(passwordHash, sessionKeyPartb);
+
+    if (sessionKeyParta.length === 48) {
+      authObj.sessionKey = encodedClientKey.slice().toString('hex').toUpperCase().slice(0, 96);
+      const buf = Buffer.alloc(24);
+      for (let i = 16; i <= 40; i++) {
+        buf[i - 16] = sessionKeyParta[i] ^ sessionKeyPartb[i];
+      }
+      const part1 = crypto.createHash("md5").update(buf.subarray(0, 16)).digest();
+      const part2 = crypto.createHash("md5").update(buf.subarray(16)).digest();
+      authObj.comboKey = Buffer.concat([part1, part2]).slice(0, keyLen);
+    } else {
+      authObj.sessionKey = encodedClientKey.slice().toString('hex').toUpperCase().slice(0, 64);
+      const mixingSalt = Buffer.from(sessionData['AUTH_PBKDF2_CSK_SALT'], 'hex');
+      iterations = Number(sessionData['AUTH_PBKDF2_SDER_COUNT']);
+      const partABKey = Buffer.concat([sessionKeyPartb.slice(0, keyLen), sessionKeyParta.slice(0, keyLen)]);
+      const partABKeyStr = partABKey.toString('hex').toUpperCase();
+      const partABKeyBuffer = Buffer.from(partABKeyStr, 'utf8');
+      authObj.comboKey = crypto.pbkdf2Sync(partABKeyBuffer, mixingSalt,
+        iterations, keyLen, 'sha512');
+    }
 
     let salt = Buffer.alloc(16);
     if (!verifier11G) {

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

@@ -173,7 +173,7 @@ class MessageWithData extends Message {
     let oid;
     let numBytes = buf.readUB4();               // OID
     if (numBytes > 0) {
-      oid = buf.readBytesWithLength();
+      oid = Buffer.from(buf.readBytesWithLength());
     }
     buf.skipUB2();                              // version
     buf.skipUB2();                              // character set id
@@ -316,10 +316,11 @@ class MessageWithData extends Message {
   processIOVector(buf) {
     let numBytes;
     buf.skipUB1();                              // flag
-    const numBinds = buf.readUB2();             // num requests
-    this.rowIndex = buf.readUB4();              // iter num
+    const temp16 = buf.readUB2();              // num requests
+    const temp32 = buf.readUB4();              // iter num
+    const numBinds = temp32 * 256 + temp16;
     buf.skipUB4();                              // num iters this time
-    buf.readUB2();                              // uac buffer length
+    buf.skipUB2();                              // uac buffer length
     numBytes = buf.readUB2();                   // bit vector for fast fetch
     if (numBytes > 0) {
       buf.skipBytes(numBytes);
@@ -378,7 +379,7 @@ class MessageWithData extends Message {
       const useLocalTime = (oraTypeNum === constants.TNS_DATA_TYPE_DATE ||
         oraTypeNum === constants.TNS_DATA_TYPE_TIMESTAMP);
       colValue = buf.readOracleDate(useLocalTime);
-    }  else if (oraTypeNum === constants.TNS_DATA_TYPE_ROWID) {
+    } else if (oraTypeNum === constants.TNS_DATA_TYPE_ROWID) {
       if (!this.inFetch) {
         colValue = buf.readStr(constants.TNS_CS_IMPLICIT);
       } else {
@@ -563,7 +564,7 @@ class MessageWithData extends Message {
 
     if (this.statement.isQuery) {
       this.inFetch = true;
-      if (this.statement.queryVars)  {
+      if (this.statement.queryVars) {
         this.outVariables = [];
         for (let i = 0; i < this.statement.queryVars.length; i++) {
           this.outVariables.push(this.statement.queryVars[i]);
@@ -582,7 +583,7 @@ class MessageWithData extends Message {
   }
 
   getBitVector(buf, numBytes) {
-    this.bitVector = buf.readBytes(numBytes);
+    this.bitVector = Buffer.from(buf.readBytes(numBytes));
   }
 
   processBindParams(buf, params) {

package/lib/thin/protocol/packet.js

@@ -220,12 +220,17 @@ class ReadPacket extends BaseBuffer {
     }
 
     // the requested bytes are split across multiple packets; if a chunked read
-    // is not in progress one is implicitly started; copy the bytes from the
-    // end of this packet
-    if (!inChunkedRead) {
-      this.chunkedBytesBuf.startChunkedRead();
+    // is in progress, a chunk is acquired that will accommodate the requested
+    // bytes; otherwise, a separate buffer will be allocated to accommodate the
+    // requested bytes
+    let buf;
+    if (inChunkedRead) {
+      buf = this.chunkedBytesBuf.getBuf(numBytes);
+    } else {
+      buf = Buffer.alloc(numBytes);
     }
-    const buf = this.chunkedBytesBuf.getBuf(numBytes);
+
+    // copy the bytes to the buffer from the remainder of this packet
     let offset = 0;
     this.buf.copy(buf, offset, this.pos, this.pos + numBytesLeft);
     offset += numBytesLeft;
@@ -241,10 +246,7 @@ class ReadPacket extends BaseBuffer {
       numBytes -= numSplitBytes;
     }
 
-    // if not in a chunked bytes read, return the buffer directly
-    if (!inChunkedRead) {
-      return this.chunkedBytesBuf.endChunkedRead();
-    }
+    return buf;
 
   }
 

package/lib/thin/sqlnet/ntTcp.js

@@ -352,13 +352,7 @@ class NTTCP {
   async pauseWrite() {
     this.checkErr();
     if (this.needsDrain) {
-      await new Promise((resolve) => {
-        this.waiter = resolve;
-        this.stream.once('drain', () => {
-          resolve();
-          this.waiter = null;
-        });
-      });
+      await new Promise((resolve) => this.stream.once('drain', resolve));
       this.checkErr();
     } else {
       await new Promise((resolve) => Timers.setImmediate(resolve));

package/lib/thin/sqlnet/paramParser.js

@@ -163,22 +163,19 @@ class NLParamParser {
     let res = ibuf.split(/\r?\n/).filter(element => element);
     for (let i = 0; i < res.length; i++) {
       if (res[i].charAt(0) != '(') {
-        res[i] = '(' + res[i];
-      }
-      if (res[i].charAt(res[i].length - 1 != ')')) {
-        res[i] = res[i] + ')';
+        res[i] = '(' + res[i] + ')';
       }
       let nvp = createNVPair(res[i]);
       let name = nvp.name;
       let uname = name.toUpperCase();
       nvp.name = uname;
-      this.add_NLPListElement(uname, nvp);
+      const unames = uname.split(","); //multiple aliases (alias1, alias2, alias3)
+      for (let i = 0; i < unames.length; i++) {
+        this.ht.set(unames[i], nvp);
+      }
     }
   }
 
-  add_NLPListElement(name, value) {
-    this.ht.set(name, value);
-  }
 
   toString() {
     let out = "";

package/lib/version.js

@@ -31,6 +31,6 @@
 module.exports = {
   VERSION_MAJOR: 6,
   VERSION_MINOR: 0,
-  VERSION_PATCH: 1,
+  VERSION_PATCH: 2,
   VERSION_SUFFIX: ''
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "A Node.js module for Oracle Database access from JavaScript and TypeScript",
   "license": "(Apache-2.0 OR UPL-1.0)",
   "homepage": "http://oracle.github.io/node-oracledb/",

package/build/Release/oracledb-6.0.1-darwin-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.0.1-darwin-x64.node v16.20.0 628884c63240a6680e2dd5a9ff5006cbf373348f ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Fri, 02 Jun 2023 22:13:14 GMT

package/build/Release/oracledb-6.0.1-js-buildinfo.txt

@@ -1 +0,0 @@
-628884c63240a6680e2dd5a9ff5006cbf373348f

package/build/Release/oracledb-6.0.1-linux-arm64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.0.1-linux-arm64.node v16.19.1 628884c63240a6680e2dd5a9ff5006cbf373348f ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Fri, 02 Jun 2023 16:31:07 GMT

package/build/Release/oracledb-6.0.1-linux-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.0.1-linux-x64.node v16.20.0 628884c63240a6680e2dd5a9ff5006cbf373348f ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Sat, 03 Jun 2023 06:55:38 GMT

package/build/Release/oracledb-6.0.1-win32-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.0.1-win32-x64.node v16.19.0 628884c63240a6680e2dd5a9ff5006cbf373348f ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Fri, 02 Jun 2023 16:39:59 GMT