WL#15937: Remove authentication_fido plugin

Description:
- Removed authentication_fido and authentication_fido_client
- Removed MySQL client program option --fido-register-factor
- Updated packaging scripts
- Removed references to WITH_AUTHENTICATION_FIDO from cmake
  scripts

Change-Id: I57c6993986c058246739a90b0d5f7efea68555d7

Author: harinvadodaria

CMakeLists.txt

@@ -855,21 +855,15 @@ OPTION(WITH_AUTHENTICATION_KERBEROS
   ${WITH_AUTHENTICATION_KERBEROS_DEFAULT})
 
 IF(WITH_INTERNAL AND (NOT SOLARIS))
-  SET(WITH_AUTHENTICATION_FIDO_DEFAULT ON)
   SET(WITH_AUTHENTICATION_WEBAUTHN_DEFAULT ON)
 ELSE()
-  SET(WITH_AUTHENTICATION_FIDO_DEFAULT OFF)
   SET(WITH_AUTHENTICATION_WEBAUTHN_DEFAULT OFF)
 ENDIF()
 
 IF(WITH_INTERNAL)
   SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/internal/cmake)
 ENDIF()
 
-OPTION(WITH_AUTHENTICATION_FIDO
-  "Report error if the FIDO authentication plugin cannot be built."
-  ${WITH_AUTHENTICATION_FIDO_DEFAULT})
-
 OPTION(WITH_AUTHENTICATION_WEBAUTHN
   "Report error if the WEBAUTHN authentication plugin cannot be built."
   ${WITH_AUTHENTICATION_WEBAUTHN_DEFAULT})
@@ -878,7 +872,6 @@ OPTION(WITH_AUTHENTICATION_WEBAUTHN
 # Also default ON in pushbuild, for our community builds.
 IF(WITH_AUTHENTICATION_KERBEROS OR
     WITH_AUTHENTICATION_LDAP OR
-    WITH_AUTHENTICATION_FIDO OR
     WITH_AUTHENTICATION_WEBAUTHN OR
     DEFINED ENV{PB2WORKDIR})
   SET(WITH_AUTHENTICATION_CLIENT_PLUGINS_DEFAULT ON)
@@ -891,8 +884,6 @@ ENDIF()
 #   authentication_kerberos_client.so
 # The LDAP client authentication plugin
 #   authentication_ldap_sasl_client.so
-# The FIDO client authentication plugin
-#   authentication_fido_client.so
 # The WEBAUTHN client authentication plugin
 #   authentication_webauthn_client.so
 # The OCI client authentication plugin
@@ -902,7 +893,6 @@ OPTION(WITH_AUTHENTICATION_CLIENT_PLUGINS
   ${WITH_AUTHENTICATION_CLIENT_PLUGINS_DEFAULT})
 
 IF(NOT WITH_AUTHENTICATION_WEBAUTHN AND
-    NOT WITH_AUTHENTICATION_FIDO AND
     NOT WITH_AUTHENTICATION_CLIENT_PLUGINS)
   SET(WITH_FIDO "none")
   SET(WITH_FIDO "none" CACHE STRING "fido2 is disabled")
@@ -1975,30 +1965,23 @@ IF(APPLE)
   ENDFOREACH()
 ENDIF()
 
-IF(WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_WEBAUTHN OR
+IF(WITH_AUTHENTICATION_WEBAUTHN OR
   WITH_AUTHENTICATION_CLIENT_PLUGINS)
   IF(WITH_FIDO STREQUAL "system" AND
     NOT WITH_SSL STREQUAL "system")
-      IF (WITH_AUTHENTICATION_FIDO)
-        MESSAGE(WARNING "-DWITH_AUTHENTICATION_FIDO=ON")
-      ENDIF()
       IF (WITH_AUTHENTICATION_WEBAUTHN)
         MESSAGE(WARNING "-DWITH_AUTHENTICATION_WEBAUTHN=ON")
       ENDIF()
       MESSAGE(FATAL_ERROR "Inconsistent options for FIDO/SSL")
   ENDIF()
 
   # FIDO (or libudev) missing, warn about what is missing, and break the build.
-  IF((WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_WEBAUTHN) AND
+  IF(WITH_AUTHENTICATION_WEBAUTHN AND
     NOT FIDO_FOUND)
     SET(UDEV_WARN_MISSING)
     SET(FIDO_WARN_MISSING)
     WARN_MISSING_SYSTEM_UDEV(UDEV_WARN_MISSING)
     WARN_MISSING_SYSTEM_FIDO(FIDO_WARN_MISSING)
-    IF (WITH_AUTHENTICATION_FIDO)
-      MESSAGE(FATAL_ERROR
-        "-DWITH_AUTHENTICATION_FIDO=ON, but missing required libraries")
-    ENDIF()
     IF (WITH_AUTHENTICATION_WEBAUTHN)
       MESSAGE(FATAL_ERROR
         "-DWITH_AUTHENTICATION_WEBAUTHN=ON, but missing required libraries")
@@ -2055,7 +2038,7 @@ IF(WITH_PROTOBUF STREQUAL "bundled" OR WITH_FIDO STREQUAL "bundled")
     # Do not break the build here in case of missing libudev on Linux.
     SET(UDEV_WARN_MISSING FALSE)
     WARN_MISSING_SYSTEM_UDEV(UDEV_WARN_MISSING)
-    IF((WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_WEBAUTHN
+    IF((WITH_AUTHENTICATION_WEBAUTHN
         OR WITH_AUTHENTICATION_CLIENT_PLUGINS) AND NOT UDEV_WARN_MISSING)
       # Silence warning about CMP0075
       CMAKE_PUSH_CHECK_STATE()

client/common/user_registration.cc

@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 #define CAPABILITY_BIT_LENGTH 1
 
 /**
-  This helper method parses --register-factor/--fido-register-factor
+  This helper method parses --register-factor
   option values, and inserts the parsed values in list.
 
   @param [in]  what_factor      Comma separated list of values, which specifies
@@ -75,7 +75,7 @@ bool parse_register_option(const char *what_factor,
   This helper method is used to perform device registration against a user
   account.
 
-  Please refer @ref sect_fido_info for more information.
+  Please refer @ref sect_webauthn_info for more information.
 
   @param [in]  mysql_handle       mysql connection handle
   @param [in]  register_option    Comma separated list of values, which
@@ -95,7 +95,7 @@ bool user_device_registration(MYSQL *mysql_handle, char *register_option,
   ulong *lengths;
   uchar *server_challenge = nullptr;
   uchar *server_challenge_response = nullptr;
-  std::string client_plugin_name{"authentication_fido_client"};
+  std::string client_plugin_name;
   struct st_mysql_client_plugin *plugin_handler = nullptr;
   std::stringstream err{};
 
@@ -112,7 +112,7 @@ bool user_device_registration(MYSQL *mysql_handle, char *register_option,
   std::vector<unsigned int> factors;
   if (parse_register_option(register_option, factors)) {
     err << "Incorrect value specified for "
-           "--register-factor/--fido-register-factor option. "
+           "--register-factor option. "
            "Correct values can be '2', '3', '2,3' or '3,2'.";
     print_error(false);
     return true;

client/mysql.cc

@@ -245,7 +245,6 @@ static char *shared_memory_base_name = nullptr;
 static uint opt_protocol = 0;
 static const CHARSET_INFO *charset_info = &my_charset_latin1;
 
-static char *opt_fido_register_factor = nullptr;
 static char *opt_oci_config_file = nullptr;
 static char *opt_authentication_oci_client_config_profile = nullptr;
 static char *opt_register_factor = nullptr;
@@ -2063,11 +2062,6 @@ static struct my_option my_long_options[] = {
      "Directory path safe for LOAD DATA LOCAL INFILE to read from.",
      &opt_load_data_local_dir, &opt_load_data_local_dir, nullptr, GET_STR,
      REQUIRED_ARG, 0, 0, 0, nullptr, 0, nullptr},
-    {"fido-register-factor", 0,
-     "Specifies authentication factor, for which registration needs to be "
-     "done.",
-     &opt_fido_register_factor, &opt_fido_register_factor, nullptr, GET_STR,
-     REQUIRED_ARG, 0, 0, 0, nullptr, 0, nullptr},
     {"authentication-oci-client-config-profile", 0,
      "Specifies the configuration profile whose configuration options are to "
      "be read from the OCI configuration file. Default is DEFAULT.",
@@ -4995,25 +4989,9 @@ static int sql_real_connect(char *host, char *database, char *user, char *,
   }
 
   /* do token device registration */
-  if (opt_fido_register_factor || opt_register_factor) {
+  if (opt_register_factor) {
     char errmsg[FN_REFLEN + 1]{0};
-    if (opt_fido_register_factor) {
-      put_info(
-          "--fido-register-factor option is deprecreted, instead use "
-          "--register-factor.",
-          INFO_INFO);
-      if (opt_register_factor) {
-        put_info(
-            "--register-factor is specified. Value of --fido-register-factor "
-            "will be ignored.",
-            INFO_INFO);
-      }
-    }
-
-    if (user_device_registration(&mysql_handle,
-                                 opt_register_factor ? opt_register_factor
-                                                     : opt_fido_register_factor,
-                                 errmsg)) {
+    if (user_device_registration(&mysql_handle, opt_register_factor, errmsg)) {
       put_info(errmsg, INFO_ERROR);
       return 1;
     }

cmake/fido2.cmake

@@ -166,7 +166,7 @@ FUNCTION(MYSQL_USE_BUNDLED_FIDO)
     SET(FIDO_FOUND FALSE)
     SET(FIDO_FOUND FALSE PARENT_SCOPE)
   ENDIF()
-  # So that we skip authentication_fido_client.so
+  # So that we skip authentication_webauthn_client.so
   IF(SOLARIS)
     SET(FIDO_FOUND FALSE)
     SET(FIDO_FOUND FALSE PARENT_SCOPE)
@@ -187,7 +187,6 @@ MACRO(MYSQL_CHECK_FIDO)
     SET(OPENSSL_IS_COMPATIBLE_WITH_BUNDLED_FIDO ON)
   ELSE()
     SET(OPENSSL_IS_COMPATIBLE_WITH_BUNDLED_FIDO OFF)
-    SET(WITH_AUTHENTICATION_FIDO OFF)
     SET(WITH_AUTHENTICATION_WEBAUTHN OFF)
   ENDIF()
 

extra/libfido2/libfido2-1.13.0/src/CMakeLists.txt

@@ -152,8 +152,7 @@ ELSEIF(APPLE)
   TARGET_LINK_LIBRARIES(fido2 "-framework CoreFoundation" "-framework IOKit")
 ENDIF()
 
-IF(WITH_AUTHENTICATION_FIDO OR WITH_AUTHENTICATION_WEBAUTHN
-   OR WITH_AUTHENTICATION_CLIENT_PLUGINS)
+IF(WITH_AUTHENTICATION_WEBAUTHN OR WITH_AUTHENTICATION_CLIENT_PLUGINS)
   INSTALL_PRIVATE_LIBRARY(fido2)
 ENDIF()
 

libmysql/fido_client/CMakeLists.txt

@@ -23,8 +23,5 @@
 # Common
 ADD_SUBDIRECTORY(common)
 
-# FIDO authentication client plugin
-ADD_SUBDIRECTORY(authentication_fido)
-
 # FIDO webauthn authentication client plugin
 ADD_SUBDIRECTORY(authentication_webauthn)