Merge pull request #9018 from nextcloud/fix-copy-encrypted-files
reset encryptionVersion to '1' if a file was stream copied
This commit is contained in:
commit
c3900c9d0d
|
@ -652,13 +652,14 @@ class Encryption extends Wrapper {
|
||||||
* @param string $sourceInternalPath
|
* @param string $sourceInternalPath
|
||||||
* @param string $targetInternalPath
|
* @param string $targetInternalPath
|
||||||
* @param bool $isRename
|
* @param bool $isRename
|
||||||
|
* @param bool $keepEncryptionVersion
|
||||||
*/
|
*/
|
||||||
private function updateEncryptedVersion(Storage\IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename) {
|
private function updateEncryptedVersion(Storage\IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename, $keepEncryptionVersion) {
|
||||||
$isEncrypted = $this->encryptionManager->isEnabled() && $this->shouldEncrypt($targetInternalPath) ? 1 : 0;
|
$isEncrypted = $this->encryptionManager->isEnabled() && $this->shouldEncrypt($targetInternalPath);
|
||||||
$cacheInformation = [
|
$cacheInformation = [
|
||||||
'encrypted' => (bool)$isEncrypted,
|
'encrypted' => $isEncrypted,
|
||||||
];
|
];
|
||||||
if($isEncrypted === 1) {
|
if($isEncrypted) {
|
||||||
$encryptedVersion = $sourceStorage->getCache()->get($sourceInternalPath)['encryptedVersion'];
|
$encryptedVersion = $sourceStorage->getCache()->get($sourceInternalPath)['encryptedVersion'];
|
||||||
|
|
||||||
// In case of a move operation from an unencrypted to an encrypted
|
// In case of a move operation from an unencrypted to an encrypted
|
||||||
|
@ -666,7 +667,7 @@ class Encryption extends Wrapper {
|
||||||
// correct value would be "1". Thus we manually set the value to "1"
|
// correct value would be "1". Thus we manually set the value to "1"
|
||||||
// for those cases.
|
// for those cases.
|
||||||
// See also https://github.com/owncloud/core/issues/23078
|
// See also https://github.com/owncloud/core/issues/23078
|
||||||
if($encryptedVersion === 0) {
|
if($encryptedVersion === 0 || !$keepEncryptionVersion) {
|
||||||
$encryptedVersion = 1;
|
$encryptedVersion = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -714,7 +715,7 @@ class Encryption extends Wrapper {
|
||||||
$info['size']
|
$info['size']
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$this->updateEncryptedVersion($sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename);
|
$this->updateEncryptedVersion($sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename, true);
|
||||||
}
|
}
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
@ -757,7 +758,7 @@ class Encryption extends Wrapper {
|
||||||
if ($preserveMtime) {
|
if ($preserveMtime) {
|
||||||
$this->touch($targetInternalPath, $sourceStorage->filemtime($sourceInternalPath));
|
$this->touch($targetInternalPath, $sourceStorage->filemtime($sourceInternalPath));
|
||||||
}
|
}
|
||||||
$this->updateEncryptedVersion($sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename);
|
$this->updateEncryptedVersion($sourceStorage, $sourceInternalPath, $targetInternalPath, $isRename, false);
|
||||||
} else {
|
} else {
|
||||||
// delete partially written target file
|
// delete partially written target file
|
||||||
$this->unlink($targetInternalPath);
|
$this->unlink($targetInternalPath);
|
||||||
|
|
|
@ -802,7 +802,7 @@ class EncryptionTest extends Storage {
|
||||||
'encrypted' => $expectedEncrypted,
|
'encrypted' => $expectedEncrypted,
|
||||||
];
|
];
|
||||||
if($expectedEncrypted === true) {
|
if($expectedEncrypted === true) {
|
||||||
$expectedCachePut['encryptedVersion'] = 12345;
|
$expectedCachePut['encryptedVersion'] = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->arrayCache->expects($this->never())->method('set');
|
$this->arrayCache->expects($this->never())->method('set');
|
||||||
|
|
Loading…
Reference in New Issue