Skip to content

fixed moving of master key encrypted and versioned files between shared folders #16696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
weizenspreu wants to merge 2 commits into from
Closed

fixed moving of master key encrypted and versioned files between shared folders #16696

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c167b7
fixed moving of encrypted and versioned files between shared folders
weizenspreu Aug 8, 2019
06905e8
Revert normalizePath to check if NFD/NFC tests pass then
MorrisJobke Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fixed moving of encrypted and versioned files between shared folders 
Signed-off-by: Kenny <k.niehage@syseleven.de>
  • Loading branch information
@weizenspreu @MorrisJobke
weizenspreu authored and MorrisJobke committed Sep 17, 2020
commit 3c167b7da68ff43c5a1100ec304fca7d4a9cea41
2 changes: 1 addition & 1 deletion lib/private/Files/Storage/Local.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ public function getSourcePath($path) {
throw new ForbiddenException('Invalid path', false);
}

$fullPath = $this->datadir . $path;
$fullPath = Filesystem::normalizePath($this->datadir . $path);
$currentPath = $path;
if ($this->allowSymlinks || $currentPath === '') {
return $fullPath;
Expand Down
16 changes: 15 additions & 1 deletion lib/private/Files/Storage/Wrapper/Encryption.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,16 @@ private function updateEncryptedVersion(Storage\IStorage $sourceStorage, $source
*/
private function copyBetweenStorage(Storage\IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime, $isRename) {

// store encryptedVersion
$encrypted = false;
$encryptedVersion = 0;
if (isset($sourceStorage->getCache()->get($sourceInternalPath)['encrypted'])) {
$encrypted = $sourceStorage->getCache()->get($sourceInternalPath)['encrypted'];
}
if (isset($sourceStorage->getCache()->get($sourceInternalPath)['encryptedVersion'])) {
$encryptedVersion = $sourceStorage->getCache()->get($sourceInternalPath)['encryptedVersion'];
}

// for versions we have nothing to do, because versions should always use the
// key from the original file. Just create a 1:1 copy and done
if ($this->isVersion($targetInternalPath) ||
Expand Down Expand Up @@ -774,6 +784,10 @@ private function copyBetweenStorage(Storage\IStorage $sourceStorage, $sourceInte
$this->getCache()->remove($targetInternalPath);
}
}

// restore encryptedVersion
$sourceStorage->getCache()->put($sourceInternalPath, ['encrypted' => $encrypted, 'encryptedVersion' => $encryptedVersion]);

return (bool)$result;
}

Expand Down Expand Up @@ -1020,7 +1034,7 @@ protected function shouldEncrypt($path) {
}

try {
$encryptionModule = $this->getEncryptionModule($fullPath);
$encryptionModule = $this->getEncryptionModule($path);
} catch (ModuleDoesNotExistsException $e) {
return false;
}
Expand Down