BUG#33739995: Pluggable authentication plugins do not work using DEB and RPM packages

nmariz · nmariz · commit 017a76dfd2cb · 2022-01-12T13:47:43.000Z
This patch fixes the pluggable authentication plugins that don't load
when using DEB or RPM packages, due to the set of the rpath to
`mysql/vendor`. But for these platforms they rely in the mysql client
plugins and the system libraries.
diff --git a/cpydist/__init__.py b/cpydist/__init__.py
@@ -92,7 +92,9 @@
     ("extra-compile-args=", None,
      "extra compile args"),
     ("extra-link-args=", None,
-     "extra link args")
+     "extra link args"),
+    ("skip-vendor", None,
+     "Skip bundling vendor libraries"),
 ]
 
 LOGGER = logging.getLogger(__name__)
@@ -108,7 +110,7 @@ class BaseCommand(Command):
     """Base command class for Connector/Python."""
 
     user_options = COMMON_USER_OPTIONS + CEXT_OPTIONS
-    boolean_options = ["debug", "byte_code_only", "keep-temp"]
+    boolean_options = ["debug", "byte_code_only", "keep_temp", "skip_vendor"]
 
     with_mysql_capi = None
     with_mysqlxpb_cext = False
@@ -128,6 +130,7 @@ class BaseCommand(Command):
     label = None
     debug = False
     keep_temp = False
+    skip_vendor = False
     build_base = None
     log = LOGGER
     vendor_folder = os.path.join("lib", "mysql", "vendor")
@@ -152,6 +155,7 @@ def initialize_options(self):
         self.label = None
         self.debug = False
         self.keep_temp = False
+        self.skip_vendor = False
 
     def finalize_options(self):
         """Finalize the options."""
@@ -192,7 +196,12 @@ def finalize_options(self):
             self.extra_link_args or
             os.environ.get("EXTRA_LINK_ARGS")
         )
-        self._copy_vendor_libraries()
+        cmd_build_ext.skip_vendor = (
+            self.skip_vendor or
+            os.environ.get("SKIP_VENDOR")
+        )
+        if not cmd_build_ext.skip_vendor:
+            self._copy_vendor_libraries()
 
     def remove_temp(self):
         """Remove temporary build files."""
@@ -352,8 +361,6 @@ def _copy_vendor_libraries(self):
             if not os.path.exists(sasl_libs_path):
                 self.log.info("sasl2 llibraries not found at %s",
                               sasl_libs_path)
-                self.distribution.package_data = {
-                    "mysql": ["vendor/*"]}
             sasl_libs = []
             sasl_plugin_libs_w = [
                 "libsasl2.*.*", "libgssapi_krb5.*.*", "libgssapi_krb5.*.*",
@@ -391,8 +398,6 @@ def _copy_vendor_libraries(self):
             if not os.path.exists(sasl2_libs_path):
                 self.log.info("sasl2 llibraries not found at %s",
                               sasl2_libs_path)
-                self.distribution.package_data = {"mysql": ["vendor/*"]}
-                return
             sasl2_libs_w = [
                 "libanonymous.*", "libcrammd5.*.*", "libdigestmd5.*.*.*.*",
                 "libgssapiv2.*", "libplain.*.*", "libscram.*.*.*.*",
@@ -633,7 +638,7 @@ def run(self):
                 if self.extra_link_args:
                     ext.extra_link_args.extend(self.extra_link_args.split())
                 # Add -rpath if the platform is Linux
-                if platform.system() == "Linux":
+                if platform.system() == "Linux" and not self.skip_vendor:
                     ext.extra_link_args.extend([
                         "-Wl,-rpath,$ORIGIN/mysql/vendor"])
                 # Add include dirs
diff --git a/cpydist/bdist_deb.py b/cpydist/bdist_deb.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -316,6 +316,7 @@ def _make_dpkg(self):
         env["EXTRA_LINK_ARGS"] = self.extra_link_args or ""
         env["LABEL"] = self.label if self.label else "0"
         env["BYTE_CODE_ONLY"] = "1" if self.byte_code_only else ""
+        env["SKIP_VENDOR"] = "1" if self.skip_vendor else ""
         proc = subprocess.Popen(cmd,
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE,
diff --git a/cpydist/data/deb/rules b/cpydist/data/deb/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 
-# Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2014, 2022, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -80,6 +80,12 @@ else
     BYTE_CODE_ONLY_OPT =
 endif
 
+ifneq ($(SKIP_VENDOR),)
+    SKIP_VENDOR_OPT = --skip-vendor
+else
+    SKIP_VENDOR_OPT =
+endif
+
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
@@ -97,7 +103,7 @@ override_dh_auto_install:
 			--with-protoc=$(MYSQLXPB_PROTOC) \
 			--extra-compile-args="$(EXTRA_COMPILE_ARGS)" \
 			--extra-link-args="$(EXTRA_LINK_ARGS)" $(OPENSSL_OPT) \
-			--root $$DESTDIR $(BYTE_CODE_ONLY_OPT); \
+			--root $$DESTDIR $(BYTE_CODE_ONLY_OPT) $(SKIP_VENDOR_OPT); \
 		find $$DESTDIR -name 'mysql_connector_*.egg-info' -prune -exec rm -rf {} \;; \
 	done
 
diff --git a/lib/mysql/connector/connection_cext.py b/lib/mysql/connector/connection_cext.py
@@ -34,7 +34,7 @@
 
 import os
 import socket
-import sysconfig
+import platform
 
 from . import errors, version
 from .constants import (
@@ -78,6 +78,15 @@ def __init__(self, **kwargs):
             os.path.dirname(os.path.abspath(_mysql_connector.__file__)),
             "mysql", "vendor", "plugin"
         )
+        if platform.system() == "Linux":
+            # Use the authentication plugins from system if they aren't bundled
+            if not os.path.exists(self._plugin_dir):
+                self._plugin_dir = (
+                    "/usr/lib64/mysql/plugin"
+                    if os.path.exists("/usr/lib64/mysql/plugin")
+                    else "/usr/lib/mysql/plugin"
+                )
+
         self.converter = None
         super(CMySQLConnection, self).__init__(**kwargs)
 
