Merge branch 'develop' into trunk
This commit is contained in:
commit
46e9a873ab
2 changed files with 25 additions and 7 deletions
|
|
@ -6,6 +6,7 @@ namespace App\Http\Middleware;
|
|||
|
||||
use App\Lib\Helpers\ToolboxHelper;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Mews\Purifier\Purifier;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
|
|
@ -25,7 +26,8 @@ class HtmlSanitizer
|
|||
public function handle(Request $request, \Closure $next, string ...$params): Response
|
||||
{
|
||||
$inputs = $request->all();
|
||||
\array_walk($inputs, function (null | string | array &$input, string $name) use ($params): void {
|
||||
|
||||
\array_walk($inputs, function (null | string | array | UploadedFile &$input, string $name) use ($params): void {
|
||||
$this->cleanInput($input, $name, null, $params);
|
||||
});
|
||||
$request->merge($inputs);
|
||||
|
|
@ -34,13 +36,17 @@ class HtmlSanitizer
|
|||
}
|
||||
|
||||
/**
|
||||
* @param null|string|array<string,mixed> $input
|
||||
* @param null|string|array<string,mixed>|\Illuminate\Http\UploadedFile $input
|
||||
* @param string[] $params
|
||||
*/
|
||||
private function cleanInput(null | string | array &$input, string $name, ?string $rootName, array $params): void
|
||||
{
|
||||
private function cleanInput(
|
||||
null | string | array | UploadedFile &$input,
|
||||
string $name,
|
||||
?string $rootName,
|
||||
array $params
|
||||
): void {
|
||||
if (is_array($input)) {
|
||||
array_walk_recursive($input, function (null | string | array &$nestedInput, string $nestedName) use ($name, $params): void {
|
||||
array_walk_recursive($input, function (null | string | array | UploadedFile &$nestedInput, string $nestedName) use ($name, $params): void {
|
||||
$this->cleanInput($nestedInput, $nestedName, $name, $params);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ use Domain\Models\ValueObjects\AttachedFile;
|
|||
use Domain\Models\ValueObjects\ContactFormData;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class ContactFormRequest extends FormRequest
|
||||
{
|
||||
|
|
@ -17,11 +18,22 @@ class ContactFormRequest extends FormRequest
|
|||
return [
|
||||
'last_name' => ['required', 'string', 'min:2'],
|
||||
'first_name' => ['required', 'string', 'min:2'],
|
||||
'email' => ['required', 'email:rfc,dns,spoof'],
|
||||
'email' => [
|
||||
'required',
|
||||
Rule::email()
|
||||
->rfcCompliant()
|
||||
->preventSpoofing()
|
||||
->validateMxRecord(),
|
||||
],
|
||||
'subject' => ['required', 'string', 'min:2'],
|
||||
'order_ref' => ['nullable', 'string', 'regex:/^[0-9]+$/'],
|
||||
'message' => ['required', 'string', 'min:20', 'max:1900'],
|
||||
'file' => ['nullable', 'file', 'mimes:jpg,jpeg,png,pdf', 'max:5120'],
|
||||
'file' => [
|
||||
'nullable',
|
||||
Rule::file()
|
||||
->max(5120)
|
||||
->types(['jpg', 'jpeg', 'png', 'pdf']),
|
||||
],
|
||||
'ok_cgv' => ['accepted'],
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue