mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M3 Integration fixes pass 27

Browse Source
This commit is contained in:
Mark Gregory
2026-09-22 16:13:47 +01:00
parent 14fca2c548
commit c5af9eb128
2 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Documentation/Http/Requests/StoreDocumentationDocumentRequest.php
+25 -4
View File
@@ -3,11 +3,14 @@
namespace Modules\Documentation\Http\Requests; namespace Modules\Documentation\Http\Requests;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Http\UploadedFile;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use Modules\Documentation\Models\DocumentationDocument; use Modules\Documentation\Models\DocumentationDocument;
class StoreDocumentationDocumentRequest extends FormRequest class StoreDocumentationDocumentRequest extends FormRequest
{ {
private const MAX_UPLOAD_BYTES = 1_048_576;
/** /**
* Determine whether the user is authorized to make this request. * Determine whether the user is authorized to make this request.
*/ */
@@ -23,8 +26,6 @@ class StoreDocumentationDocumentRequest extends FormRequest
*/ */
public function rules(): array public function rules(): array
{ {
$maxUploadKb = 1024;
return [ return [
'documentation_category_id' => ['nullable', 'integer', 'exists:documentation_categories,id'], 'documentation_category_id' => ['nullable', 'integer', 'exists:documentation_categories,id'],
'title' => ['required', 'string', 'max:220'], 'title' => ['required', 'string', 'max:220'],
@@ -35,9 +36,29 @@ class StoreDocumentationDocumentRequest extends FormRequest
'is_featured' => ['nullable', 'boolean'], 'is_featured' => ['nullable', 'boolean'],
'version' => ['required', 'string', 'max:50'], 'version' => ['required', 'string', 'max:50'],
'reference' => ['nullable', 'string', 'max:100'], 'reference' => ['nullable', 'string', 'max:100'],
'attachment' => ['nullable', 'file', 'max:' . $maxUploadKb, 'mimes:' . implode(',', config('documentation.allowed_upload_mimes', []))], 'attachment' => ['nullable', 'file', $this->uploadSizeRule(), 'mimes:' . implode(',', config('documentation.allowed_upload_mimes', []))],
'attachments' => ['nullable', 'array'], 'attachments' => ['nullable', 'array'],
'attachments.*' => ['file', 'max:' . $maxUploadKb, 'mimes:' . implode(',', config('documentation.allowed_upload_mimes', []))], 'attachments.*' => ['file', $this->uploadSizeRule(), 'mimes:' . implode(',', config('documentation.allowed_upload_mimes', []))],
]; ];
} }
/**
* Enforce the upload ceiling in bytes instead of relying on Laravel's
* file `max` rule, keeping the security boundary explicit.
*
* @return \Closure(string, mixed, \Closure(string): void): void
*/
private function uploadSizeRule(): \Closure
{
return static function (string $attribute, mixed $value, \Closure $fail): void {
if (! $value instanceof UploadedFile || ! $value->isValid()) {
return;
}
$size = $value->getSize();
if ($size === false || $size > self::MAX_UPLOAD_BYTES) {
$fail(sprintf('The %s must not be larger than 1 MB.', $attribute));
}
};
}
} }
Modules/Documentation/Http/Requests/UpdateDocumentationDocumentRequest.php
+25 -4
View File
@@ -3,11 +3,14 @@
namespace Modules\Documentation\Http\Requests; namespace Modules\Documentation\Http\Requests;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Http\UploadedFile;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use Modules\Documentation\Models\DocumentationDocument; use Modules\Documentation\Models\DocumentationDocument;
class UpdateDocumentationDocumentRequest extends FormRequest class UpdateDocumentationDocumentRequest extends FormRequest
{ {
private const MAX_UPLOAD_BYTES = 1_048_576;
/** /**
* Determine whether the user is authorized to make this request. * Determine whether the user is authorized to make this request.
*/ */
@@ -23,8 +26,6 @@ class UpdateDocumentationDocumentRequest extends FormRequest
*/ */
public function rules(): array public function rules(): array
{ {
$maxUploadKb = 1024;
/** @var DocumentationDocument|null $document */ /** @var DocumentationDocument|null $document */
$document = $this->route('document'); $document = $this->route('document');
@@ -38,10 +39,30 @@ class UpdateDocumentationDocumentRequest extends FormRequest
'is_featured' => ['nullable', 'boolean'], 'is_featured' => ['nullable', 'boolean'],
'version' => ['required', 'string', 'max:50'], 'version' => ['required', 'string', 'max:50'],
'reference' => ['nullable', 'string', 'max:100'], 'reference' => ['nullable', 'string', 'max:100'],
'attachment' => ['nullable', 'file', 'max:' . $maxUploadKb, 'mimes:' . implode(',', config('documentation.allowed_upload_mimes', []))], 'attachment' => ['nullable', 'file', $this->uploadSizeRule(), 'mimes:' . implode(',', config('documentation.allowed_upload_mimes', []))],
'attachments' => ['nullable', 'array'], 'attachments' => ['nullable', 'array'],
'attachments.*' => ['file', 'max:' . $maxUploadKb, 'mimes:' . implode(',', config('documentation.allowed_upload_mimes', []))], 'attachments.*' => ['file', $this->uploadSizeRule(), 'mimes:' . implode(',', config('documentation.allowed_upload_mimes', []))],
'remove_attachment' => ['nullable', 'boolean'], 'remove_attachment' => ['nullable', 'boolean'],
]; ];
} }
/**
* Enforce the upload ceiling in bytes instead of relying on Laravel's
* file `max` rule, keeping the security boundary explicit.
*
* @return \Closure(string, mixed, \Closure(string): void): void
*/
private function uploadSizeRule(): \Closure
{
return static function (string $attribute, mixed $value, \Closure $fail): void {
if (! $value instanceof UploadedFile || ! $value->isValid()) {
return;
}
$size = $value->getSize();
if ($size === false || $size > self::MAX_UPLOAD_BYTES) {
$fail(sprintf('The %s must not be larger than 1 MB.', $attribute));
}
};
}
} }