diff options
| author | Clark Tomlinson <fallen013@gmail.com> | 2015-05-18 11:09:36 -0400 |
|---|---|---|
| committer | Clark Tomlinson <fallen013@gmail.com> | 2015-05-18 11:09:36 -0400 |
| commit | f9b6ee86cda4fe5c2d58218c0c68cf68b2796a5a (patch) | |
| tree | 03fb8ad99cf99f553ff625e3eb48c0d297f77f56 /lib/private/files | |
| parent | c28cd0377001ffd4b53ca03c6601931b0873e030 (diff) | |
| parent | efa674f10d407ebc94332f461cfdd52ab56185be (diff) | |
| download | nextcloud-server-f9b6ee86cda4fe5c2d58218c0c68cf68b2796a5a.tar.gz nextcloud-server-f9b6ee86cda4fe5c2d58218c0c68cf68b2796a5a.zip | |
Merge pull request #16399 from owncloud/enc_rmdir_fix
[encryption] only try to delete file keys if it is a valid path
Diffstat (limited to 'lib/private/files')
| -rw-r--r-- | lib/private/files/storage/wrapper/encryption.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php index 1683ff1350f..5d146b2dd1d 100644 --- a/lib/private/files/storage/wrapper/encryption.php +++ b/lib/private/files/storage/wrapper/encryption.php @@ -245,8 +245,12 @@ class Encryption extends Wrapper { */ public function rmdir($path) { $result = $this->storage->rmdir($path); - if ($result && $this->encryptionManager->isEnabled()) { - $this->keyStorage->deleteAllFileKeys($this->getFullPath($path)); + $fullPath = $this->getFullPath($path); + if ($result && + $this->util->isExcluded($fullPath) === false && + $this->encryptionManager->isEnabled() + ) { + $this->keyStorage->deleteAllFileKeys($fullPath); } return $result; |