nextcloud / server

lib/private/Setup/PostgreSQL.php

Indentation +119 added lines, -119 removed lines

@@ -31,136 +31,136 @@
 use OCP\IDBConnection;
 
 class PostgreSQL extends AbstractDatabase {
-	public $dbprettyname = 'PostgreSQL';
+    public $dbprettyname = 'PostgreSQL';
 
-	/**
-	 * @param string $username
-	 * @throws \OC\DatabaseSetupException
-	 * @suppress SqlInjectionChecker
-	 */
-	public function setupDatabase($username) {
-		try {
-			$connection = $this->connect([
-				'dbname' => 'postgres'
-			]);
-			//check for roles creation rights in postgresql
-			$builder = $connection->getQueryBuilder();
-			$builder->automaticTablePrefix(false);
-			$query = $builder
-				->select('rolname')
-				->from('pg_roles')
-				->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE')))
-				->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
+    /**
+     * @param string $username
+     * @throws \OC\DatabaseSetupException
+     * @suppress SqlInjectionChecker
+     */
+    public function setupDatabase($username) {
+        try {
+            $connection = $this->connect([
+                'dbname' => 'postgres'
+            ]);
+            //check for roles creation rights in postgresql
+            $builder = $connection->getQueryBuilder();
+            $builder->automaticTablePrefix(false);
+            $query = $builder
+                ->select('rolname')
+                ->from('pg_roles')
+                ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE')))
+                ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
 
-			try {
-				$result = $query->execute();
-				$canCreateRoles = $result->rowCount() > 0;
-			} catch (DatabaseException $e) {
-				$canCreateRoles = false;
-			}
+            try {
+                $result = $query->execute();
+                $canCreateRoles = $result->rowCount() > 0;
+            } catch (DatabaseException $e) {
+                $canCreateRoles = false;
+            }
 
-			if ($canCreateRoles) {
-				//use the admin login data for the new database user
+            if ($canCreateRoles) {
+                //use the admin login data for the new database user
 
-				//add prefix to the postgresql user name to prevent collisions
-				$this->dbUser = 'oc_' . strtolower($username);
-				//create a new password so we don't need to store the admin config in the config file
-				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_DIGITS);
+                //add prefix to the postgresql user name to prevent collisions
+                $this->dbUser = 'oc_' . strtolower($username);
+                //create a new password so we don't need to store the admin config in the config file
+                $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_DIGITS);
 
-				$this->createDBUser($connection);
-			}
+                $this->createDBUser($connection);
+            }
 
-			$this->config->setValues([
-				'dbuser' => $this->dbUser,
-				'dbpassword' => $this->dbPassword,
-			]);
+            $this->config->setValues([
+                'dbuser' => $this->dbUser,
+                'dbpassword' => $this->dbPassword,
+            ]);
 
-			//create the database
-			$this->createDatabase($connection);
-			// the connection to dbname=postgres is not needed anymore
-			$connection->close();
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			$this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created');
-			$this->config->setValues([
-				'dbuser' => $this->dbUser,
-				'dbpassword' => $this->dbPassword,
-			]);
-		}
+            //create the database
+            $this->createDatabase($connection);
+            // the connection to dbname=postgres is not needed anymore
+            $connection->close();
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            $this->logger->warning('Error trying to connect as "postgres", assuming database is setup and tables need to be created');
+            $this->config->setValues([
+                'dbuser' => $this->dbUser,
+                'dbpassword' => $this->dbPassword,
+            ]);
+        }
 
-		// connect to the database (dbname=$this->dbname) and check if it needs to be filled
-		$this->dbUser = $this->config->getValue('dbuser');
-		$this->dbPassword = $this->config->getValue('dbpassword');
-		$connection = $this->connect();
-		try {
-			$connection->connect();
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
-				$this->trans->t('You need to enter details of an existing account.'));
-		}
-	}
+        // connect to the database (dbname=$this->dbname) and check if it needs to be filled
+        $this->dbUser = $this->config->getValue('dbuser');
+        $this->dbPassword = $this->config->getValue('dbpassword');
+        $connection = $this->connect();
+        try {
+            $connection->connect();
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+                $this->trans->t('You need to enter details of an existing account.'));
+        }
+    }
 
-	private function createDatabase(IDBConnection $connection) {
-		if (!$this->databaseExists($connection)) {
-			//The database does not exists... let's create it
-			$query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER " . addslashes($this->dbUser));
-			try {
-				$query->execute();
-			} catch (DatabaseException $e) {
-				$this->logger->error('Error while trying to create database');
-				$this->logger->logException($e);
-			}
-		} else {
-			$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC");
-			try {
-				$query->execute();
-			} catch (DatabaseException $e) {
-				$this->logger->error('Error while trying to restrict database permissions');
-				$this->logger->logException($e);
-			}
-		}
-	}
+    private function createDatabase(IDBConnection $connection) {
+        if (!$this->databaseExists($connection)) {
+            //The database does not exists... let's create it
+            $query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER " . addslashes($this->dbUser));
+            try {
+                $query->execute();
+            } catch (DatabaseException $e) {
+                $this->logger->error('Error while trying to create database');
+                $this->logger->logException($e);
+            }
+        } else {
+            $query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC");
+            try {
+                $query->execute();
+            } catch (DatabaseException $e) {
+                $this->logger->error('Error while trying to restrict database permissions');
+                $this->logger->logException($e);
+            }
+        }
+    }
 
-	private function userExists(IDBConnection $connection) {
-		$builder = $connection->getQueryBuilder();
-		$builder->automaticTablePrefix(false);
-		$query = $builder->select('*')
-			->from('pg_roles')
-			->where($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
-		$result = $query->execute();
-		return $result->rowCount() > 0;
-	}
+    private function userExists(IDBConnection $connection) {
+        $builder = $connection->getQueryBuilder();
+        $builder->automaticTablePrefix(false);
+        $query = $builder->select('*')
+            ->from('pg_roles')
+            ->where($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));
+        $result = $query->execute();
+        return $result->rowCount() > 0;
+    }
 
-	private function databaseExists(IDBConnection $connection) {
-		$builder = $connection->getQueryBuilder();
-		$builder->automaticTablePrefix(false);
-		$query = $builder->select('datname')
-			->from('pg_database')
-			->where($builder->expr()->eq('datname', $builder->createNamedParameter($this->dbName)));
-		$result = $query->execute();
-		return $result->rowCount() > 0;
-	}
+    private function databaseExists(IDBConnection $connection) {
+        $builder = $connection->getQueryBuilder();
+        $builder->automaticTablePrefix(false);
+        $query = $builder->select('datname')
+            ->from('pg_database')
+            ->where($builder->expr()->eq('datname', $builder->createNamedParameter($this->dbName)));
+        $result = $query->execute();
+        return $result->rowCount() > 0;
+    }
 
-	private function createDBUser(IDBConnection $connection) {
-		$dbUser = $this->dbUser;
-		try {
-			$i = 1;
-			while ($this->userExists($connection)) {
-				$i++;
-				$this->dbUser = $dbUser . $i;
-			}
+    private function createDBUser(IDBConnection $connection) {
+        $dbUser = $this->dbUser;
+        try {
+            $i = 1;
+            while ($this->userExists($connection)) {
+                $i++;
+                $this->dbUser = $dbUser . $i;
+            }
 
-			// create the user
-			$query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
-			$query->execute();
-			if ($this->databaseExists($connection)) {
-				$query = $connection->prepare('GRANT CONNECT ON DATABASE ' . addslashes($this->dbName) . ' TO '.addslashes($this->dbUser));
-				$query->execute();
-			}
-		} catch (DatabaseException $e) {
-			$this->logger->error('Error while trying to create database user');
-			$this->logger->logException($e);
-		}
-	}
+            // create the user
+            $query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
+            $query->execute();
+            if ($this->databaseExists($connection)) {
+                $query = $connection->prepare('GRANT CONNECT ON DATABASE ' . addslashes($this->dbName) . ' TO '.addslashes($this->dbUser));
+                $query->execute();
+            }
+        } catch (DatabaseException $e) {
+            $this->logger->error('Error while trying to create database user');
+            $this->logger->logException($e);
+        }
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -63,9 +63,9 @@ 
 				//use the admin login data for the new database user
 
 				//add prefix to the postgresql user name to prevent collisions
-				$this->dbUser = 'oc_' . strtolower($username);
+				$this->dbUser = 'oc_'.strtolower($username);
 				//create a new password so we don't need to store the admin config in the config file
-				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER . \OCP\Security\ISecureRandom::CHAR_DIGITS);
+				$this->dbPassword = \OC::$server->getSecureRandom()->generate(30, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 
 				$this->createDBUser($connection);
 			}
@@ -104,7 +104,7 @@ 
 	private function createDatabase(IDBConnection $connection) {
 		if (!$this->databaseExists($connection)) {
 			//The database does not exists... let's create it
-			$query = $connection->prepare("CREATE DATABASE " . addslashes($this->dbName) . " OWNER " . addslashes($this->dbUser));
+			$query = $connection->prepare("CREATE DATABASE ".addslashes($this->dbName)." OWNER ".addslashes($this->dbUser));
 			try {
 				$query->execute();
 			} catch (DatabaseException $e) {
@@ -112,7 +112,7 @@ 
 				$this->logger->logException($e);
 			}
 		} else {
-			$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE " . addslashes($this->dbName) . " FROM PUBLIC");
+			$query = $connection->prepare("REVOKE ALL PRIVILEGES ON DATABASE ".addslashes($this->dbName)." FROM PUBLIC");
 			try {
 				$query->execute();
 			} catch (DatabaseException $e) {
@@ -148,14 +148,14 @@ 
 			$i = 1;
 			while ($this->userExists($connection)) {
 				$i++;
-				$this->dbUser = $dbUser . $i;
+				$this->dbUser = $dbUser.$i;
 			}
 
 			// create the user
-			$query = $connection->prepare("CREATE USER " . addslashes($this->dbUser) . " CREATEDB PASSWORD '" . addslashes($this->dbPassword) . "'");
+			$query = $connection->prepare("CREATE USER ".addslashes($this->dbUser)." CREATEDB PASSWORD '".addslashes($this->dbPassword)."'");
 			$query->execute();
 			if ($this->databaseExists($connection)) {
-				$query = $connection->prepare('GRANT CONNECT ON DATABASE ' . addslashes($this->dbName) . ' TO '.addslashes($this->dbUser));
+				$query = $connection->prepare('GRANT CONNECT ON DATABASE '.addslashes($this->dbName).' TO '.addslashes($this->dbUser));
 				$query->execute();
 			}
 		} catch (DatabaseException $e) {