Merge pull request #16035 from owncloud/issue-15975-occ-encryption-enable-warning-no-module
Display a message when there is a problem with the default module
This commit is contained in:
commit
2344298954
|
@ -50,7 +50,7 @@ class Disable extends Command {
|
||||||
$output->writeln('Encryption is already disabled');
|
$output->writeln('Encryption is already disabled');
|
||||||
} else {
|
} else {
|
||||||
$this->config->setAppValue('core', 'encryption_enabled', 'no');
|
$this->config->setAppValue('core', 'encryption_enabled', 'no');
|
||||||
$output->writeln('Encryption disabled');
|
$output->writeln('<info>Encryption disabled</info>');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
namespace OC\Core\Command\Encryption;
|
namespace OC\Core\Command\Encryption;
|
||||||
|
|
||||||
|
use OCP\Encryption\IManager;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use Symfony\Component\Console\Command\Command;
|
use Symfony\Component\Console\Command\Command;
|
||||||
use Symfony\Component\Console\Input\InputInterface;
|
use Symfony\Component\Console\Input\InputInterface;
|
||||||
|
@ -30,11 +31,17 @@ class Enable extends Command {
|
||||||
/** @var IConfig */
|
/** @var IConfig */
|
||||||
protected $config;
|
protected $config;
|
||||||
|
|
||||||
|
/** @var IManager */
|
||||||
|
protected $encryptionManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param IConfig $config
|
* @param IConfig $config
|
||||||
|
* @param IManager $encryptionManager
|
||||||
*/
|
*/
|
||||||
public function __construct(IConfig $config) {
|
public function __construct(IConfig $config, IManager $encryptionManager) {
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
|
|
||||||
|
$this->encryptionManager = $encryptionManager;
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,9 +57,22 @@ class Enable extends Command {
|
||||||
$output->writeln('Encryption is already enabled');
|
$output->writeln('Encryption is already enabled');
|
||||||
} else {
|
} else {
|
||||||
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
|
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
|
||||||
$output->writeln('Encryption enabled');
|
$output->writeln('<info>Encryption enabled</info>');
|
||||||
}
|
}
|
||||||
|
$output->writeln('');
|
||||||
|
|
||||||
$output->writeln('Default module: ' . $this->config->getAppValue('core', 'default_encryption_module', 'OC_DEFAULT_MODULE'));
|
$modules = $this->encryptionManager->getEncryptionModules();
|
||||||
|
if (empty($modules)) {
|
||||||
|
$output->writeln('<error>No encryption module is loaded</error>');
|
||||||
|
} else {
|
||||||
|
$defaultModule = $this->config->getAppValue('core', 'default_encryption_module', null);
|
||||||
|
if ($defaultModule === null) {
|
||||||
|
$output->writeln('<error>No default module is set</error>');
|
||||||
|
} else if (!isset($modules[$defaultModule])) {
|
||||||
|
$output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>');
|
||||||
|
} else {
|
||||||
|
$output->writeln('Default module: ' . $defaultModule);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,7 +51,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
|
||||||
$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
|
$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
|
||||||
$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
|
$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));
|
||||||
$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
|
$application->add(new OC\Core\Command\Encryption\Disable(\OC::$server->getConfig()));
|
||||||
$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig()));
|
$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->getEncryptionManager()));
|
||||||
$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
|
$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
|
||||||
$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
|
$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
|
||||||
$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
|
$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
|
||||||
|
|
|
@ -72,7 +72,7 @@ class DisableTest extends TestCase {
|
||||||
|
|
||||||
$this->consoleOutput->expects($this->once())
|
$this->consoleOutput->expects($this->once())
|
||||||
->method('writeln')
|
->method('writeln')
|
||||||
->with($expectedString);
|
->with($this->stringContains($expectedString));
|
||||||
|
|
||||||
if ($isUpdating) {
|
if ($isUpdating) {
|
||||||
$this->config->expects($this->once())
|
$this->config->expects($this->once())
|
||||||
|
|
|
@ -29,6 +29,8 @@ class EnableTest extends TestCase {
|
||||||
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
||||||
protected $config;
|
protected $config;
|
||||||
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
protected $manager;
|
||||||
|
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
||||||
protected $consoleInput;
|
protected $consoleInput;
|
||||||
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
/** @var \PHPUnit_Framework_MockObject_MockObject */
|
||||||
protected $consoleOutput;
|
protected $consoleOutput;
|
||||||
|
@ -42,18 +44,25 @@ class EnableTest extends TestCase {
|
||||||
$config = $this->config = $this->getMockBuilder('OCP\IConfig')
|
$config = $this->config = $this->getMockBuilder('OCP\IConfig')
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock();
|
->getMock();
|
||||||
|
$manager = $this->manager = $this->getMockBuilder('OCP\Encryption\IManager')
|
||||||
|
->disableOriginalConstructor()
|
||||||
|
->getMock();
|
||||||
$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
|
$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
|
||||||
$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
|
$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
|
||||||
|
|
||||||
/** @var \OCP\IConfig $config */
|
/** @var \OCP\IConfig $config */
|
||||||
$this->command = new Enable($config);
|
/** @var \OCP\Encryption\IManager $manager */
|
||||||
|
$this->command = new Enable($config, $manager);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function dataEnable() {
|
public function dataEnable() {
|
||||||
return [
|
return [
|
||||||
['no', true, 'Encryption enabled'],
|
['no', null, [], true, 'Encryption enabled', 'No encryption module is loaded'],
|
||||||
['yes', false, 'Encryption is already enabled'],
|
['yes', null, [], false, 'Encryption is already enabled', 'No encryption module is loaded'],
|
||||||
|
['no', null, ['OC_TEST_MODULE' => []], true, 'Encryption enabled', 'No default module is set'],
|
||||||
|
['no', 'OC_NO_MODULE', ['OC_TEST_MODULE' => []], true, 'Encryption enabled', 'The current default module does not exist: OC_NO_MODULE'],
|
||||||
|
['no', 'OC_TEST_MODULE', ['OC_TEST_MODULE' => []], true, 'Encryption enabled', 'Default module: OC_TEST_MODULE'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,36 +70,49 @@ class EnableTest extends TestCase {
|
||||||
* @dataProvider dataEnable
|
* @dataProvider dataEnable
|
||||||
*
|
*
|
||||||
* @param string $oldStatus
|
* @param string $oldStatus
|
||||||
|
* @param string $defaultModule
|
||||||
|
* @param array $availableModules
|
||||||
* @param bool $isUpdating
|
* @param bool $isUpdating
|
||||||
* @param string $expectedString
|
* @param string $expectedString
|
||||||
|
* @param string $expectedDefaultModuleString
|
||||||
*/
|
*/
|
||||||
public function testEnable($oldStatus, $isUpdating, $expectedString) {
|
public function testEnable($oldStatus, $defaultModule, $availableModules, $isUpdating, $expectedString, $expectedDefaultModuleString) {
|
||||||
$invoceCount = 0;
|
$invokeCount = 0;
|
||||||
$this->config->expects($this->at($invoceCount))
|
$this->config->expects($this->at($invokeCount))
|
||||||
->method('getAppValue')
|
->method('getAppValue')
|
||||||
->with('core', 'encryption_enabled', $this->anything())
|
->with('core', 'encryption_enabled', $this->anything())
|
||||||
->willReturn($oldStatus);
|
->willReturn($oldStatus);
|
||||||
$invoceCount++;
|
$invokeCount++;
|
||||||
|
|
||||||
if ($isUpdating) {
|
if ($isUpdating) {
|
||||||
$this->config->expects($this->once())
|
$this->config->expects($this->once())
|
||||||
->method('setAppValue')
|
->method('setAppValue')
|
||||||
->with('core', 'encryption_enabled', 'yes');
|
->with('core', 'encryption_enabled', 'yes');
|
||||||
$invoceCount++;
|
$invokeCount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->config->expects($this->at($invoceCount))
|
$this->manager->expects($this->atLeastOnce())
|
||||||
|
->method('getEncryptionModules')
|
||||||
|
->willReturn($availableModules);
|
||||||
|
|
||||||
|
if (!empty($availableModules)) {
|
||||||
|
$this->config->expects($this->at($invokeCount))
|
||||||
->method('getAppValue')
|
->method('getAppValue')
|
||||||
->with('core', 'default_encryption_module', $this->anything())
|
->with('core', 'default_encryption_module', $this->anything())
|
||||||
->willReturnArgument(2);
|
->willReturn($defaultModule);
|
||||||
|
}
|
||||||
|
|
||||||
$this->consoleOutput->expects($this->at(0))
|
$this->consoleOutput->expects($this->at(0))
|
||||||
->method('writeln')
|
->method('writeln')
|
||||||
->with($expectedString);
|
->with($this->stringContains($expectedString));
|
||||||
|
|
||||||
$this->consoleOutput->expects($this->at(1))
|
$this->consoleOutput->expects($this->at(1))
|
||||||
->method('writeln')
|
->method('writeln')
|
||||||
->with($this->stringContains('Default module'));
|
->with('');
|
||||||
|
|
||||||
|
$this->consoleOutput->expects($this->at(2))
|
||||||
|
->method('writeln')
|
||||||
|
->with($this->stringContains($expectedDefaultModuleString));
|
||||||
|
|
||||||
\Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
|
\Test_Helper::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue