oracledb 6.9.0 → 7.0.0

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

@@ -0,0 +1,164 @@
+// Copyright (c) 2025, Oracle and/or its affiliates.
+
+//-----------------------------------------------------------------------------
+//
+// This software is dual-licensed to you under the Universal Permissive License
+// (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+// 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
+// either license.
+//
+// If you elect to accept the software under the Apache License, Version 2.0,
+// the following applies:
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// aqDeq.js
+//
+// This file defines the messages that are sent to the database and the
+// responses that are received by the client for dequeuing an AQ message.
+//-----------------------------------------------------------------------------
+
+'use strict';
+
+const AqBaseMessage = require("./aqBase.js");
+const constants = require("../constants.js");
+
+class AqDeqMessage extends AqBaseMessage {
+
+  constructor(connImpl) {
+    super(connImpl);
+    this.functionCode = constants.TNS_FUNC_AQ_DEQ;
+    this.propsImpl = null;
+  }
+
+  //--------------------------------------------------------------------------
+  // processReturnParameter()
+  //
+  // Process the return parameters of the AQ Dequeue request.
+  //--------------------------------------------------------------------------
+  processReturnParameter(buf) {
+    const numBytes = buf.readUB4();
+    if (numBytes > 0) {
+      this._processMsgProps(buf, this.propsImpl);
+      this.propsImpl.recipients = this._processRecipients(buf);
+      this.propsImpl.payload = this._processPayload(buf);
+      this.propsImpl.msgId = this._processMsgId(buf);
+    }
+  }
+
+  //--------------------------------------------------------------------------
+  // _writeMessageBody()
+  //
+  // Writes the body of the message to the buffer.
+  //--------------------------------------------------------------------------
+  encode(buf) {
+    const queueNameBytes = Buffer.from(this.queueImpl.name, 'utf-8');
+    const consumerNameBytes = this.deqOptionsImpl.consumerName ?
+      Buffer.from(this.deqOptionsImpl.consumerName, 'utf-8') : null;
+    const correlationBytes = this.deqOptionsImpl.correlation ?
+      Buffer.from(this.deqOptionsImpl.correlation, 'utf-8') : null;
+    const conditionBytes = this.deqOptionsImpl.condition ?
+      Buffer.from(this.deqOptionsImpl.condition, 'utf-8') : null;
+    let msgIdBytes = this.deqOptionsImpl.msgId ?
+      this.deqOptionsImpl.msgId.slice(0, 16) : null;
+    const deliveryMode = this.deqOptionsImpl.deliveryMode;
+    let deqFlags = 0;
+
+    if (msgIdBytes && msgIdBytes.length < 16) {
+      msgIdBytes = Buffer.concat([msgIdBytes,
+        Buffer.alloc(16 - msgIdBytes.length)]);
+    }
+
+    if (deliveryMode === constants.TNS_AQ_MSG_BUFFERED) {
+      deqFlags |= constants.TNS_KPD_AQ_BUFMSG;
+    } else if (deliveryMode === constants.TNS_AQ_MSG_PERSISTENT_OR_BUFFERED) {
+      deqFlags |= constants.TNS_KPD_AQ_EITHER;
+    }
+
+    this.writeFunctionHeader(buf);
+    buf.writeUInt8(1);                                  // queue name (ptr)
+    buf.writeUB4(queueNameBytes.length);                // queue name len
+    buf.writeUInt8(1);                                  // message properties
+    buf.writeUInt8(1);                                  // msg props len
+    buf.writeUInt8(1);                                  // recipient list
+    buf.writeUInt8(1);                                  // recipient list len
+    if (consumerNameBytes) {
+      buf.writeUInt8(1);                                // consumer name
+      buf.writeUB4(consumerNameBytes.length);
+    } else {
+      buf.writeUInt8(0);                                // consumer name
+      buf.writeUB4(0);                                  // consumer name len
+    }
+    buf.writeSB4(this.deqOptionsImpl.mode);             // dequeue mode
+    buf.writeSB4(this.deqOptionsImpl.navigation);       // navigation
+    buf.writeSB4(this.deqOptionsImpl.visibility);       // visibility
+    buf.writeSB4(this.deqOptionsImpl.wait);             // wait
+    if (msgIdBytes) {
+      buf.writeUInt8(1);                                // select mesg id
+      buf.writeUB4(constants.TNS_AQ_MESSAGE_ID_LENGTH); // mesg id len
+    } else {
+      buf.writeUInt8(0);                                // select mesg id
+      buf.writeUB4(0);                                  // select mesg id len
+    }
+    if (correlationBytes) {
+      buf.writeUInt8(1);                                // correlation id
+      buf.writeUB4(correlationBytes.length);            // correlation id len
+    } else {
+      buf.writeUInt8(0);                                // correlation id
+      buf.writeUB4(0);                                  // correlation id len
+    }
+    buf.writeUInt8(1);                                  // toid of payload
+    buf.writeUB4(16);                                   // toid len
+    buf.writeUB2(constants.TNS_AQ_MESSAGE_VERSION);
+    buf.writeUInt8(1);                                  // payload
+    buf.writeUInt8(1);                                  // return msg id
+    buf.writeUB4(constants.TNS_AQ_MESSAGE_ID_LENGTH);
+    buf.writeUB4(deqFlags);                             // dequeue flags
+    if (conditionBytes) {
+      buf.writeUInt8(1);                                // condition (pointer)
+      buf.writeUB4(conditionBytes.length);              // condition len
+    } else {
+      buf.writeUInt8(0);                                // condition
+      buf.writeUB4(0);                                  // condition len
+    }
+    buf.writeUInt8(0);                                  // extensions
+    buf.writeUB4(0);                                    // number of extensions
+    if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_20_1) {
+      buf.writeUInt8(0);                                // JSON payload
+    }
+    if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_21_1) {
+      buf.writeUB4(0xffffffff);                         // shard id
+    }
+
+    buf.writeBytesWithLength(queueNameBytes);
+    if (consumerNameBytes) {
+      buf.writeBytesWithLength(consumerNameBytes);
+    }
+    if (msgIdBytes) {
+      buf.writeBytes(msgIdBytes);
+    }
+    if (correlationBytes) {
+      buf.writeBytesWithLength(correlationBytes);
+    }
+    buf.writeBytes(this.queueImpl.payloadToid);
+    if (conditionBytes) {
+      buf.writeBytesWithLength(conditionBytes);
+    }
+  }
+
+}
+
+module.exports = AqDeqMessage;

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

@@ -0,0 +1,135 @@
+// Copyright (c) 2025, Oracle and/or its affiliates.
+
+//-----------------------------------------------------------------------------
+//
+// This software is dual-licensed to you under the Universal Permissive License
+// (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+// 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
+// either license.
+//
+// If you elect to accept the software under the Apache License, Version 2.0,
+// the following applies:
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// aqEnq.js
+//
+// This file defines the messages that are sent to the database and the
+// responses that are received by the client for enqueuing an AQ message.
+//-----------------------------------------------------------------------------
+
+'use strict';
+
+const AqBaseMessage = require("./aqBase.js");
+const constants = require("../constants.js");
+
+class AqEnqMessage extends AqBaseMessage {
+
+  constructor(connImpl) {
+    super(connImpl);
+    this.functionCode = constants.TNS_FUNC_AQ_ENQ;
+    this.propsImpl = null;
+  }
+
+  //--------------------------------------------------------------------------
+  // processReturnParameter()
+  //
+  // Process the return parameters for the AQ enqueue request.
+  //--------------------------------------------------------------------------
+  processReturnParameter(buf) {
+    this.propsImpl.msgId = this._processMsgId(buf);
+    buf.skipUB2();                                    // extensions length
+  }
+
+  //--------------------------------------------------------------------------
+  // encode()
+  //
+  // Writes the body of the message to the buffer.
+  //--------------------------------------------------------------------------
+  encode(buf) {
+    const queueNameBytes = Buffer.from(this.queueImpl.name, 'utf-8');
+    let enqFlags = 0;
+
+    if (this.enqOptionsImpl.deliveryMode === constants.TNS_AQ_MSG_BUFFERED) {
+      enqFlags |= constants.TNS_KPD_AQ_BUFMSG;
+    }
+
+    this.writeFunctionHeader(buf);
+    buf.writeUInt8(1);                                // queue name (ptr)
+    buf.writeUB4(queueNameBytes.length);              // queue name len
+    this._writeMsgProps(buf, this.propsImpl);
+    if (!this.propsImpl.recipients) {
+      buf.writeUInt8(0);                              // recipients (ptr)
+      buf.writeUB4(0);                                // no. of key/value pairs
+    } else {
+      buf.writeUInt8(1);                              // recipients (ptr)
+      buf.writeUB4(3 * this.propsImpl.recipients.length);
+    }
+    buf.writeUB4(this.enqOptionsImpl.visibility);
+    buf.writeUInt8(0);                                // relative msg id
+    buf.writeUB4(0);                                  // relative msg len
+    buf.writeUB4(0);                                  // sequence deviation
+    buf.writeUInt8(1);                                // TOID of payload (ptr)
+    buf.writeUB4(16);                                 // TOID of payload len
+    buf.writeUB2(constants.TNS_AQ_MESSAGE_VERSION);
+    if (this.queueImpl.isJson) {
+      buf.writeUInt8(0);                              // payload (ptr)
+      buf.writeUInt8(0);                              // RAW payload (ptr)
+      buf.writeUB4(0);                                // RAW payload len
+    } else if (this.queueImpl.payloadTypeClass) {
+      buf.writeUInt8(1);                              // payload (ptr)
+      buf.writeUInt8(0);                              // RAW payload (ptr)
+      buf.writeUB4(0);                                // RAW payload len
+    } else {
+      buf.writeUInt8(0);                              // payload (ptr)
+      buf.writeUInt8(1);                              // RAW payload (ptr)
+      buf.writeUB4(this.propsImpl.payload.length);
+    }
+    buf.writeUInt8(1);                                // return msg id (ptr)
+    buf.writeUB4(constants.TNS_AQ_MESSAGE_ID_LENGTH); // return msg id len
+    buf.writeUB4(enqFlags);                           // enqueue flags
+    buf.writeUInt8(0);                                // extensions 1 (ptr)
+    buf.writeUB4(0);                                  // number of extensions 1
+    buf.writeUInt8(0);                                // extensions 2 (ptr)
+    buf.writeUB4(0);                                  // number of extensions 2
+    buf.writeUInt8(0);                                // source sequence number
+    buf.writeUB4(0);                                  // source sequence len
+    buf.writeUInt8(0);                                // max sequence number
+    buf.writeUB4(0);                                  // max sequence len
+    buf.writeUInt8(0);                                // output ack len
+    buf.writeUInt8(0);                                // correlation (ptr)
+    buf.writeUB4(0);                                  // correlation len
+    buf.writeUInt8(0);                                // sender name (ptr)
+    buf.writeUB4(0);                                  // sender name len
+    buf.writeUInt8(0);                                // sender address (ptr)
+    buf.writeUB4(0);                                  // sender address len
+    buf.writeUInt8(0);                                // sender charset id
+    buf.writeUInt8(0);                                // sender ncharset id
+    if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_20_1) {
+      buf.writeUInt8(this.queueImpl.isJson ? 1 : 0);  // JSON payload (ptr)
+    }
+
+    buf.writeBytesWithLength(queueNameBytes);
+    if (this.propsImpl.recipients) {
+      this._writeRecipients(buf, this.propsImpl);
+    }
+    buf.writeBytes(this.queueImpl.payloadToid);
+    this._writePayload(buf, this.propsImpl);
+  }
+
+}
+
+module.exports = AqEnqMessage;

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

@@ -29,6 +29,7 @@
 const { Buffer } = require('buffer');
 const constants = require("../constants.js");
 const errors = require("../../../errors.js");
+const parser = require("../../../parser.js");
 const process = require("process");
 const ED = require("../encryptDecrypt.js");
 const Message = require("./base.js");
@@ -158,6 +159,10 @@ class AuthMessage extends Message {
     let sign, tzRepr;
     if (process.env.ORA_SDTZ) {
       tzRepr = process.env.ORA_SDTZ;
+      // LOCAL and DBTIMEZONE are SQL keywords and must not be quoted.
+      if (["LOCAL", "DBTIMEZONE"].includes(tzRepr.toUpperCase())) {
+        return `ALTER SESSION SET TIME_ZONE =${tzRepr}\x00`;
+      }
     } else {
       const date = new Date();
       const timezoneMinutes = date.getTimezoneOffset();
@@ -172,7 +177,7 @@ class AuthMessage extends Message {
       tzHour = tzHour.toLocaleString('en-US', {minimumIntegerDigits: 2});
       tzRepr = `${sign}${tzHour}:${tzMinutes}`;
     }
-    return `ALTER SESSION SET TIME_ZONE ='${tzRepr}'\x00`;
+    return `ALTER SESSION SET TIME_ZONE =${parser.enquoteLiteral(tzRepr)}\x00`;
   }
 
   encode(buf) {
@@ -355,34 +360,19 @@ class AuthMessage extends Message {
     }
     if (this.functionCode === constants.TNS_FUNC_AUTH_PHASE_ONE) {
       this.functionCode = constants.TNS_FUNC_AUTH_PHASE_TWO;
-    } else {
-      let releaseNum;
-      let updateNum;
-      let portReleaseNum;
-      let portUpdateNum;
-
-      this.conn.dbDomain = this.sessionData['AUTH_SC_DB_DOMAIN'];
-      this.conn.dbName = this.sessionData['AUTH_DBNAME'];
-      this.conn.maxOpenCursors = Number(this.sessionData['AUTH_MAX_OPEN_CURSORS'] || 0);
-      this.conn.serviceName = this.sessionData['AUTH_SC_SERVICE_NAME'];
-      this.conn.instanceName = this.sessionData['AUTH_INSTANCENAME'];
-      this.conn.maxIdentifierLength = Number(this.sessionData['AUTH_MAX_IDEN_LENGTH'] || 30);
-      const fullVersionNum = Number(this.sessionData['AUTH_VERSION_NO']);
-      const versionNum = (fullVersionNum >> 24) & 0xFF;
-      this.conn.warning = this.warning;
-      if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_18_1_EXT_1) {
-        releaseNum = (fullVersionNum >> 16) & 0xFF;
-        updateNum = (fullVersionNum >> 12) & 0x0F;
-        portReleaseNum = (fullVersionNum >> 4) & 0xFF;
-        portUpdateNum = fullVersionNum & 0x0F;
-      } else {
-        releaseNum = (fullVersionNum >> 20) & 0x0F;
-        updateNum = (fullVersionNum >> 12) & 0xFF;
-        portReleaseNum = (fullVersionNum >> 8) & 0x0F;
-        portUpdateNum = fullVersionNum & 0xFF;
+    } else if (!this.changePassword && this.comboKey) {
+      const value = this.sessionData.AUTH_SVR_RESPONSE;
+      let response;
+      if (value) {
+        const encodedResponse = Buffer.from(value, "hex");
+        response = ED.decrypt(this.comboKey, encodedResponse);
+      }
+      if (
+        !response ||
+        !response.subarray(16, 32).equals(Buffer.from("SERVER_TO_CLIENT"))
+      ) {
+        errors.throwErr(errors.ERR_INVALID_SERVER_RESPONSE);
       }
-      this.conn.serverVersionString = versionNum + '.' + releaseNum + '.' + updateNum + '.' + portReleaseNum + '.' + portUpdateNum;
-      this.conn.serverVersion = versionNum * 100000000 + releaseNum * 1000000 + updateNum * 10000 + portReleaseNum * 100 + portUpdateNum * 1;
     }
   }