diff options
author | Robin Appelman <icewind@owncloud.com> | 2016-07-21 12:44:02 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2016-12-05 16:00:05 +0100 |
commit | 5365c1a32f396e1e699dea597d7656138f649573 (patch) | |
tree | 6fdc4f4ba0219c365f76e5f724d451a14419bedf /lib/private | |
parent | 7ce53033747542d565716cdb3080f642a6092339 (diff) | |
download | nextcloud-server-5365c1a32f396e1e699dea597d7656138f649573.tar.gz nextcloud-server-5365c1a32f396e1e699dea597d7656138f649573.zip |
handle postgres setup when we cant connect as admin
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/Setup/AbstractDatabase.php | 1 | ||||
-rw-r--r-- | lib/private/Setup/PostgreSQL.php | 88 |
2 files changed, 50 insertions, 39 deletions
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 2b9d7afb367..dbf46888ffe 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -114,6 +114,7 @@ abstract class AbstractDatabase { 'user' => $this->dbUser, 'password' => $this->dbPassword, 'tablePrefix' => $this->tablePrefix, + 'dbname' => $this->dbName ); // adding port support through installer diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php index 85755ea4218..14325a18efe 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -35,50 +35,60 @@ class PostgreSQL extends AbstractDatabase { public $dbprettyname = 'PostgreSQL'; public function setupDatabase($username) { - $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))); - + $systemConfig = $this->config->getSystemConfig(); try { - $result = $query->execute(); - $canCreateRoles = $result->rowCount() > 0; - } catch (DatabaseException $e) { - $canCreateRoles = false; - } + $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))); - if($canCreateRoles) { - //use the admin login data for the new database user + try { + $result = $query->execute(); + $canCreateRoles = $result->rowCount() > 0; + } catch (DatabaseException $e) { + $canCreateRoles = false; + } - //add prefix to the postgresql user name to prevent collisions - $this->dbUser='oc_'.$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); + if ($canCreateRoles) { + //use the admin login data for the new database user - $this->createDBUser($connection); - } + //add prefix to the postgresql user name to prevent collisions + $this->dbUser = 'oc_' . $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); - $systemConfig = $this->config->getSystemConfig(); - $systemConfig->setValues([ - 'dbuser' => $this->dbUser, - 'dbpassword' => $this->dbPassword, - ]); + $this->createDBUser($connection); + } - //create the database - $this->createDatabase($connection); - $query = $connection->prepare("select count(*) FROM pg_class WHERE relname=? limit 1"); - $query->execute([$this->tablePrefix . "users"]); - $tablesSetup = $query->fetchColumn() > 0; + $systemConfig->setValues([ + 'dbuser' => $this->dbUser, + 'dbpassword' => $this->dbPassword, + ]); - // the connection to dbname=postgres is not needed anymore - $connection->close(); + //create the database + $this->createDatabase($connection); + $query = $connection->prepare("select count(*) FROM pg_class WHERE relname=? limit 1"); + $query->execute([$this->tablePrefix . "users"]); + $tablesSetup = $query->fetchColumn() > 0; + + // 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'); + $tablesSetup = false; + $systemConfig->setValues([ + 'dbuser' => $this->dbUser, + 'dbpassword' => $this->dbPassword, + ]); + } // connect to the ownCloud database (dbname=$this->dbname) and check if it needs to be filled $this->dbUser = $systemConfig->getValue('dbuser'); @@ -93,13 +103,13 @@ class PostgreSQL extends AbstractDatabase { } - if(!$tablesSetup) { + if (!$tablesSetup) { \OC_DB::createDbFromStructure($this->dbDefinitionFile); } } private function createDatabase(IDBConnection $connection) { - if(!$this->databaseExists($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 { |