diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-04 17:17:29 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-11-05 13:05:46 +0100 |
| commit | c2a45c1238c63ad97dbbfd1ef29fb70a45a93d09 (patch) | |
| tree | 765ba6ffff4b12f537dff72a4132113ba77166e8 /apps/files_encryption | |
| parent | 0580c232d72123ca7e3c675ed73268099d00d185 (diff) | |
| download | nextcloud-server-c2a45c1238c63ad97dbbfd1ef29fb70a45a93d09.tar.gz nextcloud-server-c2a45c1238c63ad97dbbfd1ef29fb70a45a93d09.zip | |
throw exception if private key is missing
Diffstat (limited to 'apps/files_encryption')
| -rw-r--r-- | apps/files_encryption/appinfo/app.php | 1 | ||||
| -rw-r--r-- | apps/files_encryption/lib/exceptions.php | 8 | ||||
| -rw-r--r-- | apps/files_encryption/lib/stream.php | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php index aa709fbac65..4f301f48b39 100644 --- a/apps/files_encryption/appinfo/app.php +++ b/apps/files_encryption/appinfo/app.php @@ -13,6 +13,7 @@ OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php'; // Exceptions OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyEncryptException'] = 'files_encryption/lib/exceptions.php'; OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyDecryptException'] = 'files_encryption/lib/exceptions.php'; +OC::$CLASSPATH['OCA\Encryption\Exceptions\EncryptionException'] = 'files_encryption/lib/exceptions.php'; \OCP\Util::addTranslations('files_encryption'); \OCP\Util::addscript('files_encryption', 'encryption'); diff --git a/apps/files_encryption/lib/exceptions.php b/apps/files_encryption/lib/exceptions.php index 3ea27faf406..5b92f4afe74 100644 --- a/apps/files_encryption/lib/exceptions.php +++ b/apps/files_encryption/lib/exceptions.php @@ -30,8 +30,16 @@ namespace OCA\Encryption\Exceptions; * 30 - encryption header to large * 40 - unknown cipher * 50 - encryption failed + * 60 - no private key available */ class EncryptionException extends \Exception { + const UNEXPECTED_END_OF_ENCRTYPTION_HEADER = 10; + const UNEXPECTED_BLOG_SIZE = 20; + const ENCRYPTION_HEADER_TO_LARGE = 30; + const UNKNOWN_CIPHER = 40; + const ENCRYPTION_FAILED = 50; + const NO_PRIVATE_KEY_AVAILABLE = 60; + } /** diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php index f74812a7253..046c38152b8 100644 --- a/apps/files_encryption/lib/stream.php +++ b/apps/files_encryption/lib/stream.php @@ -30,6 +30,7 @@ */ namespace OCA\Encryption; +use OCA\Encryption\Exceptions\EncryptionException; /** * Provides 'crypt://' stream wrapper protocol. @@ -106,6 +107,10 @@ class Stream { $this->session = new \OCA\Encryption\Session($this->rootView); $this->privateKey = $this->session->getPrivateKey(); + if ($this->privateKey === false) { + throw new EncryptionException('Session does not contain a private key, maybe your login password changed?', + EncryptionException::NO_PRIVATE_KEY_AVAILABLE); + } $normalizedPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path)); if ($originalFile = Helper::getPathFromTmpFile($normalizedPath)) { |