fix: use $this->tryCreateDbUser condition

nextcloud · Mar 20, 2024 · add8bde · add8bde
1 parent c7524d9
commit add8bde
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php
@@ -62,7 +62,6 @@ public function setupDatabase($username) {
 					$canCreateRoles = false;
 				}
 
-				$connectionMainDatabase;
 				if ($canCreateRoles) {
 					$connectionMainDatabase = $this->connect();
 					//use the admin login data for the new database user
@@ -86,16 +85,18 @@ public function setupDatabase($username) {
 			// the connection to dbname=postgres is not needed anymore
 			$connection->close();
 
-			if ($canCreateRoles) {
-				// Go to the main database and grant create on the public schema
-				// The code below is implemented to make installing possible with PostgreSQL version 15:
-				// https://www.postgresql.org/docs/release/15.0/
-				// From the release notes: For new databases having no need to defend against insider threats, granting CREATE permission will yield the behavior of prior releases
-				// Therefore we assume that the database is only used by one user/service which is Nextcloud
-				// Additional services should get installed in a separate database in order to stay secure
-				// Also see https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PATTERNS
-				$connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO "' . addslashes($this->dbUser) . '"');
-				$connectionMainDatabase->close();
+			if ($this->tryCreateDbUser) {
+				if ($canCreateRoles) {
+					// Go to the main database and grant create on the public schema
+					// The code below is implemented to make installing possible with PostgreSQL version 15:
+					// https://www.postgresql.org/docs/release/15.0/
+					// From the release notes: For new databases having no need to defend against insider threats, granting CREATE permission will yield the behavior of prior releases
+					// Therefore we assume that the database is only used by one user/service which is Nextcloud
+					// Additional services should get installed in a separate database in order to stay secure
+					// Also see https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PATTERNS
+					$connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO "' . addslashes($this->dbUser) . '"');
+					$connectionMainDatabase->close();
+				}
 			}
 		} catch (\Exception $e) {
 			$this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created', [