mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

MDL-74641 repository: Handles increase bytes while extracting zip files

Browse Source 
We should not rely solely on the provided size information.
Therefore the system needs to recalculate the size of each file in the zip file,
whether small or big.

The changes also cover the filemanager.js file if an error appears.
This commit is contained in:
meirzamoodle 2023-08-11 08:06:25 +07:00 committed by Jenkins
parent 4cae44dd0e
commit 9ba1423359
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/filestorage/zip_packer.php
View File

@ -451,6 +451,17 @@ class zip_packer extends file_packer {
$done = 0;
}
// Get user remaining space.
$areamaxbytes = FILE_AREA_MAX_BYTES_UNLIMITED;
$context = context::instance_by_id($contextid);
if (!has_capability('moodle/user:ignoreuserquota', $context)) {
// Get current used space for this user (private files only).
$fileareainfo = file_get_file_area_info($contextid, 'user', 'private');
$usedspace = $fileareainfo['filesize_without_references'];
$areamaxbytes = (int) $CFG->userquota - $usedspace;
}
$totalsizebytes = 0;
foreach ($ziparch as $info) {
// Notify progress.
if ($progress) {
@ -461,6 +472,8 @@ class zip_packer extends file_packer {
$size = $info->size;
$name = $info->pathname;
$realfilesize = 0;
if ($name === '' or array_key_exists($name, $processed)) {
//probably filename collisions caused by filename cleaning/conversion
continue;
@ -489,6 +502,17 @@ class zip_packer extends file_packer {
$content = '';
while (!feof($fz)) {
$content .= fread($fz, 262143);
$realfilesize += strlen($content); // Current file size.
$totalsizebytes += strlen($content);
if ($realfilesize > $size ||
($areamaxbytes != FILE_AREA_MAX_BYTES_UNLIMITED && $totalsizebytes > $areamaxbytes)) {
$processed[0] = 'cannotunzipquotaexceeded';
// Close and unset the stream and the content.
fclose($fz);
unset($content);
// Cancel all processes.
break(2);
}
}
fclose($fz);
if (strlen($content) !== $size) {
@ -535,7 +559,19 @@ class zip_packer extends file_packer {
}
while (!feof($fz)) {
$content = fread($fz, 262143);
fwrite($fp, $content);
$numofbytes = fwrite($fp, $content);
$realfilesize += $numofbytes; // Current file size.
$totalsizebytes += $numofbytes;
if ($realfilesize > $size ||
($areamaxbytes != FILE_AREA_MAX_BYTES_UNLIMITED && $totalsizebytes > $areamaxbytes)) {
$processed[0] = 'cannotunzipquotaexceeded';
// Close and remove the tmpfile.
fclose($fz);
fclose($fp);
unlink($tmpfile);
// Cancel all processes.
break(2);
}
}
fclose($fz);
fclose($fp);

2
lib/form/filemanager.js
View File

@ -1033,7 +1033,7 @@ M.form_filemanager.init = function(Y, options) {
callback: function(id, obj, args) {
if (obj.error) {
selectnode.removeClass('loading');
args.scope.print_msg(obj.error, 'error');
args.scope.print_msg(obj.error, 'error', options);
} else {
args.scope.selectui.hide();
args.scope.refresh(obj.filepath);

6
repository/draftfiles_ajax.php
View File

@ -237,7 +237,11 @@ switch ($action) {
return $result !== true;
});
if (count($failed) > 0) {
$return->error = get_string('cannotunzipextractfileerror', 'repository');
if ($failed[0] == "cannotunzipquotaexceeded") {
$return->error = get_string($failed[0], 'repository');
} else {
$return->error = get_string('cannotunzipextractfileerror', 'repository');
}
die(json_encode($return));
}