oracledb 6.0.2 → 6.1.0

package/lib/thin/sqlnet/packet.js

@@ -42,7 +42,7 @@ function ConnectPacket(connectData, sAtts, flags = 0) {
   this.connectDataLen = connectData.length;
   this.overflow = false;
 
-  let size, options;
+  let size;
 
   if (this.connectDataLen <= MAX_CDATA_LEN) {
     size = NSPCNL + this.connectDataLen;
@@ -52,7 +52,7 @@ function ConnectPacket(connectData, sAtts, flags = 0) {
   }
 
   /* Building Connect Packet */
-  this.buf = Buffer.alloc(size);
+  this.buf = Buffer.allocUnsafe(size).fill(0);
   this.buf.writeUInt16BE(size, constants.NSPHDLEN);
   this.buf.writeUInt8(flags, constants.NSPHDFLGS);
   this.buf.writeUInt8(constants.NSPTCN, constants.NSPHDTYP);
@@ -69,7 +69,7 @@ function ConnectPacket(connectData, sAtts, flags = 0) {
   /* Options:
         Note : Node JS does not support TCP Out-of-band so not setting NSGSENDATTN or NSGRECVATTN
   */
-  options = constants.NSGDONTCARE;
+  const options = constants.NSGDONTCARE;
   //options = options | constants.NSGUSEVIO  /* Vectored I/O support.Uncomment when support is added */
   this.buf.writeUInt16BE(options, constants.NSPCNOPT);
 
@@ -142,24 +142,24 @@ function ConnectPacket(connectData, sAtts, flags = 0) {
  * @param {int} size of Data Packet
  * @param {boolean} isLargeSDU Large SDU
  */
-function DataPacket(size, isLargeSDU) {
+function DataPacket(isLargeSDU) {
   this.dataPtr = 0; /* data offset start */
   this.dataLen = 0; /* data offset end */
-  this.bufLen = size; /* Length of buffer */
   this.offset = 0; /* Offset for buffer read/write (fastpath) */
   this.len = 0; /* Length of buffer read/write (fastpath) */
+  this.bufLen = 0; /* Length of buffer */
 
   /**
    * Create the Data Packet(Internal)
    */
-  this.createPacket = function() {
+  this.createPacket = function(len) {
     /* Building Data Packet */
     this.dataPtr = constants.NSPDADAT;
     this.dataLen = constants.NSPDADAT;
-
-    this.buf = Buffer.alloc(size);
+    this.buf = Buffer.allocUnsafe(len).fill(0);
     this.buf.writeUInt8(0, constants.NSPHDFLGS);
     this.buf.writeUInt8(constants.NSPTDA, constants.NSPHDTYP);
+    this.bufLen = len; /* Length of buffer */
   };
 
   /**
@@ -173,7 +173,7 @@ function DataPacket(size, isLargeSDU) {
     let bytes2Copy;
 
     if (!this.buf) {
-      this.createPacket();
+      this.createPacket(len + constants.NSPDADAT); //Currently NS data packets are being used only in the connect/disconnect phase
     }
 
     if (len > this.bufLen - this.dataLen) {
@@ -245,6 +245,13 @@ function AcceptPacket(packet, sAtts) {
   /* Accept flags */
   this.flag0 = packet.buf.readUInt8(constants.NSPACFL0);
   this.flag1 = packet.buf.readUInt8(constants.NSPACFL1);
+
+  /* UUID - CDB Instance ID */
+  if (sAtts.version >= constants.TNS_VERSION_MIN_UUID) {
+    packet.dbUUID = packet.buf.subarray(constants.TNS_UUID_OFFSET,
+      constants.TNS_UUID_OFFSET + 16);
+    packet.dbUUID = packet.dbUUID.toString('base64');
+  }
 }
 
 /**
@@ -377,7 +384,7 @@ function ControlPacket() {
         } else if (err1 == NSESENDMESG) {
           this.errno = err1;
           this.notifLen = err2;
-          this.notif = Buffer.alloc(err2 + 1);
+          this.notif = Buffer.allocUnsafe(err2 + 1).fill(0);
           this.buf.copy(this.notif, 0, constants.NSPCTLDAT + 12, constants.NSPCTLDAT + 12 + err2);
         } else {
           this.errno = err1;

package/lib/thin/sqlnet/paramParser.js

@@ -37,7 +37,7 @@ const errors = require("../../errors.js");
  */
 function tnsnamesFilePath(configDir) {
   let filePathVal = null;
-  let tnsAdminVal = process.env.TNS_ADMIN;
+  const tnsAdminVal = process.env.TNS_ADMIN;
   if (configDir) {
     filePathVal = configDir + '/tnsnames.ora';
     if (fs.existsSync(filePathVal)) {
@@ -69,7 +69,7 @@ class NLParamParser {
  * @returns {Promise}
  */
   async initializeNlpa(file_path) {
-    let stat = fs.statSync(file_path);
+    const stat = fs.statSync(file_path);
 
     if (!(stat.mtime - prevmtime)) {
       /* File has been read */
@@ -139,10 +139,10 @@ class NLParamParser {
    * @return String  The modified String returned
    */
   checkNLPforComments(str) {
-    let str1 = new Array(str.length);
+    const str1 = new Array(str.length);
 
     for (let i = 0; i < str.length; i++) {
-      let current_char = str[i];
+      const current_char = str[i];
       if (current_char == '#') {
         if (i != 0) {
           break; // No need to continue. Return the line
@@ -160,14 +160,14 @@ class NLParamParser {
     * @param {string} ibuf
     */
   addNLPListElement(ibuf) {
-    let res = ibuf.split(/\r?\n/).filter(element => element);
+    const 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] + ')';
       }
-      let nvp = createNVPair(res[i]);
-      let name = nvp.name;
-      let uname = name.toUpperCase();
+      const nvp = createNVPair(res[i]);
+      const name = nvp.name;
+      const uname = name.toUpperCase();
       nvp.name = uname;
       const unames = uname.split(","); //multiple aliases (alias1, alias2, alias3)
       for (let i = 0; i < unames.length; i++) {
@@ -191,7 +191,7 @@ class NLParamParser {
     * @returns {string}
    */
   findValueOf(key) {
-    let myarr = key.split('/');
+    const myarr = key.split('/');
     return (findValue(this.ht.get(myarr[0].toUpperCase()), myarr));
   }
 

package/lib/thin/sqlnet/sessionAtts.js

@@ -59,6 +59,7 @@ class SessionAtts {
     this.nt.tcpNoDelay = true;
     this.uuid = uuid;
     this.nt.sslServerDNMatch = true;
+    this.nt.sslAllowWeakDNMatch = false;
   }
 
   /**
@@ -100,6 +101,9 @@ class SessionAtts {
       if (typeof params.sslServerDNMatch === 'boolean') {
         this.nt.sslServerDNMatch = params.sslServerDNMatch;
       }
+      if (typeof params.sslAllowWeakDNMatch === 'boolean') {
+        this.nt.sslAllowWeakDNMatch = params.sslAllowWeakDNMatch;
+      }
       if (typeof params.sslServerCertDN === 'string') {
         this.nt.sslServerCertDN = params.sslServerCertDN;
       }

package/lib/thin/statement.js

@@ -93,6 +93,7 @@ class Statement {
     this.queryVars = [];
     this.bindInfoDict = new Map();
     this.requiresFullExecute = false;
+    this.noPrefetch = false;
     this.returnToCache = false;
     this.numColumns = 0;
     this.lastRowIndex;
@@ -144,7 +145,7 @@ class Statement {
   //---------------------------------------------------------------------------
   _determineStatementType(sql) {
     sql = thinUtil.cleanSql(sql);
-    let tokens = sql.trim().trimStart('(').substring(0, 10).split(" ");
+    const tokens = sql.trim().trimStart('(').substring(0, 10).split(" ");
     if (tokens.length > 0) {
       const sqlKeyword = tokens[0].toUpperCase();
       if (["DECLARE", "BEGIN", "CALL"].includes(sqlKeyword)) {
@@ -220,7 +221,7 @@ class Statement {
         let result;
         let intoKey = -1;
         const retKey = sql.search(DML_RETURNING_KEY);
-        let intoRegex = DML_RETURNING_INTO_KEY;
+        const intoRegex = DML_RETURNING_INTO_KEY;
         // simulate lastInfdexOf with intoRegex input
         while ((result = intoRegex.exec(sql.slice(retKey))) != null) {
           intoKey = result.index;
@@ -258,7 +259,7 @@ class Statement {
       if (this.isPlSql && this.bindInfoDict.has(name)) {
         return;
       }
-      let info = new BindInfo(name, isReturnBind);
+      const info = new BindInfo(name, isReturnBind);
       this.bindInfoList.push(info);
 
       if (this.bindInfoDict.has(info.bindName)) {

package/lib/thin/util.js

@@ -28,6 +28,26 @@
 
 const constants = require('../constants');
 const errors = require('../errors.js');
+const os = require('os');
+
+//---------------------------------------------------------------------------
+// populateClientInfo()
+//
+// Populates client process information
+//---------------------------------------------------------------------------
+function populateClientInfo() {
+  this.program = process.argv0;
+  this.terminal = "unknown";
+  this.pid = process.pid.toString();
+  try {
+    this.userName = os.userInfo().username;
+  } catch {
+    this.userName = "unknown";
+  }
+  this.hostName = os.hostname();
+}
+// Initialize client data on startup.
+const CLIENT_INFO = new populateClientInfo();
 
 //---------------------------------------------------------------------------
 // getMetadataMany(sql)
@@ -48,7 +68,7 @@ function getMetadataMany(vars) {
 // Get the outBinds for the sql
 //---------------------------------------------------------------------------
 function getOutBinds(bindVars, pos) {
-  let bindByPos = (bindVars[0].name === undefined);
+  const bindByPos = (bindVars[0].name === undefined);
   let outBinds;
   if (bindByPos) {
     outBinds = [];
@@ -73,11 +93,11 @@ function getOutBinds(bindVars, pos) {
 // Get the outBinds for the sql when doing an executeMany call
 //---------------------------------------------------------------------------
 function getExecuteManyOutBinds(bindVars, numIters) {
-  let numOutBinds = getNumOutBinds(bindVars);
+  const numOutBinds = getNumOutBinds(bindVars);
   if (numOutBinds === 0) {
     return;
   }
-  let outBinds = new Array(numIters).fill(null);
+  const outBinds = new Array(numIters).fill(null);
   for (let i = 0; i < numIters; i++) {
     outBinds[i] = getOutBinds(bindVars, i);
   }
@@ -105,7 +125,7 @@ function getNumOutBinds(bindVars) {
 // Get the outBinds for the sql when doing an execute call
 //---------------------------------------------------------------------------
 function getExecuteOutBinds(bindVars) {
-  let numOutBinds = getNumOutBinds(bindVars);
+  const numOutBinds = getNumOutBinds(bindVars);
   if (numOutBinds === 0) {
     return;
   }
@@ -131,7 +151,7 @@ function cleanSql(sql) {
 // Get the bind variables from the bindInfoList of the statement object
 //---------------------------------------------------------------------------
 function getBindVars(statement) {
-  let bindVars = [];
+  const bindVars = [];
   for (const bindInfo of statement.bindInfoList) {
     bindVars.push(bindInfo.bindVar);
   }
@@ -147,8 +167,7 @@ function checkProxyUserValidity(userName) {
   let schemaUser = '', proxyUser = '';
   let quoteFound = false, openSquareBracketFound = false;
   let lastQuoteFoundIndex = 0;
-  let schemaUserStartIndex;
-  let result = {
+  const result = {
     status       : -1,
     proxyUser    : '',
     schemaUser   : ''
@@ -199,7 +218,7 @@ function checkProxyUserValidity(userName) {
   // extract schema user
   index = index + 1;
   quoteFound = false;
-  schemaUserStartIndex = index;
+  const schemaUserStartIndex = index;
   lastQuoteFoundIndex = 0;
   while (index < userNameLength) {
     // check for double quotes
@@ -280,6 +299,7 @@ function checkCredentials(params) {
 module.exports = {
   getMetadataMany,
   cleanSql,
+  CLIENT_INFO,
   getExecuteOutBinds,
   getExecuteManyOutBinds,
   getOutBinds,

package/lib/transformer.js

@@ -248,5 +248,7 @@ function transformValueIn(info, value, options) {
 
 // define exports
 module.exports = {
-  transformValueIn,
+  transformJsonValue,
+  transformValueIn
+
 };

package/lib/util.js

@@ -294,18 +294,6 @@ function isTokenValid(accessToken) {
   }
 }
 
-function isPrivateKeyValid(accessToken) {
-  errors.assert(typeof accessToken.privateKey === 'string',
-    errors.ERR_TOKEN_BASED_AUTH);
-
-  if (accessToken.privateKey.startsWith("-----BEGIN PRIVATE KEY-----") ||
-    accessToken.privateKey.endsWith("-----END PRIVATE KEY-----")) {
-    return false;
-  }
-
-  return true;
-}
-
 //-----------------------------------------------------------------------------
 // addTypeProperties()
 //
@@ -342,7 +330,6 @@ module.exports = {
   isArrayOfStrings,
   isObject,
   isObjectOrArray,
-  isPrivateKeyValid,
   isShardingKey,
   isSodaDocument,
   isTokenExpired,

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "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.2-darwin-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-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

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

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

@@ -1 +0,0 @@
-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

@@ -1 +0,0 @@
-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

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