mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-16 21:58:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix #3759: Allow individual file extensions (e.g. msg)

Browse Source
This commit is contained in:
Lucas Bartholemy 2019-11-29 12:06:36 +01:00
parent 67b593d7b2
commit 49ee6ffab4
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
protected/humhub/docs/CHANGELOG.md
View File

@ -1,6 +1,12 @@
HumHub Change Log
=================
1.3.19 (Unreleased)
--------------------------
- Fix #3759: Allow individual file extensions (e.g. msg)
1.3.18 (November 22, 2019)
--------------------------

38
protected/humhub/modules/file/validators/FileValidator.php
View File

@ -83,18 +83,18 @@ class FileValidator extends \yii\validators\FileValidator
public function validateFileName($model, $attribute)
{
if($model instanceof File) {
if ($model instanceof File) {
$pattern = Yii::$app->moduleManager->getModule('file')->fileNameValidationPattern;
if(empty($pattern)) {
if (empty($pattern)) {
return;
}
if(preg_match($pattern, $model->file_name)) {
if (preg_match($pattern, $model->file_name)) {
$this->addError($model, $attribute, Yii::t('FileModule.models_File', 'Invalid file name detected!'));
}
if($this->denyDoubleFileExtensions && preg_match('/\.\w{2,3}\.\w{2,3}$/', $model->file_name)) {
if ($this->denyDoubleFileExtensions && preg_match('/\.\w{2,3}\.\w{2,3}$/', $model->file_name)) {
$this->addError($model, $attribute, Yii::t('FileModule.models_File', 'Double file extensions are not allowed!'));
}
}
@ -123,4 +123,34 @@ class FileValidator extends \yii\validators\FileValidator
return null;
}
/**
* Checks if given uploaded file have correct type (extension) according current validator settings.
* @param UploadedFile $file
* @return bool
* @throws \yii\base\InvalidConfigException
*/
protected function validateExtension($file)
{
$extension = mb_strtolower($file->extension, 'UTF-8');
if (FileHelper::getMimeTypeByExtension('test.' . $extension) !== null && $this->checkExtensionByMimeType) {
$mimeType = FileHelper::getMimeType($file->tempName, null, false);
if ($mimeType === null) {
return false;
}
$extensionsByMimeType = FileHelper::getExtensionsByMimeType($mimeType);
if (!in_array($extension, $extensionsByMimeType, true)) {
return false;
}
}
if (!in_array($extension, $this->extensions, true)) {
return false;
}
return true;
}
}