More external authentication changes

Author: cjbj

src/dpi/include/dpiException.h

@@ -49,6 +49,7 @@ enum DpiError                          // error type
   DpiErrNoEnv         = 003, // "No OCI environment handle created"
   DpiErrInvalidState  = 004, // "Invalid state while working with timestamp"
   DpiErrUninitialized = 005, // "Uninitialized state while working with timestamp"
+  DpiErrPasswdExtAuth = 006, // "password specified with external authentication"
 };
 
 

src/dpi/src/dpiConnImpl.cpp

@@ -42,6 +42,10 @@
 # include <dpiUtils.h>
 #endif
 
+#ifndef DPIEXCEPTIONIMPL_ORACLE
+# include <dpiExceptionImpl.h>
+#endif
+
 #include <iostream>
 
 using namespace std;
@@ -88,7 +92,12 @@ try :  env_(env), pool_(NULL),
   ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&auth_,
                             OCI_HTYPE_AUTHINFO, 0, (dvoid **)0), envh_);
 
-  if (!isExternalAuth)
+  if (isExternalAuth)
+  {
+    if (password.length())
+      throw ExceptionImpl(DpiErrPasswdExtAuth);
+  }
+  else
   {
     ociCall(OCIAttrSet((void *)auth_, OCI_HTYPE_AUTHINFO,
                        (void *)user.data(), (ub4) user.length(),
@@ -228,8 +237,10 @@ void ConnImpl::release()
     ociCall(OCIAttrGet(sessh_, OCI_HTYPE_SESSION, &hasTxn_, NULL,
                        OCI_ATTR_TRANSACTION_IN_PROGRESS, errh_), errh_);
   #endif
+
   if(hasTxn_)
     rollback(); 
+
   if (pool_)
     pool_->releaseConnection(this);
   else if (env_)

src/dpi/src/dpiExceptionImpl.cpp

@@ -44,14 +44,18 @@ using namespace std;
                      PRIVATE DATA
   ---------------------------------------------------------------------------*/
 
+// don't forget to add comma for previously last message after you add a new
+// error message
+
 static const char *dpiErrors[] =
 {
   "not an error",                                     // DpiErrNoError
   "internal error",                                   // DpiErrInternal
   "could not get OCI error message",                  // DpiErrUnkOciError
-  "no OCI environment handle created"                 // DpiErrNoEnv
-  "invalid state while working with timestamp"        // DpiErrInvalidState
-  "uninitialized state while working with timestamp"  // DpiErrUninitialized
+  "no OCI environment handle created",                // DpiErrNoEnv
+  "invalid state while working with timestamp",       // DpiErrInvalidState
+  "uninitialized state while working with timestamp", // DpiErrUninitialized
+  "password specified with external authentication"   // DpiErrPasswdExtAuth
 };
 
 

src/dpi/src/dpiPoolImpl.cpp

@@ -60,7 +60,7 @@ using namespace std;
 
 
 /*****************************************************************************/
-                                                                             /*
+/*
    DESCRIPTION
      Constructor for the PoolImpl class.
 
@@ -95,6 +95,9 @@ PoolImpl::PoolImpl(EnvImpl *env, OCIEnv *envh,
 
   unsigned char spoolMode = OCI_SPOOL_ATTRVAL_NOWAIT; // spoolMode is a ub1
 
+  if (isExternalAuth && password.length())
+      throw ExceptionImpl(DpiErrPasswdExtAuth);
+
   ociCallEnv(OCIHandleAlloc((void *)envh_, (dvoid **)&errh_, 
                             OCI_HTYPE_ERROR, 0, (dvoid **)0), envh_);
 

src/njs/src/njsOracle.cpp

@@ -441,7 +441,7 @@ void Oracledb::SetConnectionClass (Local<String> property, Local<Value> value,
    DESCRIPTION
      Get Accessor of isExternalAuth property
 */
-Handle<Value> Oracledb::GetIsExternalAuth ( Local<String> property,
+Handle<Value> Oracledb::GetIsExternalAuth(Local<String> property,
                                           const AccessorInfo& info )
 {
   HandleScope scope;
@@ -451,12 +451,13 @@ Handle<Value> Oracledb::GetIsExternalAuth ( Local<String> property,
   return scope.Close(value);
 }
 
+
 /*****************************************************************************/
 /*
    DESCRIPTION
      Set Accessor of isExternalAuth property
 */
-void Oracledb::SetIsExternalAuth ( Local<String> property, Local<Value> value,
+void Oracledb::SetIsExternalAuth(Local<String> property, Local<Value> value,
                                  const AccessorInfo& info )
 {
   HandleScope scope;
@@ -496,16 +497,17 @@ Handle<Value>  Oracledb::GetConnection(const Arguments& args)
   NJS_GET_STRING_FROM_JSON ( connBaton->connStr, connBaton->error,
                              connProps, "connectString", 0, exitGetConnection );
 
-  connBaton->stmtCacheSize  = oracledb->stmtCacheSize_; 
   connBaton->connClass      = oracledb->connClass_;
-  connBaton->isExternalAuth = oracledb->isExternalAuth_; 
 
-  // the above properties may be overriden if provided as call parameters
+  // the following properties will be overriden if provided as call parameters
+
+  connBaton->stmtCacheSize  = oracledb->stmtCacheSize_; 
+  connBaton->isExternalAuth = oracledb->isExternalAuth_; 
 
   NJS_GET_UINT_FROM_JSON   ( connBaton->stmtCacheSize, connBaton->error,
                              connProps, "stmtCacheSize", 0, exitGetConnection );
-  NJS_GET_BOOL_FROM_JSON ( connBaton->isExternalAuth, connBaton->error,
-                           connProps, "isExternalAuth", 0, exitGetConnection );
+  NJS_GET_BOOL_FROM_JSON   ( connBaton->isExternalAuth, connBaton->error,
+                             connProps, "isExternalAuth", 0, exitGetConnection );
 
   connBaton->oracledb   =  oracledb; 
   connBaton->dpienv     =  oracledb->dpienv_; 

src/njs/src/njsOracle.h

@@ -103,7 +103,7 @@ class Oracledb: public ObjectWrap
    static Handle<Value> GetConnectionClass (Local<String> property,
                                             const AccessorInfo& info );
    static Handle<Value> GetIsExternalAuth(Local<String> property,
-                                        const AccessorInfo& info);
+                                          const AccessorInfo& info);
 
    // Define Setter Accessors to Properties
    static void SetPoolMin(Local<String> property,Local<Value> value,
@@ -127,7 +127,7 @@ class Oracledb: public ObjectWrap
    static void SetConnectionClass (Local<String> property, Local<Value> value,
                                    const AccessorInfo& info );
    static void SetIsExternalAuth(Local<String> property,Local<Value> value,
-                               const AccessorInfo& info);
+                                 const AccessorInfo& info);
 
 
    Oracledb();
@@ -180,7 +180,7 @@ typedef struct connectionBaton
   Oracledb *oracledb;
 
   connectionBaton() : user(""), pswrd(""), connStr(""), connClass(""),
-                      isExternalAuth(false), error("" ),
+                      isExternalAuth(false), error(""),
                       poolMax(0), poolMin(0), poolIncrement(0),
                       poolTimeout(0), stmtCacheSize(0), maxRows(0),
                       outFormat(0), dpienv(NULL),