feat: adding new storage method setFileKey

owncloud · Dec 15, 2021 · 92ca08f · 92ca08f
1 parent d4fe6d7
commit 92ca08f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 4 deletions.
diff --git a/lib/private/Encryption/Keys/Storage.php b/lib/private/Encryption/Keys/Storage.php
@@ -141,6 +141,14 @@ public function setUserKey($uid, $keyId, $key, $encryptionModuleId) {
 	 * @inheritdoc
 	 */
 	public function setFileKey($path, $keyId, $key, $encryptionModuleId) {
+		$mount = $this->mountManager->find($path);
+		if ($mount) {
+			$result = $mount->getStorage()->setFileKey($mount->getInternalPath($path), $keyId, $key, $encryptionModuleId);
+			if ($result !== null) {
+				return $result;
+			}
+		}
+
 		$keyDir = $this->getFileKeyDir($encryptionModuleId, $path);
 		return $this->setKey($keyDir . $keyId, $key);
 	}

diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
@@ -802,7 +802,11 @@ public function getEncryptionFileKeyDirectory(string $encryptionModuleId, string
 		return null;
 	}
 
-	public function getFileKey(string $path, string $keyId, string $encryptionModuleId): ?string {
+	public function getFileKey(string $internalPath, string $keyId, string $encryptionModuleId): ?string {
+		return null;
+	}
+
+	public function setFileKey(string $internalPath, string $keyId, $key, string $encryptionModuleId): ?bool {
 		return null;
 	}
 }
diff --git a/lib/private/Files/Storage/Storage.php b/lib/private/Files/Storage/Storage.php
@@ -118,5 +118,7 @@ public function changeLock($path, $type, ILockingProvider $provider);
 
 	public function getEncryptionFileKeyDirectory(string $encryptionModuleId, string $path): ?string;
 
-	public function getFileKey(string $path, string $keyId, string $encryptionModuleId): ?string;
+	public function getFileKey(string $internalPath, string $keyId, string $encryptionModuleId): ?string;
+
+	public function setFileKey(string $internalPath, string $keyId, $key, string $encryptionModuleId): ?bool;
 }
diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php
@@ -656,7 +656,11 @@ public function getEncryptionFileKeyDirectory(string $encryptionModuleId, string
 		return $this->getWrapperStorage()->getEncryptionFileKeyDirectory($encryptionModuleId, $path);
 	}
 
-	public function getFileKey(string $path, string $keyId, string $encryptionModuleId): ?string {
-		return $this->getWrapperStorage()->getFileKey($path, $keyId, $encryptionModuleId);
+	public function getFileKey(string $internalPath, string $keyId, string $encryptionModuleId): ?string {
+		return $this->getWrapperStorage()->getFileKey($internalPath, $keyId, $encryptionModuleId);
+	}
+
+	public function setFileKey(string $internalPath, string $keyId, $key, string $encryptionModuleId): ?bool {
+		return $this->getWrapperStorage()->setFileKey($internalPath, $keyId, $key, $encryptionModuleId);
 	}
 }