sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Copy data back instead of renaming to avoid changing the fileid 

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/38080/head
Côme Chilliet 2023-05-11 11:24:16 +07:00
parent 725403cb0d
commit 36fc5dc8ae
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/encryption/lib/Command/FixLegacyFileKey.php
Unescape Escape View File

@ -128,8 +128,17 @@ class FixLegacyFileKey extends Command {
try {
$this->rootView->copy($source, $target);
$this->rootView->touch($target, $fileInfo->getMTime());
$this->rootView->rename($target, $source);
$copyResource = $this->rootView->fopen($target, 'r');
$sourceResource = $this->rootView->fopen($source, 'w');
if ($copyResource === false || $sourceResource === false) {
throw new DecryptionFailedException('Failed to open '.$source.' or '.$target);
}
if (stream_copy_to_stream($copyResource, $sourceResource) === false) {
$output->writeln('<error>Failed to copy '.$target.' data into '.$source.'</error>');
$output->writeln('<error>Leaving both files in there to avoid data loss</error>');
return;
}
$this->rootView->touch($source, $fileInfo->getMTime());
$output->writeln('<info>Migrated ' . $source . '</info>', OutputInterface::VERBOSITY_VERBOSE);
} catch (DecryptionFailedException $e) {
if ($this->rootView->file_exists($target)) {