Merge branch 'wl16154' into trunk

Change-Id: I7b05f8b8d39c157915b1084cbccfd05a60af9d1b

Author: Bogdan Degtyariov

jdbc/CMakeLists.txt

@@ -419,7 +419,7 @@ set(AUTH_PLUGINS
 )
 
 if(NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
-  list(APPEND AUTH_PLUGINS webauthn fido)
+  list(APPEND AUTH_PLUGINS webauthn)
   # Note: Kerberos authentication plugin is not supported on macOS
   if(NOT APPLE)
     list(APPEND AUTH_PLUGINS kerberos)
@@ -434,7 +434,6 @@ endif()
 # will break... For example: `krb5support` must go before `krb5`
 
 set(AUTH_DEPS_webauthn fido2)
-set(AUTH_DEPS_fido fido2)
 
 
 if(WIN32)

jdbc/cppconn/callback.h

@@ -74,7 +74,7 @@ class MySQL_Driver;
     struct My_Callback : WebAuthn_Callback
     {
       void ActionRequested(SQLString) override;
-    } 
+    }
     cb;
 
     driver->setCallback(cb);
@@ -137,6 +137,9 @@ class WebAuthn_Callback
 
 
 /*
+ * TODO: This class is not needed. Remove it when the decision to
+ *       break ABI is made.
+ *
  * Class that provides functionality allowing user code to set the
  * callback functions through inheriting, passing the callback as
  * constructor parameters or using lambdas.

jdbc/cppconn/driver.h

@@ -59,6 +59,7 @@ class CPPCONN_PUBLIC_FUNC Driver
 
   virtual const sql::SQLString & getName() = 0;
 
+  // TODO: Remove these functions when ABI breaking change is made elsewhere.
   virtual void setCallBack(sql::Fido_Callback &cb) = 0;
   virtual void setCallBack(sql::Fido_Callback &&cb) = 0;
 

jdbc/driver/mysql_connection.cpp

@@ -422,14 +422,14 @@ struct Prio
 
 
 /*
-  A callback setter object arranges for correct WebAuthn/Fido authentication
-  callbacks to be used by the correpsonding clientlib authentication plugin.
+  A callback setter object arranges for WebAuthn/Fido authentication
+  callbacks to be used by the WebAuthn clientlib authentication plugin.
 
   If a user has registered a callback with a driver that creates a connection
-  then a callback function is registered with authentication plugins which will
+  then a callback function is registered with authentication plugin which will
   call the callback stored in the driver.
 
-  The callback function registered with authentication plugins must be changed
+  The callback function registered with authentication plugin must be changed
   depending on which driver is used to create a connection. A callback setter
   object makes necessary changes when it detects that the current driver passed
   to its ctor is different from the one used last time.
@@ -469,15 +469,13 @@ struct MySQL_Driver::WebAuthn_Callback_Setter
     driver = &drv;  // Set current driver.
 
     /*
-      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.
+      Note: A webauthn callback (callback_type 2 or 5) is registered with
+      "webauthn" plugin as well as fido callback (callback_type 1 or 4).
+      If user did not register any callback (callback_type 0 or 3) then
+      plugin callback is re-set to null.
     */
 
-    register_callback(prx, "fido", (callback_type % 3) > 1);
-    register_callback(prx, "webauthn", (callback_type % 3) > 0);
+    register_callback(prx, (callback_type % 3) > 0);
 
     /*
       Note: This will be reset to value 0-2 when user deregisters
@@ -509,12 +507,10 @@ struct MySQL_Driver::WebAuthn_Callback_Setter
   std::lock_guard<std::mutex> lock;
 
   static
-  void register_callback(Proxy *proxy, std::string which, bool set_or_reset)
+  void register_callback(Proxy *proxy, bool set_or_reset)
   {
-    std::string plugin = "authentication_" + which + "_client";
-    std::string opt = (which == "webauthn" ?
-      "plugin_authentication_webauthn_client" : which) +
-      "_messages_callback";
+    std::string plugin = "authentication_webauthn_client";
+    std::string opt = "plugin_authentication_webauthn_client";
 
     try
     {
@@ -530,13 +526,6 @@ struct MySQL_Driver::WebAuthn_Callback_Setter
       if(!set_or_reset)
         return;
 
-      /*
-        If failed, plugin is not present, we ignore this fact for deprected
-        fido plugin.
-      */
-
-      if ("fido" != which)
-        throw;
     }
     catch (sql::InvalidArgumentException &e)
     {

jdbc/driver/mysql_driver.h

@@ -75,12 +75,9 @@ class CPPCONN_PUBLIC_FUNC MySQL_Driver : public sql::Driver
   ::sql::Fido_Callback fido_callback_store;
 
   /*
-    Callback function to be called by WebAuthn authentication plugin to notify 
+    Callback function to be called by WebAuthn authentication plugin to notify
     the user.
 
-    Note: Currently the same callback can be used wih deprecated Fido
-    authentication plugin.
-
     Note: The `fido_callback` pointer is re-used as a flag to indicate if
     the callback was set by a user and its type (WebAuthn vs. Fido).
   */

jdbc/test/unit/classes/connection.cpp

@@ -3964,25 +3964,25 @@ void connection::tls_deprecation()
 
 
 /*
-  Testing FIDO/WebAuthn connection and callback functionality.
+  Testing WebAuthn connection and callback functionality.
 
   These tests are designed for manual run. They require the following preparation steps:
 
-  1. Install FIDO auth plugin on the server:
+  1. Install Webauthn auth plugin on the server:
 
-    INSTALL PLUGIN authentication_fido SONAME 'authentication_fido.so'
+    INSTALL PLUGIN authentication_webauthn SONAME 'authentication_webauthn.so'
 
-  2. Create user with FIDO/Webauthn authentication:
+  2. Create user with Webauthn authentication:
 
-    CREATE USER 'ufido'@'localhost'
+    CREATE USER 'uwebauthn'@'localhost'
     IDENTIFIED WITH caching_sha2_password BY 'sha2_password'
     AND IDENTIFIED WITH authentication_webauthn
 
   3. Register FIDO:
 
-    mysql --port=13000 --protocol=tcp --user=ufido --password1 --fido-register-factor=2
+    mysql --port=13000 --protocol=tcp --user=uwebauthn --password1 --fido-register-factor=2
 
-  4. Set env variable MYSQL_FIDO to non-empty value
+  4. Set env variable MYSQL_WEBAUTHN to non-empty value
 */
 
 /* Variable value will be changed by callbacks */
@@ -4135,36 +4135,6 @@ void connection::test_fido_webauthn(sql::ConnectOptionsMap &opt, bool callback_i
 }
 
 
-/*
-  Note: This test is expecting account `ufido` configured to use
-  `authentication_fido` plugin.
-*/
-
-void connection::fido_test()
-{
-  using std::cout;
-  using std::endl;
-
-  if(!getenv("MYSQL_FIDO"))
-    return;
-
-  sql::ConnectOptionsMap opt;
-  opt[OPT_USERNAME] = "ufido";
-  opt[OPT_PASSWORD] = "sha2_password";
-
-  test_fido_webauthn<sql::Fido_Callback, MyWindowFido>(opt);
-
-  cout << endl
-  << "Check that webauthn callback is not used for fido accounts" << endl;
-
-  test_fido_webauthn<sql::WebAuthn_Callback, MyWindowWebAuthn>(opt, true);
-
-  // Clear up the callback.
-  sql::Driver *driver = sql::mysql::get_driver_instance();
-  driver->setCallBack(sql::WebAuthn_Callback{nullptr});
-}
-
-
 /*
   Note: This test is expecting account `uwebauthn` configured to use
   `authentication_webauthn` plugin.
@@ -4175,7 +4145,7 @@ void connection::webauthn_test()
   using std::cout;
   using std::endl;
 
-  if(!getenv("MYSQL_FIDO") && !getenv("MYSQL_WEBAUTHN"))
+  if(!getenv("MYSQL_WEBAUTHN"))
     return;
 
   sql::ConnectOptionsMap opt;

jdbc/test/unit/classes/connection.h

@@ -100,10 +100,10 @@ class connection : public unit_fixture
   TEST_CASE(dns_srv);
   TEST_CASE(mfa);
   TEST_CASE(tls_deprecation);
-  TEST_CASE(fido_test);
   TEST_CASE(webauthn_test);
   TEST_CASE(normalize_ssl_options);
   TEST_CASE(macro_version);
+
   }
 
   /**
@@ -320,10 +320,9 @@ class connection : public unit_fixture
   void normalize_ssl_options();
 
   /*
-   * Test for checking fido connection.
+   * Test for checking webauthn connection.
    *
    */
-  void fido_test();
   void webauthn_test();
 
   /*