DisabledMimetypes.php validation rule fix

This commit is contained in:
Peter Papp
2021-04-11 10:46:07 +02:00
parent 1568eab905
commit 3e18dbd4f9
6 changed files with 45 additions and 57 deletions
@@ -2,9 +2,8 @@
namespace App\Http\Requests\FileFunctions;
use App\Rules\MimetypeBlacklistValidation;
use App\Rules\DisabledMimetypes;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class UploadRequest extends FormRequest
{
@@ -27,7 +26,7 @@ class UploadRequest extends FormRequest
{
return [
'folder_id' => 'nullable|uuid',
'file' => ['required', 'file', new MimetypeBlacklistValidation]
'file' => ['required', 'file', new DisabledMimetypes]
];
}
}
@@ -3,18 +3,8 @@
namespace App\Rules;
use Illuminate\Contracts\Validation\Rule;
class MimetypeBlacklistValidation implements Rule
class DisabledMimetypes implements Rule
{
/**
* Create a new rule instance.
*
* @return void
*/
public function __construct()
{
//
}
/**
* Determine if the validation rule passes.
*
@@ -24,10 +14,10 @@ class MimetypeBlacklistValidation implements Rule
*/
public function passes($attribute, $value)
{
$mimetype_blacklist = explode(',' ,get_setting('mimetypes_blacklist'));
$mimetype_blacklist = explode(',', get_setting('mimetypes_blacklist'));
$file_mimetype = explode('/' ,$value->getMimeType());
return !array_intersect($file_mimetype , $mimetype_blacklist);
return ! array_intersect($file_mimetype, $mimetype_blacklist);
}
/**
@@ -37,6 +27,6 @@ class MimetypeBlacklistValidation implements Rule
*/
public function message()
{
abort (415,'Type of this mime type is not allowed.');
return 'Type of this mime type is not allowed.';
}
}