Merge pull request #36400 from nextcloud/backport/34152/stable25

szaimen · web-flow · commit 09a95137ecd5 · 2023-01-27T13:36:52.000+01:00
[stable25] Do not store generated mysql password if it was not used
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
@@ -183,6 +183,9 @@ private function createSpecificUser($username, $connection): void {
 						$i++;
 					}
 				}
+			} else {
+				// Reuse existing password if a database config is already present
+				$this->dbPassword = $rootPassword;
 			}
 		} catch (\Exception $ex) {
 			$this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,9 @@ private function createSpecificUser($username, $connection): void {`
`183`	`183`	`$i++;`
`184`	`184`	`}`
`185`	`185`	`}`
	`186`	`+ } else {`
	`187`	`+ // Reuse existing password if a database config is already present`
	`188`	`+ $this->dbPassword = $rootPassword;`
`186`	`189`	`}`
`187`	`190`	`} catch (\Exception $ex) {`
`188`	`191`	`$this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [`