From f9ad9b7012bd8d90d698753b764cb2103d6e3969 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 7 Oct 2005 19:39:48 +0000 Subject: [PATCH] * (bug 3641) changed the upload rules so that mime types of file contents have to match the file extension. --- includes/SpecialUpload.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php index 475273ce88..06b79a7843 100644 --- a/includes/SpecialUpload.php +++ b/includes/SpecialUpload.php @@ -752,12 +752,16 @@ class UploadForm { function verifyExtension( $mime, $extension ) { $fname = 'SpecialUpload::verifyExtension'; - if (!$mime || $mime=="unknown" || $mime=="unknown/unknown") { - wfDebug( "$fname: passing file with unknown mime type\n" ); - return true; - } + $magic =& wfGetMimeMagic(); - $magic=& wfGetMimeMagic(); + if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' ) + if ( ! $magic->getTypesForExtension( $extension ) ) { + wfDebug( "$fname: passing file with unknown mime type and unknown extension\n" ); + return true; + } else { + wfDebug( "$fname: rejecting file with unknown mime type but known extension\n" ); + return false; + } $match= $magic->isMatchingExtension($extension,$mime); -- 2.20.1