diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 9d03b705d12734cb413430c9a58e09cf2d2613a4..a2fdab99ba320947ae3b6e89aefccc68d3f19078 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -282,17 +282,19 @@ class ConvertType extends Command {
protected function saveDBInfo(InputInterface $input) {
$type = $input->getArgument('type');
$username = $input->getArgument('username');
- $dbhost = $input->getArgument('hostname');
- $dbname = $input->getArgument('database');
+ $dbHost = $input->getArgument('hostname');
+ $dbName = $input->getArgument('database');
$password = $input->getOption('password');
if ($input->getOption('port')) {
- $dbhost .= ':'.$input->getOption('port');
+ $dbHost .= ':'.$input->getOption('port');
}
- $this->config->setSystemValue('dbtype', $type);
- $this->config->setSystemValue('dbname', $dbname);
- $this->config->setSystemValue('dbhost', $dbhost);
- $this->config->setSystemValue('dbuser', $username);
- $this->config->setSystemValue('dbpassword', $password);
+ $this->config->setSystemValues([
+ 'dbtype' => $type,
+ 'dbname' => $dbName,
+ 'dbhost' => $dbHost,
+ 'dbuser' => $username,
+ 'dbpassword' => $password,
+ ]);
}
}
diff --git a/lib/private/allconfig.php b/lib/private/allconfig.php
index d4b4ed6fb6ae3b096d50786bd951ca8155d9f2b6..421db5668668d14dc0401d79f59363b830659aef 100644
--- a/lib/private/allconfig.php
+++ b/lib/private/allconfig.php
@@ -69,6 +69,16 @@ class AllConfig implements \OCP\IConfig {
}
}
+ /**
+ * Sets and deletes system wide values
+ *
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
+ */
+ public function setSystemValues(array $configs) {
+ $this->systemConfig->setValues($configs);
+ }
+
/**
* Sets a new system wide value
*
diff --git a/lib/private/config.php b/lib/private/config.php
index 8544de34b720b904cd0ad1b165361ad1cd41ff62..586e8c20587d86679a6741bb1824533d6bb20353 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -41,10 +41,10 @@ class Config {
/**
* Lists all available config keys
- * @return array an array of key names
*
- * This function returns all keys saved in config.php. Please note that it
- * does not return the values.
+ * Please note that it does not return the values.
+ *
+ * @return array an array of key names
*/
public function getKeys() {
return array_keys($this->cache);
@@ -52,12 +52,12 @@ class Config {
/**
* Gets a value from config.php
+ *
+ * If it does not exist, $default will be returned.
+ *
* @param string $key key
* @param mixed $default = null default value
* @return mixed the value or $default
- *
- * This function gets the value from config.php. If it does not exist,
- * $default will be returned.
*/
public function getValue($key, $default = null) {
if (isset($this->cache[$key])) {
@@ -68,36 +68,81 @@ class Config {
}
/**
- * Sets a value
- * @param string $key key
- * @param mixed $value value
- *
- * This function sets the value and writes the config.php.
+ * Sets and deletes values and writes the config.php
*
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
*/
- public function setValue($key, $value) {
- // Add change
- $this->cache[$key] = $value;
+ public function setValues(array $configs) {
+ $needsUpdate = false;
+ foreach ($configs as $key => $value) {
+ if ($value !== null) {
+ $needsUpdate |= $this->set($key, $value);
+ } else {
+ $needsUpdate |= $this->delete($key);
+ }
+ }
- // Write changes
- $this->writeData();
+ if ($needsUpdate) {
+ // Write changes
+ $this->writeData();
+ }
}
/**
- * Removes a key from the config
- * @param string $key key
+ * Sets the value and writes it to config.php if required
*
- * This function removes a key from the config.php.
+ * @param string $key key
+ * @param mixed $value value
+ */
+ public function setValue($key, $value) {
+ if ($this->set($key, $value)) {
+ // Write changes
+ $this->writeData();
+ }
+ }
+
+ /**
+ * This function sets the value
*
+ * @param string $key key
+ * @param mixed $value value
+ * @return bool True if the file needs to be updated, false otherwise
+ */
+ protected function set($key, $value) {
+ if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
+ // Add change
+ $this->cache[$key] = $value;
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Removes a key from the config and removes it from config.php if required
+ * @param string $key
*/
public function deleteKey($key) {
+ if ($this->delete($key)) {
+ // Write changes
+ $this->writeData();
+ }
+ }
+
+ /**
+ * This function removes a key from the config
+ *
+ * @param string $key
+ * @return bool True if the file needs to be updated, false otherwise
+ */
+ protected function delete($key) {
if (isset($this->cache[$key])) {
// Delete key from cache
unset($this->cache[$key]);
-
- // Write changes
- $this->writeData();
+ return true;
}
+ return false;
}
/**
diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php
index 7b7112042563539610ea0bcb1a5c0e9a118feaf6..64d01434b1158aaa187321dd89cde24b225e0840 100644
--- a/lib/private/legacy/config.php
+++ b/lib/private/legacy/config.php
@@ -58,6 +58,16 @@ class OC_Config {
self::$object->setValue($key, $value);
}
+ /**
+ * Sets and deletes values and writes the config.php
+ *
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
+ */
+ public static function setValues(array $configs) {
+ self::$object->setValues($configs);
+ }
+
/**
* Removes a key from the config
* @param string $key key
diff --git a/lib/private/setup.php b/lib/private/setup.php
index b9ba8d906c2339346f7f08a608939b2041fef60a..e5f84d4c02af3b1412bd49c4791e266c6b4759d3 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -176,18 +176,19 @@ class OC_Setup {
//generate a random salt that is used to salt the local user passwords
$salt = \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(30);
- \OC::$server->getConfig()->setSystemValue('passwordsalt', $salt);
-
// generate a secret
$secret = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(48);
- \OC::$server->getConfig()->setSystemValue('secret', $secret);
//write the config file
- \OC::$server->getConfig()->setSystemValue('trusted_domains', $trustedDomains);
- \OC::$server->getConfig()->setSystemValue('datadirectory', $dataDir);
- \OC::$server->getConfig()->setSystemValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT);
- \OC::$server->getConfig()->setSystemValue('dbtype', $dbType);
- \OC::$server->getConfig()->setSystemValue('version', implode('.', OC_Util::getVersion()));
+ \OC::$server->getConfig()->setSystemValues([
+ 'passwordsalt' => $salt,
+ 'secret' => $secret,
+ 'trusted_domains' => $trustedDomains,
+ 'datadirectory' => $dataDir,
+ 'overwrite.cli.url' => \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT,
+ 'dbtype' => $dbType,
+ 'version' => implode('.', OC_Util::getVersion()),
+ ]);
try {
$dbSetup->initialize($options);
diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index 84625a217ee974968479c13feb6c54fb027d4812..08e295c3fff6a4b5712a2a6e35aa88351e10ab12 100644
--- a/lib/private/setup/abstractdatabase.php
+++ b/lib/private/setup/abstractdatabase.php
@@ -35,20 +35,24 @@ abstract class AbstractDatabase {
}
public function initialize($config) {
- $dbuser = $config['dbuser'];
- $dbpass = $config['dbpass'];
- $dbname = $config['dbname'];
- $dbhost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
- $dbtableprefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
-
- \OC_Config::setValue('dbname', $dbname);
- \OC_Config::setValue('dbhost', $dbhost);
- \OC_Config::setValue('dbtableprefix', $dbtableprefix);
-
- $this->dbuser = $dbuser;
- $this->dbpassword = $dbpass;
- $this->dbname = $dbname;
- $this->dbhost = $dbhost;
- $this->tableprefix = $dbtableprefix;
+ $dbUser = $config['dbuser'];
+ $dbPass = $config['dbpass'];
+ $dbName = $config['dbname'];
+ $dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+ $dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+
+ \OC_Config::setValues([
+ 'dbname' => $dbName,
+ 'dbhost' => $dbHost,
+ 'dbtableprefix' => $dbTablePrefix,
+ ]);
+
+ $this->dbuser = $dbUser;
+ $this->dbpassword = $dbPass;
+ $this->dbname = $dbName;
+ $this->dbhost = $dbHost;
+ $this->tableprefix = $dbTablePrefix;
}
+
+ abstract public function setupDatabase($userName);
}
diff --git a/lib/private/setup/mssql.php b/lib/private/setup/mssql.php
index 5143545b76ffdbd11bdaa9e138631ecd4815b74e..1aa31a678a1a7fe3b6aa1c97cad20249092fcfd1 100644
--- a/lib/private/setup/mssql.php
+++ b/lib/private/setup/mssql.php
@@ -5,7 +5,7 @@ namespace OC\Setup;
class MSSQL extends AbstractDatabase {
public $dbprettyname = 'MS SQL Server';
- public function setupDatabase() {
+ public function setupDatabase($username) {
//check if the database user has admin right
$masterConnectionInfo = array( "Database" => "master", "UID" => $this->dbuser, "PWD" => $this->dbpassword);
@@ -21,8 +21,10 @@ class MSSQL extends AbstractDatabase {
$this->trans->t('You need to enter either an existing account or the administrator.'));
}
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
+ \OC_Config::setValues([
+ 'dbuser' => $this->dbuser,
+ 'dbpassword' => $this->dbpassword,
+ ]);
$this->createDBLogin($masterConnection);
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index 8f8d86d388ce2963678ac973fb530e4547a14f15..97f75e2f676026432dc0bc6afcfbed1e1d5978e2 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -51,8 +51,10 @@ class MySQL extends AbstractDatabase {
}
};
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
+ \OC_Config::setValues([
+ 'dbuser' => $this->dbuser,
+ 'dbpassword' => $this->dbpassword,
+ ]);
}
//create the database
diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php
index b75b658bae22b9e67f8e987122b8230a7fc54f8f..d4f71f18ab4f9379d30c4668398ef13f7889955b 100644
--- a/lib/private/setup/oci.php
+++ b/lib/private/setup/oci.php
@@ -16,8 +16,11 @@ class OCI extends AbstractDatabase {
}
// allow empty hostname for oracle
$this->dbhost = $config['dbhost'];
- \OC_Config::setValue('dbhost', $this->dbhost);
- \OC_Config::setValue('dbtablespace', $this->dbtablespace);
+
+ \OC_Config::setValues([
+ 'dbhost' => $this->dbhost,
+ 'dbtablespace' => $this->dbtablespace,
+ ]);
}
public function validate($config) {
@@ -72,37 +75,32 @@ class OCI extends AbstractDatabase {
$result = oci_execute($stmt);
if($result) {
$row = oci_fetch_row($stmt);
- }
- if($result and $row[0] > 0) {
- //use the admin login data for the new database user
- //add prefix to the oracle 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_Util::generateRandomBytes(30);
+ if ($row[0] > 0) {
+ //use the admin login data for the new database user
- //oracle passwords are treated as identifiers:
- // must start with alphanumeric char
- // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
- $this->dbpassword=substr($this->dbpassword, 0, 30);
+ //add prefix to the oracle 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_Util::generateRandomBytes(30);
- $this->createDBUser($connection);
+ //oracle passwords are treated as identifiers:
+ // must start with alphanumeric char
+ // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
+ $this->dbpassword=substr($this->dbpassword, 0, 30);
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbname', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
-
- //create the database not necessary, oracle implies user = schema
- //$this->createDatabase($this->dbname, $this->dbuser, $connection);
- } else {
+ $this->createDBUser($connection);
+ }
+ }
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbname', $this->dbname);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
+ \OC_Config::setValues([
+ 'dbuser' => $this->dbuser,
+ 'dbname' => $this->dbname,
+ 'dbpassword' => $this->dbpassword,
+ ]);
- //create the database not necessary, oracle implies user = schema
- //$this->createDatabase($this->dbname, $this->dbuser, $connection);
- }
+ //create the database not necessary, oracle implies user = schema
+ //$this->createDatabase($this->dbname, $this->dbuser, $connection);
//FIXME check tablespace exists: select * from user_tablespaces
diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php
index 3777d1620bcd6ff8256b38b01826b55f11bc4dfa..5fb6b85fc892618fd5bd72bfa8fa9ba5299aab21 100644
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
@@ -43,20 +43,15 @@ class PostgreSQL extends AbstractDatabase {
$this->dbpassword=\OC_Util::generateRandomBytes(30);
$this->createDBUser($connection);
-
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
-
- //create the database
- $this->createDatabase($connection);
}
- else {
- \OC_Config::setValue('dbuser', $this->dbuser);
- \OC_Config::setValue('dbpassword', $this->dbpassword);
- //create the database
- $this->createDatabase($connection);
- }
+ \OC_Config::setValues([
+ 'dbuser' => $this->dbuser,
+ 'dbpassword' => $this->dbpassword,
+ ]);
+
+ //create the database
+ $this->createDatabase($connection);
// the connection to dbname=postgres is not needed anymore
pg_close($connection);
diff --git a/lib/private/systemconfig.php b/lib/private/systemconfig.php
index ce6883e5ab3e824e8c167e4a99f1a862148163f6..36cefdb849937e46f52c9c17daecbba8d5635a77 100644
--- a/lib/private/systemconfig.php
+++ b/lib/private/systemconfig.php
@@ -27,6 +27,16 @@ class SystemConfig {
\OC_Config::setValue($key, $value);
}
+ /**
+ * Sets and deletes values and writes the config.php
+ *
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
+ */
+ public function setValues(array $configs) {
+ \OC_Config::setValues($configs);
+ }
+
/**
* Looks up a system wide defined value
*
diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php
index a1952ef8f84eb497d7760f49f753efc0a2986186..868a4133d2e39de76392c6732dca8c2341605c80 100644
--- a/lib/public/iconfig.php
+++ b/lib/public/iconfig.php
@@ -34,6 +34,14 @@ namespace OCP;
* Access to all the configuration options ownCloud offers
*/
interface IConfig {
+ /**
+ * Sets and deletes system wide values
+ *
+ * @param array $configs Associative array with `key => value` pairs
+ * If value is null, the config key will be deleted
+ */
+ public function setSystemValues(array $configs);
+
/**
* Sets a new system wide value
*
diff --git a/settings/controller/mailsettingscontroller.php b/settings/controller/mailsettingscontroller.php
index d050a5ea03e74ef9e1629e9aa6de769ba2c23c45..5874e644abb75e04cbe02aad0a89d83a4b2e26ce 100644
--- a/settings/controller/mailsettingscontroller.php
+++ b/settings/controller/mailsettingscontroller.php
@@ -84,20 +84,19 @@ class MailSettingsController extends Controller {
$mail_smtpport) {
$params = get_defined_vars();
+ $configs = [];
foreach($params as $key => $value) {
- if(empty($value)) {
- $this->config->deleteSystemValue($key);
- } else {
- $this->config->setSystemValue($key, $value);
- }
+ $configs[$key] = (empty($value)) ? null : $value;
}
// Delete passwords from config in case no auth is specified
- if($params['mail_smtpauth'] !== 1) {
- $this->config->deleteSystemValue('mail_smtpname');
- $this->config->deleteSystemValue('mail_smtppassword');
+ if ($params['mail_smtpauth'] !== 1) {
+ $configs['mail_smtpname'] = null;
+ $configs['mail_smtppassword'] = null;
}
+ $this->config->setSystemValues($configs);
+
return array('data' =>
array('message' =>
(string) $this->l10n->t('Saved')
@@ -113,8 +112,10 @@ class MailSettingsController extends Controller {
* @return array
*/
public function storeCredentials($mail_smtpname, $mail_smtppassword) {
- $this->config->setSystemValue('mail_smtpname', $mail_smtpname);
- $this->config->setSystemValue('mail_smtppassword', $mail_smtppassword);
+ $this->config->setSystemValues([
+ 'mail_smtpname' => $mail_smtpname,
+ 'mail_smtppassword' => $mail_smtppassword,
+ ]);
return array('data' =>
array('message' =>
diff --git a/tests/lib/config.php b/tests/lib/config.php
index 6adba356a1c7cf12864f9061e6ded0fb5dfd1577..91154579ab59f7bf15dd475b3a934219d27eda49 100644
--- a/tests/lib/config.php
+++ b/tests/lib/config.php
@@ -71,6 +71,36 @@ class Test_Config extends \Test\TestCase {
$this->assertEquals($expected, $content);
}
+ public function testSetValues() {
+ $content = file_get_contents($this->configFile);
+ $this->assertEquals(self::TESTCONTENT, $content);
+
+ // Changing configs to existing values and deleting non-existing once
+ // should not rewrite the config.php
+ $this->config->setValues([
+ 'foo' => 'bar',
+ 'not_exists' => null,
+ ]);
+
+ $this->assertAttributeEquals($this->initialConfig, 'cache', $this->config);
+ $content = file_get_contents($this->configFile);
+ $this->assertEquals(self::TESTCONTENT, $content);
+
+ $this->config->setValues([
+ 'foo' => 'moo',
+ 'alcohol_free' => null,
+ ]);
+ $expectedConfig = $this->initialConfig;
+ $expectedConfig['foo'] = 'moo';
+ unset($expectedConfig['alcohol_free']);
+ $this->assertAttributeEquals($expectedConfig, 'cache', $this->config);
+
+ $content = file_get_contents($this->configFile);
+ $expected = "<?php\n\$CONFIG = array (\n 'foo' => 'moo',\n 'beers' => \n array (\n 0 => 'Appenzeller',\n " .
+ " 1 => 'Guinness',\n 2 => 'Kölsch',\n ),\n);\n";
+ $this->assertEquals($expected, $content);
+ }
+
public function testDeleteKey() {
$this->config->deleteKey('foo');
$expectedConfig = $this->initialConfig;
diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
index f6ebade7b171740075cd0b0972eca87a322099b1..ed33d7fbe49bee56f4ee5dfea485f91a2ee567f5 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -69,26 +69,37 @@ class MailSettingsControllerTest extends \Test\TestCase {
);
*/
- $this->container['Config']
- ->expects($this->exactly(15))
- ->method('setSystemValue');
-
+ /** @var \PHPUnit_Framework_MockObject_MockObject $config */
+ $config = $this->container['Config'];
+ $config->expects($this->exactly(2))
+ ->method('setSystemValues');
/**
* FIXME: Use the following block once Jenkins uses PHPUnit >= 4.1
- */
- /*
- $this->container['Config']
- ->expects($this->exactly(3))
- ->method('deleteSystemValue')
->withConsecutive(
- array($this->equalTo('mail_smtpauth')),
- array($this->equalTo('mail_smtpname')),
- array($this->equalTo('mail_smtppassword'))
+ [[
+ 'mail_domain' => 'owncloud.com',
+ 'mail_from_address' => 'demo@owncloud.com',
+ 'mail_smtpmode' => 'smtp',
+ 'mail_smtpsecure' => 'ssl',
+ 'mail_smtphost' => 'mx.owncloud.org',
+ 'mail_smtpauthtype' => 'NTLM',
+ 'mail_smtpauth' => 1,
+ 'mail_smtpport' => '25',
+ ]],
+ [[
+ 'mail_domain' => 'owncloud.com',
+ 'mail_from_address' => 'demo@owncloud.com',
+ 'mail_smtpmode' => 'smtp',
+ 'mail_smtpsecure' => 'ssl',
+ 'mail_smtphost' => 'mx.owncloud.org',
+ 'mail_smtpauthtype' => 'NTLM',
+ 'mail_smtpauth' => null,
+ 'mail_smtpport' => '25',
+ 'mail_smtpname' => null,
+ 'mail_smtppassword' => null,
+ ]]
);
- */
- $this->container['Config']
- ->expects($this->exactly(3))
- ->method('deleteSystemValue');
+ */
// With authentication
$response = $this->container['MailSettingsController']->setMailSettings(
@@ -126,21 +137,13 @@ class MailSettingsControllerTest extends \Test\TestCase {
->method('t')
->will($this->returnValue('Saved'));
- /**
- * FIXME: Use this block once Jenkins uses PHPUnit >= 4.1
- */
- /*
$this->container['Config']
- ->expects($this->exactly(2))
- ->method('setSystemValue')
- ->withConsecutive(
- array($this->equalTo('mail_smtpname'), $this->equalTo('UsernameToStore')),
- array($this->equalTo('mail_smtppassword'), $this->equalTo('PasswordToStore'))
- );
- */
- $this->container['Config']
- ->expects($this->exactly(2))
- ->method('setSystemValue');
+ ->expects($this->once())
+ ->method('setSystemValues')
+ ->with([
+ 'mail_smtpname' => 'UsernameToStore',
+ 'mail_smtppassword' => 'PasswordToStore',
+ ]);
$response = $this->container['MailSettingsController']->storeCredentials('UsernameToStore', 'PasswordToStore');
$expectedResponse = array('data' => array('message' =>'Saved'), 'status' => 'success');