Improve authentication handling in Thin mode

Author: sharadraju

lib/thin/connection.js

@@ -466,11 +466,10 @@ class ThinConnectionImpl extends ConnectionImpl {
    * @return {Promise}
    */
   async connect(params) {
-    if (params.password === undefined && params.token === undefined) {
-      errors.throwErr(errors.ERR_MISSING_CREDENTIALS);
-    } else if (!params.connectString) {
+    if (!params.connectString) {
       errors.throwErr(errors.ERR_EMPTY_CONNECT_STRING);
     }
+    thinUtil.checkCredentials(params);
 
     this.sessionID = 0;
     this.serialNum = 0;

lib/thin/pool.js

@@ -32,13 +32,19 @@ const protocolUtil = require('./protocol/utils.js');
 const errors = require('../errors.js');
 const settings = require('../settings.js');
 const util = require('../util.js');
+const thinUtil = require('./util.js');
 const {getConnectionInfo} = require('./sqlnet/networkSession.js');
 const crypto = require('crypto');
 const EventEmitter = require('events');
 
 class ThinPoolImpl extends PoolImpl {
 
   _init(params) {
+    if (!params.homogeneous) {
+      errors.throwErr(errors.ERR_NOT_IMPLEMENTED, 'Heterogeneous Pool');
+    }
+    thinUtil.checkCredentials(params);
+
     this._availableObjects = [];
     this._name = 'node-thin';
     this._poolMin = params.poolMin;

lib/thin/util.js

@@ -27,6 +27,7 @@
 'use strict';
 
 const constants = require('../constants');
+const errors = require('../errors.js');
 
 //---------------------------------------------------------------------------
 // getMetadataMany(sql)
@@ -260,12 +261,29 @@ function checkProxyUserValidity(userName) {
   return result;
 }
 
+//---------------------------------------------------------------------------
+// checkCredentials()
+//
+// Check Credentials for Password Authentication
+//---------------------------------------------------------------------------
+function checkCredentials(params) {
+  if (params.token === undefined) {
+    if (params.password === undefined) {
+      errors.throwErr(errors.ERR_MISSING_CREDENTIALS);
+    }
+    if (params.externalAuth === true) {
+      errors.throwErr(errors.ERR_NOT_IMPLEMENTED, 'External Auth');
+    }
+  }
+}
+
 module.exports = {
   getMetadataMany,
   cleanSql,
   getExecuteOutBinds,
   getExecuteManyOutBinds,
   getOutBinds,
   getBindVars,
-  checkProxyUserValidity
+  checkProxyUserValidity,
+  checkCredentials
 };

test/pool.js

@@ -810,9 +810,16 @@ describe('2. pool.js', function() {
         homogeneous:   false
       };
       delete config.user;
-      const pool = await oracledb.createPool(config);
-      assert.strictEqual(pool.homogeneous, false);
-      await pool.close(0);
+      if (!oracledb.thin) {
+        const pool = await oracledb.createPool(config);
+        assert.strictEqual(pool.homogeneous, false);
+        await pool.close(0);
+      } else {
+        await assert.rejects(
+          async () => await oracledb.createPool(config),
+          /NJS-089:/
+        );
+      }
     });  // 2.15.11
 
     it('2.15.12 user name', async function() {
@@ -864,6 +871,21 @@ describe('2. pool.js', function() {
       await pool.close(0);
     });  // 2.15.14
 
+    it('2.15.15 externalAuth - true and non-empty password', async function() {
+      const config = {
+        connectString: dbConfig.connectString,
+        poolMin:       1,
+        poolMax:       1,
+        poolIncrement: 0,
+        externalAuth:  true,
+        password:  'nopass'
+      };
+      await assert.rejects(
+        async () => await oracledb.createPool(config),
+        /DPI-1032:|NJS-089:/
+      );
+    });  // 2.15.15
+
   });   // 2.15
 
   describe('2.16 Pool non-configurable properties global/local override', function() {