mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-17 22:20:00 +01:00
Code Issues Projects Releases Wiki Activity

MDL-18469 checksum restore in-session objects - both in manual restore and

Browse Source 
import, create checksums of the critical in-session objects (info, course_header
and restore) to be able to check in restore_execute.html that all the information
has arrived properly without any trim/error. Merged from 19_STABLE
This commit is contained in:
stronk7 2009-10-05 17:23:31 +00:00
parent f1064cca78
commit cf59fbc036
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backup/restore_check.html
View File

@ -322,6 +322,11 @@
//Save the restore session object
$SESSION->restore = $restore;
// Calculate all session objects checksum and store them in session too
// so restore_execute.html (used by manual restore and import) will be
// able to detect any problem in session info.
restore_save_session_object_checksums($restore, $info, $course_header);
echo "<div style='text-align:center'>";
/// Printout messages

15
backup/restore_execute.html
View File

@ -8,6 +8,21 @@
$info = $SESSION->info;
$course_header = $SESSION->course_header;
$restore = $SESSION->restore;
// Validate objects from session by checking their checksums
$status = false;
if (isset($SESSION->restore_checksums)) {
$checksums = $SESSION->restore_checksums;
if (isset($checksums['info']) && $checksums['info'] == md5(serialize($info)) &&
isset($checksums['course_header']) && $checksums['course_header'] == md5(serialize($course_header)) &&
isset($checksums['restore']) && $checksums['restore'] == md5(serialize($restore))) {
$status = true; // All session checksums were or, we can rely on that to continue restoring
}
}
if(!$status) { // Something was wrong checking objects from session, abort with error
print_error('restorechecksumfailed');
}
}
//Add info->original_wwwroot to $restore to be able to use it in all the restore process

20
backup/restorelib.php
View File

@ -8016,9 +8016,29 @@ define('RESTORE_GROUPS_GROUPINGS', 3);
}
}
}
// Calculate all session objects checksum and store them in session too
// so restore_execute.html (used by manual restore and import) will be
// able to detect any problem in session info.
restore_save_session_object_checksums($restore, $SESSION->info, $SESSION->course_header);
return true;
}
/**
* Save the checksum of the 3 main in-session restore objects (restore, info, course_header)
* so restore_execute.html will be able to check that all them have arrived correctly, without
* losing data for any type of session size limit/error. MDL-18469. Used both by manual restore
* and import
*/
function restore_save_session_object_checksums($restore, $info, $course_header) {
global $SESSION;
$restore_checksums = array();
$restore_checksums['info'] = md5(serialize($info));
$restore_checksums['course_header'] = md5(serialize($course_header));
$restore_checksums['restore'] = md5(serialize($restore));
$SESSION->restore_checksums = $restore_checksums;
}
function backup_to_restore_array($backup,$k=0) {
if (is_array($backup) ) {
$restore = array();