diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-07-16 12:06:00 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-07-16 12:36:30 +0200 |
| commit | 8105f2ac8a6451c740a5b827724c2debcfbeba41 (patch) | |
| tree | 3162befc60e096bd795c62277e147c38d2ddfe77 /apps/files_encryption/lib/util.php | |
| parent | de69c05f992dde91beab513c4f452d9b5985aa0a (diff) | |
| download | nextcloud-server-8105f2ac8a6451c740a5b827724c2debcfbeba41.tar.gz nextcloud-server-8105f2ac8a6451c740a5b827724c2debcfbeba41.zip | |
introduce some encryption exceptions and catch additional error cases
Diffstat (limited to 'apps/files_encryption/lib/util.php')
| -rw-r--r-- | apps/files_encryption/lib/util.php | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index ee9939318c6..e44a8bd3dda 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -908,19 +908,26 @@ class Util { // Get the current users's private key for decrypting existing keyfile $privateKey = $session->getPrivateKey(); - $fileOwner = \OC\Files\Filesystem::getOwner($filePath); - - // Decrypt keyfile - $plainKeyfile = $this->decryptKeyfile($filePath, $privateKey); - - // Re-enc keyfile to (additional) sharekeys - $multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys); + try { + // Decrypt keyfile + $plainKeyfile = $this->decryptKeyfile($filePath, $privateKey); + // Re-enc keyfile to (additional) sharekeys + $multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys); + } catch (Exceptions\EncryptionException $e) { + $msg = 'set shareFileKeyFailed (code: ' . $e->getCode() . '): ' . $e->getMessage(); + \OCP\Util::writeLog('files_encryption', $msg, \OCP\Util::FATAL); + return false; + } catch (\Exception $e) { + $msg = 'set shareFileKeyFailed (unknown error): ' . $e->getMessage(); + \OCP\Util::writeLog('files_encryption', $msg, \OCP\Util::FATAL); + return false; + } // Save the recrypted key to it's owner's keyfiles directory // Save new sharekeys to all necessary user directory if ( - !Keymanager::setFileKey($this->view, $this, $filePath, $multiEncKey['data']) - || !Keymanager::setShareKeys($this->view, $this, $filePath, $multiEncKey['keys']) + !Keymanager::setFileKey($this->view, $this, $filePath, $multiEncKey['data']) + || !Keymanager::setShareKeys($this->view, $this, $filePath, $multiEncKey['keys']) ) { \OCP\Util::writeLog('Encryption library', |