Further cleanup of files_encryption

diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php
index c9f02bfa1cc447e33ef04a0032358671c21e4afc..ea7f9e1cdf56c929bf75a601b8f7ece76ed1245e 100644 (file)
--- a/apps/encryption/lib/crypto/crypt.php
+++ b/apps/encryption/lib/crypto/crypt.php
@@ -25,9 +25,6 @@ namespace OCA\Encryption\Crypto;
 use OC\Encryption\Exceptions\DecryptionFailedException;
 use OC\Encryption\Exceptions\EncryptionFailedException;
 use OC\Encryption\Exceptions\GenericEncryptionException;
-use OCA\Encryption\KeyManager;
-use OCA\Files_Encryption\Exception\MultiKeyDecryptException;
-use OCA\Files_Encryption\Exception\MultiKeyEncryptException;
 use OCP\IConfig;
 use OCP\ILogger;
 use OCP\IUser;
@@ -35,11 +32,6 @@ use OCP\IUserSession;
 
 class Crypt {
 
-       const ENCRYPTION_UKNOWN_ERROR = -1;
-       const ENCRYPTION_NOT_INIALIZED_ERROR = 1;
-       const ENCRYPTIION_PRIVATE_KEY_NOT_VALID_ERROR = 2;
-       const ENCRYPTION_NO_SHARE_KEY_FOUND = 3;
-
        const BLOCKSIZE = 8192;
        const DEFAULT_CIPHER = 'AES-256-CFB';
 
@@ -97,7 +89,7 @@ class Crypt {
                                'privateKey' => $privateKey
                        ];
                }
-               $log->error('Encryption library couldn\'t export users private key, please check your servers openSSL configuration.' . $user->getUID(),
+               $log->error('Encryption library couldn\'t export users private key, please check your servers openSSL configuration.' . $this->user->getUID(),
                        ['app' => 'encryption']);
                if (openssl_error_string()) {
                        $log->error('Encryption Library:' . openssl_error_string(),

diff --git a/build/license.php b/build/license.php
index a8d82b084e6054883dcb12f98c358fa076d3305c..6e3806e146427c8143f277049414081316088f53 100644 (file)
--- a/build/license.php
+++ b/build/license.php
@@ -166,7 +166,7 @@ if (isset($argv[1])) {
 } else {
        $licenses->exec([
                '../apps/files',
-               '../apps/files_encryption',
+               '../apps/encryption',
                '../apps/files_external',
                '../apps/files_sharing',
                '../apps/files_trashbin',

diff --git a/lib/base.php b/lib/base.php
index 5d1e16296c06a8aff9ee590509b9888f97f0b03f..44395be627d52634c12972db23a2691d23f97dc8 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -743,9 +743,6 @@ class OC {
                        );
                        \OCP\Util::connectHook('OCP\Share', 'post_shared', $updater, 'postShared');
                        \OCP\Util::connectHook('OCP\Share', 'post_unshare', $updater, 'postUnshared');
-
-                       //\OCP\Util::connectHook('OC_Filesystem', 'post_umount', 'OCA\Files_Encryption\Hooks', 'postUnmount');
-                       //\OCP\Util::connectHook('OC_Filesystem', 'umount', 'OCA\Files_Encryption\Hooks', 'preUnmount');
                }
        }
 

diff --git a/lib/private/app.php b/lib/private/app.php
index 84bc23608fb0a2c56644938ffef014cf936b2887..4b3d4b82b8295d752c2d0d81c5d2b17e0779c559 100644 (file)
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -207,7 +207,7 @@ class OC_App {
                                self::$shippedApps = json_decode(file_get_contents($shippedJson), true);
                                self::$shippedApps = self::$shippedApps['shippedApps'];
                        } else {
-                               self::$shippedApps = ['files', 'files_encryption', 'files_external',
+                               self::$shippedApps = ['files', 'encryption', 'files_external',
                                        'files_sharing', 'files_trashbin', 'files_versions', 'provisioning_api',
                                        'user_ldap', 'user_webdavauth'];
                        }

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 5b8cb17a81c96df89c4d7d635b42616320bd1ff6..58579f42dfc6d706249e6a8b7232dc11b2d9e62b 100644 (file)
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -35,6 +35,8 @@
 
 namespace OC\Connector\Sabre;
 
+use OC\Encryption\Exceptions\GenericEncryptionException;
+
 class File extends \OC\Connector\Sabre\Node implements \Sabre\DAV\IFile {
 
        /**
@@ -125,7 +127,7 @@ class File extends \OC\Connector\Sabre\Node implements \Sabre\DAV\IFile {
                } catch (\OCP\Files\LockNotAcquiredException $e) {
                        // the file is currently being written to by another process
                        throw new \OC\Connector\Sabre\Exception\FileLocked($e->getMessage(), $e->getCode(), $e);
-               } catch (\OCA\Files_Encryption\Exception\EncryptionException $e) {
+               } catch (GenericEncryptionException $e) {
                        throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
                } catch (\OCP\Files\StorageNotAvailableException $e) {
                        throw new \Sabre\DAV\Exception\ServiceUnavailable("Failed to write file contents: ".$e->getMessage());

diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php
index 041db2a2cb86350a8a58706d9540bde926d1c7c1..82753df1dc762c3254dc825d1aa98776ef9e5f46 100644 (file)
--- a/lib/private/encryption/keys/storage.php
+++ b/lib/private/encryption/keys/storage.php
@@ -23,9 +23,9 @@
 
 namespace OC\Encryption\Keys;
 
+use OC\Encryption\Exceptions\GenericEncryptionException;
 use OC\Encryption\Util;
 use OC\Files\View;
-use OCA\Files_Encryption\Exception\EncryptionException;
 
 class Storage implements \OCP\Encryption\Keys\IStorage {
 
@@ -253,13 +253,13 @@ class Storage implements \OCP\Encryption\Keys\IStorage {
         *
         * @param string $path path to the file, relative to data/
         * @return string
-        * @throws EncryptionException
+        * @throws GenericEncryptionException
         * @internal param string $keyId
         */
        private function getFileKeyDir($path) {
 
                if ($this->view->is_dir($path)) {
-                       throw new EncryptionException('file was expected but directory was given', EncryptionException::GENERIC);
+                       throw new GenericEncryptionException('file was expected but directory was given');
                }
 
                list($owner, $filename) = $this->util->getUidAndFilename($path);

diff --git a/tests/enable_all.php b/tests/enable_all.php
index 61c94e6effe25a0dc462ad345c28c6b3ff89c5d0..464155b1f39abe79e5319cee501ae9d7e4c36158 100644 (file)
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -18,7 +18,6 @@ function enableApp($app) {
 
 enableApp('files_sharing');
 enableApp('files_trashbin');
-enableApp('files_encryption');
 enableApp('encryption');
 enableApp('user_ldap');
 enableApp('files_versions');