mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix problem with deleted files 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2018-02-12 16:25:36 +01:00
parent d202bae3b5
commit 62e982a91f
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/files/lib/Activity/Provider.php
View File

@ -340,7 +340,7 @@ class Provider implements IProvider {
throw new \InvalidArgumentException('Could not generate file parameter'); throw new \InvalidArgumentException('Could not generate file parameter');
} }
$encryptionContainer = $this->getEndToEndEncryptionContainer($id, basename($path)); $encryptionContainer = $this->getEndToEndEncryptionContainer($id, $path);
if ($encryptionContainer instanceof Folder) { if ($encryptionContainer instanceof Folder) {
$this->fileIsEncrypted = true; $this->fileIsEncrypted = true;
try { try {
@ -378,14 +378,15 @@ class Provider implements IProvider {
/** /**
* Check if a file is end2end encrypted * Check if a file is end2end encrypted
* @param int $fileId * @param int $fileId
* @param string $fileName * @param string $path
* @return bool * @return Folder|null
*/ */
protected function getEndToEndEncryptionContainer($fileId, $fileName) { protected function getEndToEndEncryptionContainer($fileId, $path) {
if (isset($this->fileEncrypted[$fileId])) { if (isset($this->fileEncrypted[$fileId])) {
return $this->fileEncrypted[$fileId]; return $this->fileEncrypted[$fileId];
} }
$fileName = basename($path);
if (!preg_match('/^[0-9a-fA-F]{32}$/', $fileName)) { if (!preg_match('/^[0-9a-fA-F]{32}$/', $fileName)) {
$this->fileEncrypted[$fileId] = false; $this->fileEncrypted[$fileId] = false;
return $this->fileEncrypted[$fileId]; return $this->fileEncrypted[$fileId];
@ -394,10 +395,18 @@ class Provider implements IProvider {
$userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId()); $userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId());
$files = $userFolder->getById($fileId); $files = $userFolder->getById($fileId);
if (empty($files)) { if (empty($files)) {
return null; // Deleted, try with parent
$file = $userFolder->get(dirname($path));
if (!$file instanceof Folder || !$file->isEncrypted()) {
return null;
}
$this->fileEncrypted[$fileId] = $file;
return $file;
} }
$file = array_shift($files); $file = array_shift($files);
if ($file instanceof Folder && $file->isEncrypted()) { if ($file instanceof Folder && $file->isEncrypted()) {
// If the folder is encrypted, it is the Container, // If the folder is encrypted, it is the Container,
// but can be the name is just fine. // but can be the name is just fine.