wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

handle postgres setup when we cant connect as admin

Browse source
This commit is contained in:
Robin Appelman 2016-07-21 12:44:02 +02:00 committed by Morris Jobke
parent 7ce5303374
commit 5365c1a32f
No known key found for this signature in database
GPG key ID: 9CE5ED29E7FCD38A
2 changed files with 54 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/private/Setup/AbstractDatabase.php
View file

@ -114,6 +114,7 @@ abstract class AbstractDatabase {
'user' => $this->dbUser, 'user' => $this->dbUser,
'password' => $this->dbPassword, 'password' => $this->dbPassword,
'tablePrefix' => $this->tablePrefix, 'tablePrefix' => $this->tablePrefix,
'dbname' => $this->dbName
); );
// adding port support through installer // adding port support through installer

96
lib/private/Setup/PostgreSQL.php
View file

@ -35,50 +35,60 @@ class PostgreSQL extends AbstractDatabase {
public $dbprettyname = 'PostgreSQL'; public $dbprettyname = 'PostgreSQL';
public function setupDatabase($username) { 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)));
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
//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);
$this->createDBUser($connection);
}
$systemConfig = $this->config->getSystemConfig(); $systemConfig = $this->config->getSystemConfig();
$systemConfig->setValues([ try {
'dbuser' => $this->dbUser, $connection = $this->connect([
'dbpassword' => $this->dbPassword, '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)));
//create the database try {
$this->createDatabase($connection); $result = $query->execute();
$query = $connection->prepare("select count(*) FROM pg_class WHERE relname=? limit 1"); $canCreateRoles = $result->rowCount() > 0;
$query->execute([$this->tablePrefix . "users"]); } catch (DatabaseException $e) {
$tablesSetup = $query->fetchColumn() > 0; $canCreateRoles = false;
}
// the connection to dbname=postgres is not needed anymore if ($canCreateRoles) {
$connection->close(); //use the admin login data for the new database user
//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);
$this->createDBUser($connection);
}
$systemConfig->setValues([
'dbuser' => $this->dbUser,
'dbpassword' => $this->dbPassword,
]);
//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 // connect to the ownCloud database (dbname=$this->dbname) and check if it needs to be filled
$this->dbUser = $systemConfig->getValue('dbuser'); $this->dbUser = $systemConfig->getValue('dbuser');
@ -93,13 +103,13 @@ class PostgreSQL extends AbstractDatabase {
} }
if(!$tablesSetup) { if (!$tablesSetup) {
\OC_DB::createDbFromStructure($this->dbDefinitionFile); \OC_DB::createDbFromStructure($this->dbDefinitionFile);
} }
} }
private function createDatabase(IDBConnection $connection) { private function createDatabase(IDBConnection $connection) {
if(!$this->databaseExists($connection)) { if (!$this->databaseExists($connection)) {
//The database does not exists... let's create it //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 { try {