Merge pull request #31912 from totten/mysql-ssl-dbconnect

(dev/core#1926) MySQL SSL - Fixes for Backdrop, Drupal 7, Standalone
civicrm · Jan 31, 2025 · 08bee84 · 08bee84
2 parents a207a31 + f8717af
commit 08bee84
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
@@ -337,10 +337,8 @@ public static function runSqlQuery($dsn, $queryString, $prefix = NULL, $dieOnErr
     }
     else {
       require_once 'DB.php';
-      $dsn = CRM_Utils_SQL::autoSwitchDSN($dsn);
       try {
-        $options = CRM_Utils_SQL::isSSLDSN($dsn) ? ['ssl' => TRUE] : [];
-        $db = DB::connect($dsn, $options);
+        $db = CRM_Utils_SQL::connect($dsn);
       }
       catch (Exception $e) {
         throw new CRM_Core_Exception("Cannot open $dsn: " . $e->getMessage());

diff --git a/CRM/Utils/SQL.php b/CRM/Utils/SQL.php
@@ -179,6 +179,12 @@ public static function getDatabaseVersion() {
     return CRM_Core_DAO::singleValueQuery('SELECT VERSION()');
   }
 
+  public static function connect($dsn) {
+    $dsn = CRM_Utils_SQL::autoSwitchDSN($dsn);
+    $options = CRM_Utils_SQL::isSSLDSN($dsn) ? ['ssl' => TRUE] : [];
+    return DB::connect($dsn, $options);
+  }
+
   /**
    * Does the DSN indicate the connection should use ssl.
    *

diff --git a/CRM/Utils/System/Backdrop.php b/CRM/Utils/System/Backdrop.php
@@ -289,9 +289,9 @@ protected function getUsersTableName() {
   public function authenticate($name, $password, $loadCMSBootstrap = FALSE, $realPath = NULL) {
     $config = CRM_Core_Config::singleton();
 
-    $ufDSN = CRM_Utils_SQL::autoSwitchDSN($config->userFrameworkDSN);
+    $ufDSN = $config->userFrameworkDSN;
     try {
-      $dbBackdrop = DB::connect($ufDSN);
+      $dbBackdrop = CRM_Utils_SQL::connect($ufDSN);
     }
     catch (Exception $e) {
       throw new CRM_Core_Exception("Cannot connect to Backdrop database via $ufDSN, " . $e->getMessage());

diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
@@ -313,9 +313,10 @@ public function authenticate($name, $password, $loadCMSBootstrap = FALSE, $realP
 
     $config = CRM_Core_Config::singleton();
 
-    $ufDSN = CRM_Utils_SQL::autoSwitchDSN($config->userFrameworkDSN);
+    $ufDSN = $config->userFrameworkDSN;
+
     try {
-      $dbDrupal = DB::connect($ufDSN);
+      $dbDrupal = CRM_Utils_SQL::connect($ufDSN);
     }
     catch (Exception $e) {
       throw new CRM_Core_Exception("Cannot connect to drupal db via $ufDSN, " . $e->getMessage());

diff --git a/ext/standaloneusers/Civi/Standalone/SessionHandler.php b/ext/standaloneusers/Civi/Standalone/SessionHandler.php
@@ -96,7 +96,7 @@ public function gc($max_lifetime): int {
    * @return bool
    */
   public function open($path, $name): bool {
-    $this->db = DB::connect(\CRM_Core_Config::singleton()->dsn);
+    $this->db = \CRM_Utils_SQL::connect(\CRM_Core_Config::singleton()->dsn);
     $this->db->autoCommit(FALSE);
 
     return TRUE;

diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -575,8 +575,7 @@ public static function toBeSkipped_getSqlOperators() {
     // Re:^^^ => the failure was probably correct behavior, and test is now fixed, but yeah 5.5 is deprecated, and don't care enough to verify.
     // Test data providers should be able to run in pre-boot environment, so we connect directly to SQL server.
     require_once 'DB.php';
-    $dsn = CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
-    $db = DB::connect($dsn);
+    $db = CRM_Utils_SQL::connect(CIVICRM_DSN);
     if ($db->connection instanceof mysqli && $db->connection->server_version < 50600) {
       $entitiesWithout[] = 'Dedupe';
     }