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

DbTool: Properly escape database wildcards when checking privileges 

fixes #9543
This commit is contained in:
Johannes Meyer 2015-07-02 16:58:37 +02:00
parent 2f05ca6332
commit 0c1365753e
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/setup/library/Setup/Utils/DbTool.php
View File

@ -351,6 +351,24 @@ class DbTool
} }
} }
/**
* Return the given table name with all wildcards being escaped
*
* @param string $tableName
*
* @return string
*
* @throws LogicException In case there is no behaviour implemented for the current PDO driver
*/
public function escapeTableWildcards($tableName)
{
if ($this->config['db'] === 'mysql') {
return str_replace(array('_', '%'), array('\_', '\%'), $tableName);
}
throw new LogicException('Unable to escape table wildcards.');
}
/** /**
* Return the given value escaped as string * Return the given value escaped as string
* *
@ -481,9 +499,12 @@ class DbTool
{ {
if ($this->config['db'] === 'mysql') { if ($this->config['db'] === 'mysql') {
list($_, $host) = explode('@', $this->query('select current_user()')->fetchColumn()); list($_, $host) = explode('@', $this->query('select current_user()')->fetchColumn());
$queryString = sprintf( $quotedDbName = $this->quoteIdentifier($this->config['dbname']);
'GRANT %%s ON %s.%%s TO %s@%s',
$this->quoteIdentifier($this->config['dbname']), $grant = 'GRANT %s';
$on = ' ON %s.%s';
$to = sprintf(
' TO %s@%s',
$this->quoteIdentifier($username), $this->quoteIdentifier($username),
str_replace('%', '%%', $this->quoteIdentifier($host)) str_replace('%', '%%', $this->quoteIdentifier($host))
); );
@ -499,15 +520,18 @@ class DbTool
} }
if (false === empty($tablePrivileges)) { if (false === empty($tablePrivileges)) {
$tableGrant = sprintf($grant, join(',', $tablePrivileges));
foreach ($context as $table) { foreach ($context as $table) {
$this->exec( $this->exec($tableGrant . sprintf($on, $quotedDbName, $this->quoteIdentifier($table)) . $to);
sprintf($queryString, join(',', $tablePrivileges), $this->quoteIdentifier($table))
);
} }
} }
if (false === empty($dbPrivileges)) { if (false === empty($dbPrivileges)) {
$this->exec(sprintf($queryString, join(',', $dbPrivileges), '*')); $this->exec(
sprintf($grant, join(',', $dbPrivileges))
. sprintf($on, $this->escapeTableWildcards($quotedDbName), '*')
. $to
);
} }
} elseif ($this->config['db'] === 'pgsql') { } elseif ($this->config['db'] === 'pgsql') {
$dbPrivileges = array(); $dbPrivileges = array();
@ -651,7 +675,7 @@ EOD;
. ' AND table_schema = :dbname' . ' AND table_schema = :dbname'
. ' AND privilege_type IN (' . join(',', array_map(array($this, 'quote'), $dbPrivileges)) . ')' . ' AND privilege_type IN (' . join(',', array_map(array($this, 'quote'), $dbPrivileges)) . ')'
. ($requireGrants ? " AND is_grantable = 'YES'" : ''), . ($requireGrants ? " AND is_grantable = 'YES'" : ''),
array(':grantee' => $grantee, ':dbname' => $this->config['dbname']) array(':grantee' => $grantee, ':dbname' => $this->escapeTableWildcards($this->config['dbname']))
); );
$dbPrivilegesGranted = (int) $query->fetchObject()->matches === count($dbPrivileges); $dbPrivilegesGranted = (int) $query->fetchObject()->matches === count($dbPrivileges);
} }