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

MDL-50907 tool_messageinbound: Use antiviruses_scan_data for attachments scanning.

Browse Source
This commit is contained in:
Ruslan Kabalin
2018-04-12 10:30:25 +08:00
committed by Andrew Nicols
parent ddf14b32fe
commit f6c5cfef77
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/messageinbound/classes/manager.php
+1 -17
View File
@@ -666,25 +666,9 @@ class manager {
if (!empty($CFG->antiviruses)) {
mtrace("--> Attempting virus scan of '{$attachment->filename}'");
// Store the file on disk - it will need to be virus scanned first.
$itemid = rand(1, 999999999);;
$directory = make_temp_directory("/messageinbound/{$itemid}", false);
$filepath = $directory . "/" . $attachment->filename;
if (!$fp = fopen($filepath, "w")) {
// Unable to open the temporary file to write this to disk.
mtrace("--> Unable to save the file to disk for virus scanning. Check file permissions.");
throw new \core\message\inbound\processing_failed_exception('attachmentfilepermissionsfailed',
'tool_messageinbound');
}
fwrite($fp, $attachment->content);
fclose($fp);
// Perform a virus scan now.
try {
\core\antivirus\manager::scan_file($filepath, $attachment->filename, true);
\core\antivirus\manager::scan_data($attachment->content);
} catch (\core\antivirus\scanner_exception $e) {
mtrace("--> A virus was found in the attachment '{$attachment->filename}'.");
$this->inform_attachment_virus();