From 00338f9dca97fd7b48d96201fd607cf460c385ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 30 Mar 2015 22:10:04 +0200 Subject: [PATCH] Removing files_encryption left overs --- apps/encryption/settings/settings-personal.php | 1 - apps/encryption/templates/settings-admin.php | 2 +- apps/encryption/templates/settings-personal.php | 2 +- apps/files/index.php | 4 ---- apps/files_sharing/tests/testcase.php | 16 ---------------- apps/files_trashbin/tests/trashbin.php | 6 ------ core/application.php | 4 ++-- lib/private/connector/sabre/file.php | 2 +- lib/private/files.php | 2 +- tests/lib/cache/file.php | 6 ------ tests/lib/cache/usercache.php | 6 ------ tests/lib/files/cache/updaterlegacy.php | 11 ----------- 12 files changed, 6 insertions(+), 56 deletions(-) diff --git a/apps/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php index d1da649e37..3266351a07 100644 --- a/apps/encryption/settings/settings-personal.php +++ b/apps/encryption/settings/settings-personal.php @@ -35,7 +35,6 @@ $util = new \OCA\Encryption\Util( \OC::$server->getUserSession(), \OC::$server->getConfig()); -$session = new \OCA\Files_Encryption\Session($view); $session = \OC::$server->getSession(); $privateKeySet = $session->get('privateKey') !== false; diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php index 616c593f6f..b64e75512e 100644 --- a/apps/encryption/templates/settings-admin.php +++ b/apps/encryption/templates/settings-admin.php @@ -7,7 +7,7 @@ script('core', 'multiselect');

t('ownCloud basic encryption module')); ?>

- + t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>

diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php index a28df9ac0e..b7aa0239ee 100644 --- a/apps/encryption/templates/settings-personal.php +++ b/apps/encryption/templates/settings-personal.php @@ -5,7 +5,7 @@

t('ownCloud basic encryption module')); ?>

- + t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?> diff --git a/apps/files/index.php b/apps/files/index.php index cfc5b931e1..3f93285902 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -86,10 +86,6 @@ $dirInfo = \OC\Files\Filesystem::getFileInfo('/', false); $storageInfo=OC_Helper::getStorageInfo('/', $dirInfo); // if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code) $encryptionInitStatus = 2; -if (OC_App::isEnabled('files_encryption')) { - $session = new \OCA\Files_Encryption\Session(new \OC\Files\View('/')); - $encryptionInitStatus = $session->getInitialized(); -} $nav = new OCP\Template('files', 'appnavigation', ''); diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php index 6a831bf5f6..bef727edac 100644 --- a/apps/files_sharing/tests/testcase.php +++ b/apps/files_sharing/tests/testcase.php @@ -45,7 +45,6 @@ abstract class TestCase extends \Test\TestCase { const TEST_FILES_SHARING_API_GROUP1 = "test-share-group1"; - public static $stateFilesEncryption; public $filename; public $data; /** @@ -58,12 +57,6 @@ abstract class TestCase extends \Test\TestCase { public static function setUpBeforeClass() { parent::setUpBeforeClass(); - // remember files_encryption state - self::$stateFilesEncryption = \OC_App::isEnabled('files_encryption'); - - //we don't want to tests with app files_encryption enabled - \OC_App::disable('files_encryption'); - // reset backend \OC_User::clearBackends(); \OC_Group::clearBackends(); @@ -100,8 +93,6 @@ abstract class TestCase extends \Test\TestCase { $this->data = 'foobar'; $this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files'); - - $this->assertFalse(\OC_App::isEnabled('files_encryption')); } protected function tearDown() { @@ -120,13 +111,6 @@ abstract class TestCase extends \Test\TestCase { // delete group \OC_Group::deleteGroup(self::TEST_FILES_SHARING_API_GROUP1); - // reset app files_encryption - if (self::$stateFilesEncryption) { - \OC_App::enable('files_encryption'); - } else { - \OC_App::disable('files_encryption'); - } - \OC_Util::tearDownFS(); \OC_User::setUserId(''); Filesystem::tearDown(); diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php index b3176ebbe9..c98de79cbd 100644 --- a/apps/files_trashbin/tests/trashbin.php +++ b/apps/files_trashbin/tests/trashbin.php @@ -36,7 +36,6 @@ class Test_Trashbin extends \Test\TestCase { private $trashRoot1; private $trashRoot2; - private static $encryptionStatus; private static $rememberRetentionObligation; private static $rememberAutoExpire; @@ -58,7 +57,6 @@ class Test_Trashbin extends \Test\TestCase { \OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup'); //disable encryption - self::$encryptionStatus = \OC_App::isEnabled('files_encryption'); \OC_App::disable('files_encryption'); //configure trashbin @@ -82,10 +80,6 @@ class Test_Trashbin extends \Test\TestCase { // cleanup test user \OC_User::deleteUser(self::TEST_TRASHBIN_USER1); - if (self::$encryptionStatus === true) { - \OC_App::enable('files_encryption'); - } - \OC_Config::setValue('trashbin_retention_obligation', self::$rememberRetentionObligation); \OC_Config::setValue('trashbin_auto_expire', self::$rememberAutoExpire); diff --git a/core/application.php b/core/application.php index 5d12ea0280..cca2c60011 100644 --- a/core/application.php +++ b/core/application.php @@ -88,8 +88,8 @@ class Application extends App { /** * Core class wrappers */ - $container->registerService('IsEncryptionEnabled', function() { - return \OC_App::isEnabled('files_encryption'); + $container->registerService('IsEncryptionEnabled', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getEncryptionManager()->isEnabled(); }); $container->registerService('URLGenerator', function(SimpleContainer $c) { return $c->query('ServerContainer')->getURLGenerator(); diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index 4fbcb73268..5b8cb17a81 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -190,7 +190,7 @@ class File extends \OC\Connector\Sabre\Node implements \Sabre\DAV\IFile { } else { try { return $this->fileView->fopen(ltrim($this->path, '/'), 'rb'); - } catch (\OCA\Files_Encryption\Exception\EncryptionException $e) { + } catch (\OCP\Encryption\Exception\EncryptionException $e) { throw new \Sabre\DAV\Exception\Forbidden($e->getMessage()); } catch (\OCP\Files\StorageNotAvailableException $e) { throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to open file: ".$e->getMessage()); diff --git a/lib/private/files.php b/lib/private/files.php index d0c1baa0c1..97f9d8163b 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -122,7 +122,7 @@ class OC_Files { if ($get_type === self::FILE) { $zip = false; - if ($xsendfile && OC_App::isEnabled('files_encryption')) { + if ($xsendfile && \OC::$server->getEncryptionManager()->isEnabled()) { $xsendfile = false; } } else { diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index d51322036c..1bf7491081 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -41,12 +41,6 @@ class FileCache extends \Test_Cache { \OC_FileProxy::clearProxies(); \OC_Hook::clear('OC_Filesystem'); - //disabled atm - //enable only the encryption hook if needed - //if(OC_App::isEnabled('files_encryption')) { - // OC_FileProxy::register(new OC_FileProxy_Encryption()); - //} - //set up temporary storage $this->storage = \OC\Files\Filesystem::getStorage('/'); \OC\Files\Filesystem::clearMounts(); diff --git a/tests/lib/cache/usercache.php b/tests/lib/cache/usercache.php index 3822a714d5..63667a3d34 100644 --- a/tests/lib/cache/usercache.php +++ b/tests/lib/cache/usercache.php @@ -37,12 +37,6 @@ class UserCache extends \Test_Cache { \OC_FileProxy::clearProxies(); \OC_Hook::clear('OC_Filesystem'); - //disabled atm - //enable only the encryption hook if needed - //if(OC_App::isEnabled('files_encryption')) { - // OC_FileProxy::register(new OC_FileProxy_Encryption()); - //} - //set up temporary storage $this->storage = \OC\Files\Filesystem::getStorage('/'); \OC\Files\Filesystem::clearMounts(); diff --git a/tests/lib/files/cache/updaterlegacy.php b/tests/lib/files/cache/updaterlegacy.php index 99cacca8e9..6bdacbe34f 100644 --- a/tests/lib/files/cache/updaterlegacy.php +++ b/tests/lib/files/cache/updaterlegacy.php @@ -22,8 +22,6 @@ class UpdaterLegacy extends \Test\TestCase { */ private $scanner; - private $stateFilesEncryption; - /** * @var \OC\Files\Cache\Cache $cache */ @@ -37,11 +35,6 @@ class UpdaterLegacy extends \Test\TestCase { protected function setUp() { parent::setUp(); - // remember files_encryption state - $this->stateFilesEncryption = \OC_App::isEnabled('files_encryption'); - // we want to tests with the encryption app disabled - \OC_App::disable('files_encryption'); - $this->storage = new \OC\Files\Storage\Temporary(array()); $textData = "dummy file data\n"; $imgData = file_get_contents(\OC::$SERVERROOT . '/core/img/logo.png'); @@ -80,10 +73,6 @@ class UpdaterLegacy extends \Test\TestCase { $this->assertTrue($result); Filesystem::tearDown(); Filesystem::mount($this->originalStorage, array(), '/'); - // reset app files_encryption - if ($this->stateFilesEncryption) { - \OC_App::enable('files_encryption'); - } parent::tearDown(); }