Skip to content

[stable20] Fix undefined index and consequential damages in versions code #23422

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

Merged
MorrisJobke merged 2 commits into from
Oct 19, 2020
Merged

[stable20] Fix undefined index and consequential damages in versions code #23422

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a25ded
Fix undefined index and consequential damages in versions code
ChristophWurst Oct 8, 2020
2b1f3df
Return all keys in getAllVersions() instead
MorrisJobke Oct 9, 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
Prev Previous commit
Return all keys in getAllVersions() instead 
Signed-off-by: Morris Jobke <[email protected]>
  • Loading branch information
@MorrisJobke @backportbot
MorrisJobke authored and backportbot[bot] committed Oct 13, 2020
commit 2b1f3df3da35c7cea88dd43be575d02a1bfa6a6a
11 changes: 7 additions & 4 deletions apps/files_versions/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ public static function expireOlderThanMaxForUser($uid) {
$expiration = self::getExpiration();
$threshold = $expiration->getMaxAgeAsTimestamp();
$versions = self::getAllVersions($uid);
if (!$threshold || !array_key_exists('all', $versions)) {
if (!$threshold || empty($versions['all'])) {
return;
}

Expand Down Expand Up @@ -578,7 +578,10 @@ private static function getAllVersions($uid) {
// newest version first
krsort($versions);

$result = [];
$result = [
'all' => [],
'by_file' => [],
];

foreach ($versions as $key => $value) {
$size = $view->filesize(self::VERSIONS_ROOT.'/'.$value['path'].'.v'.$value['timestamp']);
Expand Down Expand Up @@ -775,8 +778,8 @@ public static function expire($filename, $uid) {

// if still not enough free space we rearrange the versions from all files
if ($availableSpace <= 0) {
$result = Storage::getAllVersions($uid);
$allVersions = $result['all'] ?? [];
$result = self::getAllVersions($uid);
$allVersions = $result['all'];

foreach ($result['by_file'] as $versions) {
list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);
Expand Down