Skip to content

Improve mariadb client detection and only add ssl-verify-server-cert flag when using mariadb client #6519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ceesgeene wants to merge 1 commit into
base: 14.x
Choose a base branch
from
+40 −8
Open

Improve mariadb client detection and only add ssl-verify-server-cert flag when using mariadb client #6519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/Sql/SqlMariaDB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace Drush\Sql;

use PDO;

class SqlMariaDB extends SqlMysql
{
public function command(): string
Expand All @@ -15,4 +17,25 @@ public function dumpProgram(): string
{
return 'mariadb-dump';
}

public function creds($hide_password = true): string
{
$parameters = parent::creds($hide_password);

$dbSpec = $this->getDbSpec();
$attribs = [
'ssl_verify_server_cert' => (defined('Pdo\Mysql::ATTR_SSL_CA') ? Pdo\Mysql::ATTR_SSL_VERIFY_SERVER_CERT : PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT),
];

// MariaDB >= 11.4 enables TLS by default. Its client also by default
// verifies the server certificate.
// If SSL/TLS server certificate verification is explicitly disabled
// for the PDO connection used by Drupal, also explicitly disable it
// for the mariadb client.
if (($dbSpec['pdo'][$attribs['ssl_verify_server_cert']] ?? null) === false) {
$parameters .= ' ' . $this->paramsToOptions(['ssl-verify-server-cert' => 'false']);
}

return $parameters;
}
}
25 changes: 17 additions & 8 deletions src/Sql/SqlMysql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Drush\Sql;

use Consolidation\SiteProcess\Util\Escape;
use Drush\Drush;
use Drush\Exec\ExecTrait;
use PDO;
Expand All @@ -21,11 +22,24 @@ class SqlMysql extends SqlBase
*/
public static function make(array $dbSpec, array $options): SqlMysql|SqlMariaDB
{
// If the mysql version reports that it is MariaDB, use MariaDB as client.
$process = Drush::shell('mysql --version');
$process = Drush::shell(Escape::isWindows() ? 'where mysql' : 'command -v mysql');
$process->setSimulated(false);
$process->run();
if ((!$process->isSuccessful() || str_contains($process->getOutput(), 'MariaDB')) && self::programExists('mariadb') && self::programExists('mariadb-dump')) {
if ($process->isSuccessful()) {
$clientPath = $process->getOutput();
// The mysql client might be symlinked to a mariadb client.
// For example see https://pkgs.alpinelinux.org/package/edge/main/x86/mysql-client
if (is_link($clientPath)) {
$clientPath = readlink($clientPath) ?: throw new \Exception('Failed to read symlink ' . $clientPath);
}
$client = basename($clientPath);
} elseif (self::programExists('mariadb')) {
$client = 'mariadb';
} else {
throw new \Exception('Failed to locate mysql client');
}

if ($client === 'mariadb') {
$instance = new SqlMariaDB($dbSpec, $options);
} else {
$instance = new self($dbSpec, $options);
Expand Down Expand Up @@ -115,7 +129,6 @@ public function creds($hide_password = true): string
'ssl_cert' => (defined('Pdo\Mysql::ATTR_SSL_CA') ? Pdo\Mysql::ATTR_SSL_CERT : PDO::MYSQL_ATTR_SSL_CERT),
'ssl_cipher' => (defined('Pdo\Mysql::ATTR_SSL_CA') ? Pdo\Mysql::ATTR_SSL_CIPHER : PDO::MYSQL_ATTR_SSL_CIPHER),
'ssl_key' => (defined('Pdo\Mysql::ATTR_SSL_CA') ? Pdo\Mysql::ATTR_SSL_KEY : PDO::MYSQL_ATTR_SSL_KEY),
'ssl_verify_server_cert' => (defined('Pdo\Mysql::ATTR_SSL_CA') ? Pdo\Mysql::ATTR_SSL_VERIFY_SERVER_CERT : PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT),
];

if (!empty($dbSpec['pdo'][$attribs['ssl_ca']])) {
Expand All @@ -138,10 +151,6 @@ public function creds($hide_password = true): string
$parameters['ssl-key'] = $dbSpec['pdo'][$attribs['ssl_key']];
}

if (!empty($dbSpec['pdo'][$attribs['ssl_verify_server_cert']])) {
$parameters['ssl-verify-server-cert'] = $dbSpec['pdo'][$attribs['ssl_verify_server_cert']];
}

return $this->paramsToOptions($parameters);
}

Expand Down