L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-9636 fixed many sql injections in grade import code

Browse Source
This commit is contained in:
skodak
2007-09-26 11:02:36 +00:00
parent 07916f13cc
commit c22e335d80
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/import/csv/index.php
+18 -16
View File
@@ -140,7 +140,7 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
switch ($t0) {
case 'userid': //
if (!$user = get_record('user','id', $value)) {
if (!$user = get_record('user','id', addslashes($value))) {
// user not found, abort whold import
import_cleanup($importcode);
notify("user mapping error, could not find user with id \"$value\"");
@@ -150,7 +150,7 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
$studentid = $value;
break;
case 'useridnumber':
if (!$user = get_record('user', 'idnumber', $value)) {
if (!$user = get_record('user', 'idnumber', addslashes($value))) {
// user not found, abort whold import
import_cleanup($importcode);
notify("user mapping error, could not find user with idnumber \"$value\"");
@@ -160,7 +160,7 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
$studentid = $user->id;
break;
case 'useremail':
if (!$user = get_record('user', 'email', $value)) {
if (!$user = get_record('user', 'email', addslashes($value))) {
import_cleanup($importcode);
notify("user mapping error, could not find user with email address \"$value\"");
$status = false;
@@ -169,7 +169,7 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
$studentid = $user->id;
break;
case 'username':
if (!$user = get_record('user', 'username', $value)) {
if (!$user = get_record('user', 'username', addslashes($value))) {
import_cleanup($importcode);
notify("user mapping error, could not find user with username \"$value\"");
$status = false;
@@ -182,11 +182,12 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
if (empty($newgradeitems[$key])) {
$newgradeitem = new object();
$newgradeitem->itemname = $header[$key];
$newgradeitem->import_code = $importcode;
// failed to insert into new grade item buffer
if (!$newgradeitems[$key] = insert_record('grade_import_newitem', $newgradeitem)) {
if (!$newgradeitems[$key] = insert_record('grade_import_newitem', addslashes_recursive($newgradeitem))) {
$status = false;
import_cleanup($importcode);
notify(get_string('importfailed', 'grades'));
@@ -195,9 +196,9 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
// add this to grade_import_newitem table
// add the new id to $newgradeitem[$key]
}
unset($newgrade);
$newgrade -> newgradeitem = $newgradeitems[$key];
$newgrade -> finalgrade = $value;
$newgrade = new object();
$newgrade->newgradeitem = $newgradeitems[$key];
$newgrade->finalgrade = $value;
$newgrades[] = $newgrade;
// if not, put it in
@@ -206,8 +207,9 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
case 'feedback':
if ($t1) {
// t1 is the id of the grade item
$feedback -> itemid = $t1;
$feedback -> feedback = $value;
$feedback = new object();
$feedback->itemid = $t1;
$feedback->feedback = $value;
$newfeedbacks[] = $feedback;
}
break;
@@ -244,9 +246,9 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
break 3;
}
unset($newgrade);
$newgrade -> itemid = $gradeitem->id;
$newgrade -> finalgrade = $value;
$newgrade = new object();
$newgrade->itemid = $gradeitem->id;
$newgrade->finalgrade = $value;
$newgrades[] = $newgrade;
} // otherwise, we ignore this column altogether
// because user has chosen to ignore them (e.g. institution, address etc)
@@ -281,7 +283,7 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
$newgrade->import_code = $importcode;
$newgrade->userid = $studentid;
if (!insert_record('grade_import_values', $newgrade)) {
if (!insert_record('grade_import_values', addslashes_recursive($newgrade))) {
// could not insert into temporary table
$status = false;
import_cleanup($importcode);
@@ -296,12 +298,12 @@ if (($formdata = data_submitted()) && !empty($formdata->map)) {
foreach ($newfeedbacks as $newfeedback) {
if ($feedback = get_record('grade_import_values', 'import_code', $importcode, 'userid', $studentid, 'itemid', $newfeedback->itemid)) {
$newfeedback ->id = $feedback ->id;
update_record('grade_import_values', $newfeedback);
update_record('grade_import_values', addslashes_recursive($newfeedback));
} else {
// the grade item for this is not updated
$newfeedback->import_code = $importcode;
$newfeedback->userid = $studentid;
insert_record('grade_import_values', $newfeedback);
insert_record('grade_import_values', addslashes_recursive($newfeedback));
}
}
}
grade/import/xml/index.php
+2 -2
View File
@@ -124,7 +124,7 @@ if ( $formdata = $mform->get_data()) {
foreach ($newgrades as $newgrade) {
// check if user exist
if (!$user = get_record('user', 'id', $newgrade->userid)) {
if (!$user = get_record('user', 'id', addslashes($newgrade->userid))) {
// no user found, abort
$status = false;
import_cleanup($importcode);
@@ -143,7 +143,7 @@ if ( $formdata = $mform->get_data()) {
// insert this grade into a temp table
$newgrade->import_code = $importcode;
if (!insert_record('grade_import_values', $newgrade)) {
if (!insert_record('grade_import_values', addslashes_recursive($newgrade))) {
$status = false;
// could not insert into temp table
import_cleanup($importcode);
grade/import/xmlurl/import.php
+2 -2
View File
@@ -114,7 +114,7 @@ if ($results = $content['results']['#']['result']) {
foreach ($newgrades as $newgrade) {
// check if user exist
if (!$user = get_record('user', 'id', $newgrade->userid)) {
if (!$user = get_record('user', 'id', addslashes($newgrade->userid))) {
// no user found, abort
$status = false;
$error = get_string('baduserid', 'grades');
@@ -130,7 +130,7 @@ if ($results = $content['results']['#']['result']) {
// insert this grade into a temp table
$newgrade->import_code = $importcode;
if (!insert_record('grade_import_values', $newgrade)) {
if (!insert_record('grade_import_values', addslashes_recursive($newgrade))) {
$status = false;
// could not insert into temp table
$error = get_string('importfailed', 'grades');