mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent user from being able to override the collate / charset table creation options. 

Bad things would probably happen if they changed it to something that isn't some kind of unicode encoding.

Signed-off-by: Yip Rui Fung <rf@yrf.me>
This commit is contained in:
Yip Rui Fung 2021-02-04 19:59:45 +08:00
parent af92e6f7eb
commit 076e09b195
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/config.sample.php
View File

@ -1513,18 +1513,17 @@ $CONFIG = [
'mysql.utf8mb4' => false, 'mysql.utf8mb4' => false,
/** /**
* This configuration parameter can be used to override the default options used for table creation. * This configuration parameter can be used to add or change the default options used for table creation.
* This parameter will take precedence over mysql.utf8mb4 if that is set to true. * For changing charset / collation see mysql.utf8mb4
* *
* An example use for this parameter is where MariaDB page compression is enabled by default as the * An example use for this parameter is where MariaDB page compression is enabled by default as the
* COMPRESSED row format is not allowed there, and thus table creation will fail. * COMPRESSED row format is not allowed there, and thus table creation will fail.
* This option can then be used to override this and change/remove the row_format option. * This option can then be used to override this and change the row_format option.
* *
*/ */
'dbdefaulttableoptions' => [ 'dbdefaulttableoptions' => [
'collate' => 'utf8mb4_bin', 'row_format' => 'dynamic',
'charset' => 'utf8mb4', 'page_compressed' => '1'
'row_format' => 'compressed'
], ],
/** /**

29
lib/private/DB/ConnectionFactory.php
View File

@ -216,19 +216,34 @@ class ConnectionFactory {
} }
// set default table creation options // set default table creation options
$connectionParams['defaultTableOptions'] = $this->config->getValue('dbdefaulttableoptions', [ $defaultTableOptions = [
'collate' => 'utf8_bin' 'collate' => 'utf8_bin',
]); 'tablePrefix' => $connectionParams['tablePrefix']
];
if ($this->config->getValue('mysql.utf8mb4', false) && is_null($this->config->getValue('dbdefaulttableoptions'))) { if ($this->config->getValue('mysql.utf8mb4', false)) {
$connectionParams['defaultTableOptions'] = [ $defaultTableOptions = [
'collate' => 'utf8mb4_bin', 'collate' => 'utf8mb4_bin',
'charset' => 'utf8mb4', 'charset' => 'utf8mb4',
'row_format' => 'compressed' 'row_format' => 'compressed',
'tablePrefix' => $connectionParams['tablePrefix']
]; ];
} }
$connectionParams['defaultTableOptions']['tablePrefix'] = $connectionParams['tablePrefix']; $configTableOptions = $this->config->getValue('dbdefaulttableoptions', []);
// prevent user from overriding collation / charset and tablePrefix here (previous behavior.)
if (array_key_exists('collate', $configTableOptions)) {
unset($configTableOptions['collate']);
}
if (array_key_exists('charset', $configTableOptions)) {
unset($configTableOptions['charset']);
}
if (array_key_exists('tablePrefix', $configTableOptions)) {
unset($configTableOptions['tablePrefix']);
}
$connectionParams['defaultTableOptions'] = array_merge($defaultTableOptions, $configTableOptions);
return $connectionParams; return $connectionParams;
} }