diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2015-05-22 12:12:31 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2015-05-22 12:12:31 +0200 |
| commit | fef75e5417206fcc36d979022f0f9921a743a3ae (patch) | |
| tree | a94672a8edcf6c019d1c3dfdac7f6858ad3724df /lib/private/encryption | |
| parent | 94077caea90e3646c77fdae69ea63fc84e1f8409 (diff) | |
| download | nextcloud-server-fef75e5417206fcc36d979022f0f9921a743a3ae.tar.gz nextcloud-server-fef75e5417206fcc36d979022f0f9921a743a3ae.zip | |
remove part file extension before we read a filekey to reuse a existing key if possible, otherwise stuff like versioning will break
Diffstat (limited to 'lib/private/encryption')
| -rw-r--r-- | lib/private/encryption/keys/storage.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php index 6aa00c5b5ee..f90548fd319 100644 --- a/lib/private/encryption/keys/storage.php +++ b/lib/private/encryption/keys/storage.php @@ -70,7 +70,8 @@ class Storage implements IStorage { * @inheritdoc */ public function getFileKey($path, $keyId, $encryptionModuleId) { - $keyDir = $this->getFileKeyDir($encryptionModuleId, $path); + $realFile = $this->util->stripPartialFileExtension($path); + $keyDir = $this->getFileKeyDir($encryptionModuleId, $realFile); return $this->getKey($keyDir . $keyId); } |