diff options
author | Bjoern Schiessle <schiessle@owncloud.com> | 2016-03-15 11:23:49 +0100 |
---|---|---|
committer | Bjoern Schiessle <schiessle@owncloud.com> | 2016-03-15 11:33:19 +0100 |
commit | 9de4a8338ec2e850c87a7404e5093e7b29ebf6f6 (patch) | |
tree | 07e93372b08950b7d72375d57dd17814e5ee0e61 /apps/encryption/lib | |
parent | f8180579d03fcd10ab8f92f1ecb27899436c7653 (diff) | |
download | nextcloud-server-9de4a8338ec2e850c87a7404e5093e7b29ebf6f6.tar.gz nextcloud-server-9de4a8338ec2e850c87a7404e5093e7b29ebf6f6.zip |
allow group shares, even if not all public keys are available
Diffstat (limited to 'apps/encryption/lib')
-rw-r--r-- | apps/encryption/lib/crypto/encryption.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php index 10c8c4a290a..907a6437f5b 100644 --- a/apps/encryption/lib/crypto/encryption.php +++ b/apps/encryption/lib/crypto/encryption.php @@ -390,7 +390,11 @@ class Encryption implements IEncryptionModule { $publicKeys[$this->keyManager->getMasterKeyId()] = $this->keyManager->getPublicMasterKey(); } else { foreach ($accessList['users'] as $user) { - $publicKeys[$user] = $this->keyManager->getPublicKey($user); + try { + $publicKeys[$user] = $this->keyManager->getPublicKey($user); + } catch (PublicKeyMissingException $e) { + $this->logger->warning('Could not encrypt file for ' . $user . ': ' . $e->getMessage()); + } } } |