Add occ commands to manage the encryption modules
This commit is contained in:
parent
a09df6d453
commit
f6d4bdb1fd
|
@ -0,0 +1,56 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Joas Schilling <nickvergessen@owncloud.com>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Core\Command\Encryption;
|
||||
|
||||
use OCP\IConfig;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
class Disable extends Command {
|
||||
/** @var IConfig */
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @param IConfig $config
|
||||
*/
|
||||
public function __construct(IConfig $config) {
|
||||
parent::__construct();
|
||||
$this->config = $config;
|
||||
}
|
||||
|
||||
protected function configure() {
|
||||
$this
|
||||
->setName('encryption:disable')
|
||||
->setDescription('Disable encryption')
|
||||
;
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||
if ($this->config->getAppValue('core', 'encryption_enabled', 'no') !== 'yes') {
|
||||
$output->writeln('Encryption is already disabled');
|
||||
} else {
|
||||
$this->config->setAppValue('core', 'encryption_enabled', 'no');
|
||||
$output->writeln('Encryption disabled');
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,58 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Joas Schilling <nickvergessen@owncloud.com>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Core\Command\Encryption;
|
||||
|
||||
use OCP\IConfig;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
class Enable extends Command {
|
||||
/** @var IConfig */
|
||||
protected $config;
|
||||
|
||||
/**
|
||||
* @param IConfig $config
|
||||
*/
|
||||
public function __construct(IConfig $config) {
|
||||
parent::__construct();
|
||||
$this->config = $config;
|
||||
}
|
||||
|
||||
protected function configure() {
|
||||
$this
|
||||
->setName('encryption:enable')
|
||||
->setDescription('Enable encryption')
|
||||
;
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||
if ($this->config->getAppValue('core', 'encryption_enabled', 'no') === 'yes') {
|
||||
$output->writeln('Encryption is already enabled');
|
||||
} else {
|
||||
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
|
||||
$output->writeln('Encryption enabled');
|
||||
}
|
||||
|
||||
$output->writeln('Default module: ' . $this->config->getAppValue('core', 'default_encryption_module', 'OC_DEFAULT_MODULE'));
|
||||
}
|
||||
}
|
|
@ -0,0 +1,88 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Joas Schilling <nickvergessen@owncloud.com>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Core\Command\Encryption;
|
||||
|
||||
use OC\Core\Command\Base;
|
||||
use OC\Encryption\Manager;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
class ListModules extends Base {
|
||||
/** @var Manager */
|
||||
protected $encryptionManager;
|
||||
|
||||
/**
|
||||
* @param Manager $encryptionManager
|
||||
*/
|
||||
public function __construct(Manager $encryptionManager) {
|
||||
parent::__construct();
|
||||
$this->encryptionManager = $encryptionManager;
|
||||
}
|
||||
|
||||
protected function configure() {
|
||||
parent::configure();
|
||||
|
||||
$this
|
||||
->setName('encryption:list-modules')
|
||||
->setDescription('List all available encryption modules')
|
||||
;
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||
$encryptionModules = $this->encryptionManager->getEncryptionModules();
|
||||
$defaultEncryptionModuleId = '';
|
||||
try {
|
||||
$defaultEncryptionModule = $this->encryptionManager->getDefaultEncryptionModule();
|
||||
$defaultEncryptionModuleId = $defaultEncryptionModule->getId();
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
$encModules = array();
|
||||
foreach ($encryptionModules as $module) {
|
||||
$encModules[$module->getId()]['displayName'] = $module->getDisplayName();
|
||||
$encModules[$module->getId()]['default'] .= $module->getId() === $defaultEncryptionModuleId;
|
||||
}
|
||||
$this->writeModuleList($input, $output, $encModules);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param InputInterface $input
|
||||
* @param OutputInterface $output
|
||||
* @param array $items
|
||||
*/
|
||||
protected function writeModuleList(InputInterface $input, OutputInterface $output, $items) {
|
||||
switch ($input->getOption('output')) {
|
||||
case 'plain':
|
||||
array_walk($items, function(&$item) {
|
||||
if (!$item['default']) {
|
||||
$item = $item['displayName'];
|
||||
} else {
|
||||
$item = $item['displayName'] . ' [default*]';
|
||||
}
|
||||
});
|
||||
// no break;
|
||||
|
||||
default:
|
||||
parent::writeArrayInOutputFormat($input, $output, $items);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,77 @@
|
|||
<?php
|
||||
/**
|
||||
* @author Joas Schilling <nickvergessen@owncloud.com>
|
||||
*
|
||||
* @copyright Copyright (c) 2015, ownCloud, Inc.
|
||||
* @license AGPL-3.0
|
||||
*
|
||||
* This code is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License, version 3,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License, version 3,
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
||||
*
|
||||
*/
|
||||
|
||||
namespace OC\Core\Command\Encryption;
|
||||
|
||||
|
||||
use OC\Encryption\Manager;
|
||||
use Symfony\Component\Console\Command\Command;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
class SetDefaultModule extends Command {
|
||||
/** @var Manager */
|
||||
protected $encryptionManager;
|
||||
|
||||
/**
|
||||
* @param Manager $encryptionManager
|
||||
*/
|
||||
public function __construct(Manager $encryptionManager) {
|
||||
parent::__construct();
|
||||
$this->encryptionManager = $encryptionManager;
|
||||
}
|
||||
|
||||
protected function configure() {
|
||||
parent::configure();
|
||||
|
||||
$this
|
||||
->setName('encryption:set-default-module')
|
||||
->setDescription('Set the encryption default module')
|
||||
->addArgument(
|
||||
'module',
|
||||
InputArgument::REQUIRED,
|
||||
'ID of the encryption module that should be used'
|
||||
)
|
||||
;
|
||||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||
$moduleId = $input->getArgument('module');
|
||||
$currentDefaultModuleId = '';
|
||||
try {
|
||||
$currentDefaultModule = $this->encryptionManager->getDefaultEncryptionModule();
|
||||
$currentDefaultModuleId = $currentDefaultModule->getId();
|
||||
} catch (\Exception $e) {}
|
||||
|
||||
if ($moduleId === $currentDefaultModuleId) {
|
||||
$output->writeln('"' . $moduleId . '"" is already the default module');
|
||||
} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
|
||||
$output->writeln('Set default module to "' . $moduleId . '"');
|
||||
} else {
|
||||
$output->writeln('The specified module "' . $moduleId . '" does not exist');
|
||||
}
|
||||
|
||||
if ($moduleId === $currentDefaultModuleId) {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
|
@ -50,6 +50,10 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
|
|||
$application->add(new OC\Core\Command\Background\Cron(\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\Encryption\Disable(\OC::$server->getConfig()));
|
||||
$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig()));
|
||||
$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
|
||||
$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
|
||||
} else {
|
||||
$application->add(new OC\Core\Command\Maintenance\Install(\OC::$server->getConfig()));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue