upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

fix unencrypted_size for files when scanning

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2023-03-03 17:10:56 +01:00
parent 63fb33538c
commit 649bed5154
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/private/Files/Cache/Scanner.php
View file

@ -208,9 +208,17 @@ class Scanner extends BasicEmitter implements IScanner {
$data['etag'] = $etag;
}
}
// we only updated unencrypted_size if it's already set
if ($cacheData['unencrypted_size'] === 0) {
unset($data['unencrypted_size']);
}
// Only update metadata that has changed
$newData = array_diff_assoc($data, $cacheData->getData());
} else {
// we only updated unencrypted_size if it's already set
unset($data['unencrypted_size']);
$newData = $data;
$fileId = -1;
}

5
lib/private/Files/Storage/Wrapper/Encryption.php
View file

@ -180,10 +180,12 @@ class Encryption extends Wrapper {
if (isset($this->unencryptedSize[$fullPath])) {
$data['encrypted'] = true;
$data['size'] = $this->unencryptedSize[$fullPath];
$data['unencrypted_size'] = $data['size'];
} else {
if (isset($info['fileid']) && $info['encrypted']) {
$data['size'] = $this->verifyUnencryptedSize($path, $info->getUnencryptedSize());
$data['encrypted'] = true;
$data['unencrypted_size'] = $data['size'];
}
}
@ -494,7 +496,8 @@ class Encryption extends Wrapper {
$result = $unencryptedSize;
if ($unencryptedSize < 0 ||
($size > 0 && $unencryptedSize === $size)
($size > 0 && $unencryptedSize === $size) ||
$unencryptedSize > $size
) {
// check if we already calculate the unencrypted size for the
// given path to avoid recursions