Skip to content

[stable33] fix: only use unencrypted_size if set to a value #64964

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

Open
backportbot wants to merge 2 commits into
base: stable33
Choose a base branch
from
+26 −2
Open

[stable33] fix: only use unencrypted_size if set to a value #64964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d7431d
fix: only use `unencrypted_size` if set to a value
susnux Sep 30, 2026
ff82295
fix(files): keep the zero-byte plaintext size of server side encrypte…
susnux Oct 1, 2026
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
4 changes: 2 additions & 2 deletions lib/private/Files/FileInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public function getSize($includeMounts = true) {
if ($includeMounts) {
$this->updateEntryFromSubMounts();

if ($this->isEncrypted() && isset($this->data['unencrypted_size'])) {
if (self::hasPlaintextSize($this->data)) {
return $this->data['unencrypted_size'];
} else {
return isset($this->data['size']) ? 0 + $this->data['size'] : 0;
Expand Down Expand Up @@ -342,7 +342,7 @@ public function addSubEntry($data, $entryPath) {
if (!$data) {
return;
}
$hasUnencryptedSize = !empty($data['encrypted']) && isset($data['unencrypted_size']);
$hasUnencryptedSize = self::hasPlaintextSize($data);
if ($hasUnencryptedSize) {
$subSize = $data['unencrypted_size'];
} else {
Expand Down
24 changes: 24 additions & 0 deletions tests/lib/Files/FileInfoTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,30 @@ public function testGetSizeEncryptedNonZero(): void {
$this->assertSame(5000, $info->getSize(false));
}

public function testGetSizeEncryptedFolderWithoutPlaintextSize(): void {
// End-to-end encrypted folders carry the `encrypted` flag but never a plaintext size,
// so the propagated `size` has to be reported instead of the unset `unencrypted_size`
$info = $this->makeFileInfo([
'encrypted' => true,
'mimetype' => FileInfo::MIMETYPE_FOLDER,
'size' => 8192,
'unencrypted_size' => 0,
]);
$this->assertSame(8192, $info->getSize(true));
$this->assertSame(8192, $info->getSize(false));
}

public function testGetSizeEncryptedFolderWithPlaintextSize(): void {
$info = $this->makeFileInfo([
'encrypted' => true,
'mimetype' => FileInfo::MIMETYPE_FOLDER,
'size' => 8192,
'unencrypted_size' => 5000,
]);
$this->assertSame(5000, $info->getSize(true));
$this->assertSame(5000, $info->getSize(false));
}

public function testGetSizeNonEncrypted(): void {
$info = $this->makeFileInfo(['encrypted' => false, 'size' => 100]);
$this->assertSame(100, $info->getSize(true));
Expand Down