WL#16452: Bundle all installable authentication plugins when building the C-extension

SubCoder1 · SubCoder1 · commit 396fb25530fa · 2024-08-26T20:25:09.000+05:30
The aim of this WorkLog is to bundle all of the authentication client plugins
while building the C-extension of Connector/Python for both WHL and RPM package
types.

Change-Id: I8751b1f09db31ef87bf56526b3eb5dba39b69cd0
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Full release notes:
 v9.1.0
 ======
 
+- WL#16452: Bundle all installable authentication plugins when building the C-extension
 - WL#16444: Drop build support for DEB packages
 - WL#16442: Upgrade gssapi version to 1.8.3
 - WL#16411: Improve wheel metadata information for Classic and XDevAPI connectors
diff --git a/mysql-connector-python/cpydist/__init__.py b/mysql-connector-python/cpydist/__init__.py
@@ -277,12 +277,39 @@ def _copy_vendor_libraries(self):
         bundle_plugin_libs = False
         if self.with_mysql_capi:
             plugin_ext = "dll" if os.name == "nt" else "so"
-            plugin_path = os.path.join(self.with_mysql_capi, "lib", "plugin")
+            expected_plugin_paths = [
+                ("lib", "plugin"),
+                ("lib", "mysql", "plugin"),
+                ("lib64", "mysql", "plugin"),
+            ]
+            plugin_path = ""
+            for path in expected_plugin_paths:
+                plugin_path = os.path.join(self.with_mysql_capi, *path)
+                if os.path.exists(plugin_path):
+                    self.log.info("plugin_path is set as : %s", plugin_path)
+                    break
+                plugin_path = ""
+
+            if not len(plugin_path):
+                searched_paths = ",".join(["/".join(p) for p in expected_plugin_paths])
+                self.log.error(
+                    "None of the expected authentication plugins directories exist : %s",
+                    searched_paths,
+                )
+                raise FileNotFoundError(
+                    f"None of the expected authentication plugins directories exist : {searched_paths}"
+                )
+
             plugin_list = [
                 ("LDAP", f"authentication_ldap_sasl_client.{plugin_ext}"),
                 ("Kerberos", f"authentication_kerberos_client.{plugin_ext}"),
                 ("OCI IAM", f"authentication_oci_client.{plugin_ext}"),
                 ("WebAuthn", f"authentication_webauthn_client.{plugin_ext}"),
+                (
+                    "OpenID Connect",
+                    f"authentication_openid_connect_client.{plugin_ext}",
+                ),
+                ("MySQL Native", f"mysql_native_password.{plugin_ext}"),
             ]
 
             for plugin_name, plugin_file in plugin_list:
@@ -315,7 +342,7 @@ def _copy_vendor_libraries(self):
                         os.path.join(openssl_libs_path, "bin")
                     ):
                         openssl_libs_path = os.path.join(openssl_libs_path, "bin")
-                    self.log.info("# openssl_libs_path: %s", openssl_libs_path)
+                    print("# openssl_libs_path: %s", openssl_libs_path)
                 else:
                     openssl_libs_path = os.path.join(self.with_mysql_capi, "bin")
                 libssl, libcrypto = self._get_openssl_libs(openssl_libs_path, "dll")
diff --git a/mysql-connector-python/cpydist/data/rpm/mysql-connector-python.spec b/mysql-connector-python/cpydist/data/rpm/mysql-connector-python.spec
@@ -45,7 +45,7 @@
 %global with_openssl_opts ""
 
 %if 0%{?openssl_include_dir:1}
-%global with_openssl_opts --with-openssl-include-dir=%{openssl_include_dir} --with-openssl-lib-dir=%{openssl_lib_dir}}
+%global with_openssl_opts --with-openssl-include-dir=%{openssl_include_dir} --with-openssl-lib-dir=%{openssl_lib_dir}
 %endif
 
 # if true set byte_code_only to --byte_code_only
@@ -144,7 +144,6 @@ COMMON_INSTALL_ARGS="\
     --prefix=%{_prefix} \
     --root=%{buildroot} \
     %{with_openssl_opts} \
-    --skip-vendor \
 "
 
 %if 0%{?extra_compile_args:1}
@@ -161,12 +160,6 @@ EXTRA_LINK_ARGS=""
 
 rm -rf %{buildroot}
 
-# The LDAP client plugin from the Server is bundled if it exists under
-# 'with_mysql_capi'. For RPM builds we don't want to bundle, instead
-# we want to depend on the MySQL Server "client-plugins" RPM package.
-# Remove the plugin to force the build not to bundle.
-rm -f %{with_mysql_capi}/lib*/{,mysql/}plugin/authentication_ldap_sasl_client.*
-
 cd mysql-connector-python
 %{__python3} setup.py ${COMMON_INSTALL_ARGS} \
     --extra-compile-args="${EXTRA_COMPILE_ARGS}" \
