Skip to content

Recover installation when creating the database user fails and improve password strength #33513

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
nickvergessen merged 2 commits into from
Aug 12, 2022
Merged

Recover installation when creating the database user fails and improve password strength #33513

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d275c93
Recover installation when creating the user failed
nickvergessen Aug 12, 2022
33d7a96
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 d275c930356fd4203c0cf9e2850c8e92f3d0c2b9
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 @@ -137,6 +138,9 @@ private function createDBUser($connection) {
* @param IDBConnection $connection
*/
private function createSpecificUser($username, $connection): void {
$rootUser = $this->dbUser;
$rootPassword = $this->dbPassword;

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

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