make sure that all file keys are written to the key storage

2 files changed, 32 insertions, 3 deletions

diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 66cb1dc434b..516d7b1304a 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -117,11 +117,16 @@ class Encryption implements IEncryptionModule {
 				$this->writeCache = '';
 			}
 			$publicKeys = array();
-			foreach ($this->accessList['users'] as $user) {
-				$publicKeys[] = $this->keymanager->getPublicKey($user);
+			foreach ($this->accessList['users'] as $uid) {
+				$publicKeys[$uid] = $this->keymanager->getPublicKey($uid);
 			}
 
-			$result = $this->crypt->multiKeyEncrypt($this->fileKey, $publicKeys);
+			$encryptedKeyfiles = $this->crypt->multiKeyEncrypt($this->fileKey, $publicKeys);
+
+			$this->keymanager->setFileKey($path, $encryptedKeyfiles['data']);
+			foreach ($encryptedKeyfiles['keys'] as $uid => $keyFile) {
+				$this->keymanager->setShareKey($path, $uid, $keyFile);
+			}
 		}
 		return $result;
 	}
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php
index 120254defdd..59f904ecf17 100644
--- a/apps/encryption/lib/keymanager.php
+++ b/apps/encryption/lib/keymanager.php
@@ -174,6 +174,30 @@ class KeyManager {
 	}
 
 	/**
+	 * write file key to key storage
+	 *
+	 * @param string $path
+	 * @param string $key
+	 * @return boolean
+	 */
+	public function setFileKey($path, $key) {
+		return $this->keyStorage->setFileKey($path, $this->fileKeyId, $key);
+	}
+
+	/**
+	 * write share key to the key storage
+	 *
+	 * @param string $path
+	 * @param string $uid
+	 * @param string $key
+	 * @return boolean
+	 */
+	public function setShareKey($path, $uid, $key) {
+		$keyId = $uid . '.' . $this->shareKeyId;
+		return $this->keyStorage->setFileKey($path, $keyId, $key);
+	}
+
+	/**
 	 * Decrypt private key and store it
 	 *
 	 * @param string $uid userid