tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wizard: Ensure that privileges are checked only once 

Another entry in the "The provided credentials cannot be
used to create the database and/or the user" story...
This commit is contained in:
Johannes Meyer 2015-04-15 09:26:39 +02:00
parent 923bc11b39
commit d02c078e4a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/setup/library/Setup/WebWizard.php
View File

@ -158,7 +158,7 @@ class WebWizard extends Wizard implements SetupWizard
} }
} elseif ($page->getName() === 'setup_database_creation') { } elseif ($page->getName() === 'setup_database_creation') {
$page->setDatabaseSetupPrivileges( $page->setDatabaseSetupPrivileges(
array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges) array_unique(array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges))
); );
$page->setDatabaseUsagePrivileges($this->databaseUsagePrivileges); $page->setDatabaseUsagePrivileges($this->databaseUsagePrivileges);
$page->setResourceConfig($this->getPageData('setup_db_resource')); $page->setResourceConfig($this->getPageData('setup_db_resource'));
@ -236,7 +236,9 @@ class WebWizard extends Wizard implements SetupWizard
// It is not possible to reliably determine whether a database exists or not if a user can't // It is not possible to reliably determine whether a database exists or not if a user can't
// log in to the database, so we just require the user to be able to create the database // log in to the database, so we just require the user to be able to create the database
$skip = $db->checkPrivileges( $skip = $db->checkPrivileges(
array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges), array_unique(
array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges)
),
$this->databaseTables $this->databaseTables
); );
} catch (PDOException $_) { } catch (PDOException $_) {