676afb15ba
* fix: give each chunked upload attempt a unique server-side identifier
The upload session identifier was derived only from user+filename+size
(ChunkedAssetReceiver::receive), with no per-attempt nonce. Two genuinely
concurrent attempts of the same file (e.g. closing and reopening the media
picker mid-upload, then re-uploading the same file) collided on the same
Redis cache key / temp file, producing RuntimeException("Chunked cloud
upload session expired or missing.") on the multipart/cloud path and
silent byte corruption on the local-assemble path.
The frontend now mints a UUID per upload attempt (X-Upload-Id header) that
gets folded into the identifier. Falls back to the old formula when the
header is absent, so any already-loaded frontend bundle keeps working.
Also guards the media picker's dropzone against re-triggering an upload
while one is in flight, and aborts the in-flight fetch when the dialog
unmounts mid-upload.
Fixes Nightwatch issue #23.
* fix: explicitly type upload_id when passing to receive()
Matches the existing explicit (int) casts on the sibling validated()
calls in the same method — validated() returns mixed, so this keeps
the nullable-string contract explicit instead of relying on an
implicit runtime type.
* style: inline the upload_id null-safe cast
Drop the intermediate variable so all receive() arguments read as a
single expression each, matching the sibling validated() casts.
* fix: require X-Upload-Id instead of falling back to the legacy identifier
Nullable upload_id only preserved the old (collision-prone) formula for
clients that omit the header — it didn't actually protect them. Making it
required closes that gap outright: a request without the header now fails
loud (422) instead of silently falling back to the vulnerable identifier.
ChunkedAssetReceiver::receive() now takes a required $attemptId. Updated
every existing test hitting app.assets.store-chunked (ChunkedCloudUploadTest,
ChunkedAssetReceiverTest, ChunkedUploadFilenameEncodingTest, AssetControllerTest)
to send a real upload id, and added a regression test asserting the endpoint
rejects a request with no X-Upload-Id header.
* fix: localize hardcoded workspace name validation messages
StoreWorkspaceRequest had its custom messages() hardcoded in pt-BR
regardless of the user's locale; UpdateWorkspaceRequest had the same
bug hardcoded in English. Both now go through __('validation.required'
/ 'validation.max.string') with the already-localized
workspaces.create.name attribute label (present in all 16 lang/
directories), matching the pattern already used by
StoreWorkspaceInviteRequest.
Unrelated to the chunked upload fix, but caught while reviewing this
file's messages() convention.
* simplify: drop messages() override on workspace name validation
Laravel already localizes the generic required/max messages from
lang/{locale}/validation.php automatically — no need to hand-roll
messages() for standard rules with no custom copy.
* fix: localize StoreChunkedAssetRequest validation messages
Drop the hardcoded English messages for required/ends_with rules —
Laravel's own localized validation.php messages already cover them
adequately (ends_with's generic message is actually more useful, since
it lists the accepted extensions). total_size.max still needs a custom
message (the rule is in raw bytes, unreadable without MB conversion),
so it now goes through __('assets.upload.file_too_large') with the key
added to all 16 lang/ locales.
Also fixed test flakiness discovered while touching this file:
ChunkedCloudUploadTest used random_bytes() for the first mp4 chunk,
which occasionally collides with an unrelated magic number (MZ/PE,
SIMH tape, ...) and makes finfo misdetect the mime type. Replaced with
real mp4 header bytes padded with nulls, so detection is deterministic.
* fix: address final code review findings
- ChunkedAssetReceiver: use double-quoted interpolation instead of
concatenation for the identifier hash, per project convention.
- AssetControllerTest: two chunked-upload rejection tests didn't send
X-Upload-Id, so their 422 assertions could pass for the wrong reason
(upload_id.required) instead of the field they claim to cover. Added
the header and asserted the specific validation error field.
- GalleryBrowser: centralize the upload-in-progress guard as a single
check at the top of uploadFiles() instead of three separate checks
at each entry point (click/select/drop) — matches the single-source-
of-truth pattern already used in PhotoUpload.vue.
- GalleryBrowser: show a toast when an in-flight upload is aborted
(dialog closed mid-upload) instead of silently discarding it with no
feedback. New assets.upload.cancelled key added to all 16 lang/
locales.
54 lines
2.1 KiB
PHP
54 lines
2.1 KiB
PHP
<?php
|
|
|
|
return [
|
|
'title' => 'アセット',
|
|
|
|
'tabs' => [
|
|
'my_uploads' => 'アップロード済み',
|
|
'stock_photos' => 'ストックフォト',
|
|
'gifs' => 'GIF',
|
|
],
|
|
|
|
'upload' => [
|
|
'drag_drop' => 'ここにファイルをドラッグ＆ドロップするか、クリックして選択してください',
|
|
'formats' => 'JPEG、PNG、GIF、WebP、MP4、PDF',
|
|
'uploading' => 'アップロード中...',
|
|
'failed' => ':file をアップロードできませんでした。もう一度お試しください。',
|
|
'file_too_large' => 'ファイルサイズが許容される最大値(:max MB)を超えています。',
|
|
'cancelled' => 'アップロードをキャンセルしました。',
|
|
],
|
|
|
|
'empty' => [
|
|
'title' => 'アセットがまだありません',
|
|
'description' => '画像や動画をアップロードして、メディアライブラリを作成しましょう。',
|
|
],
|
|
|
|
'save_to_assets' => 'アセットに保存',
|
|
'saved' => 'アセットに保存しました！',
|
|
'create_post' => '投稿を作成',
|
|
'add_to_post' => '投稿に追加',
|
|
'search_placeholder' => 'メディアを検索...',
|
|
|
|
'delete' => [
|
|
'title' => 'アセットを削除',
|
|
'description' => 'このアセットを削除してもよろしいですか？この操作は取り消せません。',
|
|
'confirm' => '削除',
|
|
'cancel' => 'キャンセル',
|
|
],
|
|
|
|
'unsplash' => [
|
|
'search_placeholder' => '無料の写真を検索...',
|
|
'no_results' => '写真が見つかりません',
|
|
'no_results_description' => '別のキーワードで検索してみてください。',
|
|
'trending' => 'Unsplash の人気',
|
|
'start_searching' => 'Unsplash の無料ストックフォトを検索',
|
|
],
|
|
|
|
'giphy' => [
|
|
'trending' => 'Giphy の人気',
|
|
'search_placeholder' => 'GIF を検索...',
|
|
'no_results' => 'GIF が見つかりません',
|
|
'no_results_description' => '別のキーワードで検索してみてください。',
|
|
'powered_by' => 'Powered by GIPHY',
|
|
],
|
|
];
|