Skip to content

Refactor OC\Server::getEncryptionManager #40134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
summersab wants to merge 1 commit into from
Closed

Refactor OC\Server::getEncryptionManager #40134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions core/register_command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/

use OCP\Encryption\IManager as IEncryptionManager;
use Psr\Log\LoggerInterface;

$application->add(new \Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand());
Expand Down Expand Up @@ -121,16 +123,16 @@
}

$application->add(new OC\Core\Command\Encryption\Disable(\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(), \OC::$server->getConfig()));
$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager(), \OC::$server->getConfig()));
$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
$application->add(new OC\Core\Command\Encryption\Enable(\OC::$server->getConfig(), \OC::$server->get(IEncryptionManager::class)));
$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->get(IEncryptionManager::class), \OC::$server->getConfig()));
$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->get(IEncryptionManager::class), \OC::$server->getConfig()));
$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->get(IEncryptionManager::class)));
$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->get(IEncryptionManager::class), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
$application->add(new OC\Core\Command\Encryption\DecryptAll(
\OC::$server->getEncryptionManager(),
\OC::$server->get(IEncryptionManager::class),
\OC::$server->getAppManager(),
\OC::$server->getConfig(),
new \OC\Encryption\DecryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getUserManager(), new \OC\Files\View()),
new \OC\Encryption\DecryptAll(\OC::$server->get(IEncryptionManager::class), \OC::$server->getUserManager(), new \OC\Files\View()),
new \Symfony\Component\Console\Helper\QuestionHelper())
);

Expand Down
3 changes: 2 additions & 1 deletion lib/private/Encryption/HookManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use OC\Files\Filesystem;
use OC\Files\View;
use OC\Files\SetupManager;
use OCP\Encryption\IManager as IEncryptionManager;
use Psr\Log\LoggerInterface;

class HookManager {
Expand Down Expand Up @@ -78,7 +79,7 @@ private static function getUpdate(?string $owner = null): Update {
\OC::$server->getGroupManager(),
\OC::$server->getConfig()),
Filesystem::getMountManager(),
\OC::$server->getEncryptionManager(),
\OC::$server->get(IEncryptionManager::class),
\OC::$server->getEncryptionFilesHelper(),
\OC::$server->get(LoggerInterface::class),
$uid
Expand Down
10 changes: 5 additions & 5 deletions tests/lib/Traits/EncryptionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use OCA\Encryption\AppInfo\Application;
use OCA\Encryption\KeyManager;
use OCA\Encryption\Users\Setup;
use OCP\Encryption\IManager;
use OCP\Encryption\IManager as IEncryptionManager;
use OCP\IUserManager;
use Psr\Log\LoggerInterface;

Expand Down Expand Up @@ -74,23 +74,23 @@ protected function setupForUser($name, $password) {
/** @var Setup $userSetup */
$userSetup = $container->query(Setup::class);
$userSetup->setupUser($name, $password);
$encryptionManager = $container->query(IManager::class);
$encryptionManager = $container->query(IEncryptionManager::class);
$this->encryptionApp->setUp($encryptionManager);
$keyManager->init($name, $password);
}

protected function postLogin() {
$encryptionWrapper = new EncryptionWrapper(
new ArrayCache(),
\OC::$server->getEncryptionManager(),
\OC::$server->get(IEncryptionManager::class),
\OC::$server->get(LoggerInterface::class)
);

$this->registerStorageWrapper('oc_encryption', [$encryptionWrapper, 'wrapStorage']);
}

protected function setUpEncryptionTrait() {
$isReady = \OC::$server->getEncryptionManager()->isReady();
$isReady = \OC::$server->get(IEncryptionManager::class)->isReady();
if (!$isReady) {
$this->markTestSkipped('Encryption not ready');
}
Expand All @@ -107,7 +107,7 @@ protected function setUpEncryptionTrait() {
$this->originalEncryptionModule = $this->config->getAppValue('core', 'default_encryption_module');
$this->config->setAppValue('core', 'default_encryption_module', \OCA\Encryption\Crypto\Encryption::ID);
$this->config->setAppValue('core', 'encryption_enabled', 'yes');
$this->assertTrue(\OC::$server->getEncryptionManager()->isEnabled());
$this->assertTrue(\OC::$server->get(IEncryptionManager::class)->isEnabled());
}

protected function tearDownEncryptionTrait() {
Expand Down