Merge pull request #5629 from nextcloud/add-recovery-key-on-public-up…

…load

Add recovery key on public upload

apps/encryption/lib/Crypto/Encryption.php

@@ -60,6 +60,9 @@ class Encryption implements IEncryptionModule {
 	/** @var string */
 	private $user;
 
+	/** @var  array */
+	private $owner;
+
 	/** @var string */
 	private $fileKey;
 
@@ -136,6 +139,7 @@ public function __construct(Crypt $crypt,
 		$this->decryptAll = $decryptAll;
 		$this->logger = $logger;
 		$this->l = $il10n;
+		$this->owner = [];
 		$this->useMasterPassword = $util->isMasterKeyEnabled();
 	}
 
@@ -280,13 +284,15 @@ public function end($path, $position = 0) {
 				}
 			}
 
-			$publicKeys = $this->keyManager->addSystemKeys($this->accessList, $publicKeys, $this->user);
+			$publicKeys = $this->keyManager->addSystemKeys($this->accessList, $publicKeys, $this->getOwner($path));
 			$encryptedKeyfiles = $this->crypt->multiKeyEncrypt($this->fileKey, $publicKeys);
 			$this->keyManager->setAllFileKeys($this->path, $encryptedKeyfiles);
 		}
 		return $result;
 	}
 
+
+
 	/**
 	 * encrypt data
 	 *
@@ -407,7 +413,7 @@ public function update($path, $uid, array $accessList) {
 				}
 			}
 
-			$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $uid);
+			$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $this->getOwner($path));
 
 			$encryptedFileKey = $this->crypt->multiKeyEncrypt($fileKey, $publicKeys);
 
@@ -556,6 +562,19 @@ protected function stripPartFileExtension($path) {
 		return $path;
 	}
 
+	/**
+	 * get owner of a file
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	protected function getOwner($path) {
+		if (!isset($this->owner[$path])) {
+			$this->owner[$path] = $this->util->getOwner($path);
+		}
+		return $this->owner[$path];
+	}
+
 	/**
 	 * Check if the module is ready to be used by that specific user.
 	 * In case a module is not ready - because e.g. key pairs have not been generated