Skip to content

[stable23] Recover installation when creating the database user fails and improve password strength #33515

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

Merged
blizzz merged 2 commits into from
Aug 30, 2022
Merged

[stable23] Recover installation when creating the database user fails and improve password strength #33515

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a53d02
Recover installation when creating the user failed
nickvergessen Aug 12, 2022
2a206cd
Create more secure passwords by default
nickvergessen Aug 12, 2022
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
Next Next commit
Recover installation when creating the user failed 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Aug 12, 2022
commit 9a53d02ac209940484f024d9f89953c37951ab58
7 changes: 7 additions & 0 deletions lib/private/Setup/MySQL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ private function createDBUser($connection) {
'exception' => $ex,
'app' => 'mysql.setup',
]);
throw $ex;
}
}

Expand All @@ -138,6 +139,9 @@ private function createDBUser($connection) {
* @return array
*/
private function createSpecificUser($username, $connection) {
$rootUser = $this->dbUser;
$rootPassword = $this->dbPassword;

try {
//user already specified in config
$oldUser = $this->config->getValue('dbuser', false);
Expand Down Expand Up @@ -180,6 +184,9 @@ private function createSpecificUser($username, $connection) {
'exception' => $ex,
'app' => 'mysql.setup',
]);
// Restore the original credentials
$this->dbUser = $rootUser;
$this->dbPassword = $rootPassword;
}

$this->config->setValues([
Expand Down