WL#15239: Fix plugin option name and empty callback in the driver.

Author: rsomla1

jdbc/driver/mysql_connection.cpp

@@ -468,8 +468,16 @@ struct MySQL_Driver::WebAuthn_Callback_Setter
 
     driver = &drv;  // Set current driver.
 
-    register_callback(prx, "fido", callback_type % 3 > 1);
-    register_callback(prx, "webauthn", callback_type % 3 > 0);
+    /*
+      Note: A webauthn callback (callback_type 2 or 5) is registered with both
+      "fido" and "webauthn" plugins. A fido callback (callback_type 1 or 4)
+      is registered only with "fido" plugin. And if user did not register any
+      callback (callback_type 0 or 3) then both plugin callbacks are re-set
+      to null.
+    */
+
+    register_callback(prx, "fido", (callback_type % 3) > 1);
+    register_callback(prx, "webauthn", (callback_type % 3) > 0);
 
     /*
       Note: This will be reset to value 0-2 when user deregisters
@@ -504,7 +512,9 @@ struct MySQL_Driver::WebAuthn_Callback_Setter
   void register_callback(Proxy *proxy, std::string which, bool set_or_reset)
   {
     std::string plugin = "authentication_" + which + "_client";
-    std::string opt = which + "_messages_callback";
+    std::string opt = (which == "webauthn" ?
+      "plugin_authentication_webauthn_client" : which) +
+      "_messages_callback";
 
     try
     {

jdbc/driver/mysql_driver.cpp

@@ -185,9 +185,13 @@ void MySQL_Driver::threadEnd()
 
 void MySQL_Driver::setCallBack(sql::WebAuthn_Callback&& cb)
 {
-  webauthn_callback = cb ? std::move(cb) : nullptr;
+  if (cb)
+    webauthn_callback = std::move(cb);
+  else
+    webauthn_callback = nullptr;
+
   fido_callback
-    = reinterpret_cast<Fido_Callback*>(cb ? 1LL : 0LL);
+    = reinterpret_cast<Fido_Callback*>(webauthn_callback ? 1LL : 0LL);
 }
 
 void MySQL_Driver::setCallBack(sql::WebAuthn_Callback& cb)
@@ -198,15 +202,20 @@ void MySQL_Driver::setCallBack(sql::WebAuthn_Callback& cb)
     webauthn_callback = nullptr;
 
   fido_callback
-    = reinterpret_cast<Fido_Callback*>(cb ? 1LL : 0LL);
+    = reinterpret_cast<Fido_Callback*>(webauthn_callback ? 1LL : 0LL);
 }
 
 
-// Note: Values 1 and 4 of `fido_callback` mean that user has set an WebAuthn
-// callback before.
+/*
+  Note: Values 1 and 4 of `fido_callback` mean that user has set a WebAuthn
+  callback before and it can not be overwritten by Fido one. If later user
+  de-registers a WebAuthn callaback then `fido_callback` becomes 0 or 4 and
+  error will not be thrown -- user can set a new Fido callback in this
+  situation.
+*/
 
 #define CHECK_FIDO_ERROR \
-  if (1 == reinterpret_cast<intptr_t>(fido_callback) % 3) \
+  if (1 == (reinterpret_cast<intptr_t>(fido_callback) % 3)) \
   throw sql::SQLException{ \
     "You are trying to overwrithe WebAuthn callback with FIDO one. " \
     "FIDO authentication plugin and the corresponding callback type " \
@@ -217,9 +226,14 @@ void MySQL_Driver::setCallBack(sql::WebAuthn_Callback& cb)
 void MySQL_Driver::setCallBack(sql::Fido_Callback&& cb)
 {
   CHECK_FIDO_ERROR;
-  webauthn_callback = cb ? std::move(cb) : nullptr;
+
+  if (cb)
+    webauthn_callback = std::move(cb);
+  else
+    webauthn_callback = nullptr;
+
   fido_callback
-    = reinterpret_cast<Fido_Callback*>(cb ? 2LL : 0LL);
+    = reinterpret_cast<Fido_Callback*>(webauthn_callback ? 2LL : 0LL);
 }
 
 void MySQL_Driver::setCallBack(sql::Fido_Callback& cb)
@@ -232,7 +246,7 @@ void MySQL_Driver::setCallBack(sql::Fido_Callback& cb)
     webauthn_callback = nullptr;
 
   fido_callback
-    = reinterpret_cast<Fido_Callback*>(cb ? 2LL : 0LL);
+    = reinterpret_cast<Fido_Callback*>(webauthn_callback ? 2LL : 0LL);
 }
 
 } /* namespace mysql */