mirror of
https://github.com/discourse/discourse.git
synced 2024-11-29 20:24:05 -06:00
d295a16dab
This pull request introduces the endpoints required, and the JavaScript functionality in the `ComposerUppyUpload` mixin, for direct S3 multipart uploads. There are four new endpoints in the uploads controller:
* `create-multipart.json` - Creates the multipart upload in S3 along with an `ExternalUploadStub` record, storing information about the file in the same way as `generate-presigned-put.json` does for regular direct S3 uploads
* `batch-presign-multipart-parts.json` - Takes a list of part numbers and the unique identifier for an `ExternalUploadStub` record, and generates the presigned URLs for those parts if the multipart upload still exists and if the user has permission to access that upload
* `complete-multipart.json` - Completes the multipart upload in S3. Needs the full list of part numbers and their associated ETags which are returned when the part is uploaded to the presigned URL above. Only works if the user has permission to access the associated `ExternalUploadStub` record and the multipart upload still exists.
After we confirm the upload is complete in S3, we go through the regular `UploadCreator` flow, the same as `complete-external-upload.json`, and promote the temporary upload S3 into a full `Upload` record, moving it to its final destination.
* `abort-multipart.json` - Aborts the multipart upload on S3 and destroys the `ExternalUploadStub` record if the user has permission to access that upload.
Also added are a few new columns to `ExternalUploadStub`:
* multipart - Whether or not this is a multipart upload
* external_upload_identifier - The "upload ID" for an S3 multipart upload
* filesize - The size of the file when the `create-multipart.json` or `generate-presigned-put.json` is called. This is used for validation.
When the user completes a direct S3 upload, either regular or multipart, we take the `filesize` that was captured when the `ExternalUploadStub` was first created and compare it with the final `Content-Length` size of the file where it is stored in S3. Then, if the two do not match, we throw an error, delete the file on S3, and ban the user from uploading files for N (default 5) minutes. This would only happen if the user uploads a different file than what they first specified, or in the case of multipart uploads uploaded larger chunks than needed. This is done to prevent abuse of S3 storage by bad actors.
Also included in this PR is an update to vendor/uppy.js. This has been built locally from the latest uppy source at d613b849a6. This must be done so that I can get my multipart upload changes into Discourse. When the Uppy team cuts a proper release, we can bump the package.json versions instead.
23 lines
629 B
Ruby
23 lines
629 B
Ruby
# frozen_string_literal: true
|
|
|
|
Fabricator(:external_upload_stub) do
|
|
created_by { Fabricate(:user) }
|
|
original_filename "test.txt"
|
|
key { Discourse.store.temporary_upload_path("test.txt") }
|
|
upload_type "card_background"
|
|
filesize 1024
|
|
status 1
|
|
end
|
|
|
|
Fabricator(:image_external_upload_stub, from: :external_upload_stub) do
|
|
original_filename "logo.png"
|
|
filesize 1024
|
|
key { Discourse.store.temporary_upload_path("logo.png") }
|
|
end
|
|
|
|
Fabricator(:attachment_external_upload_stub, from: :external_upload_stub) do
|
|
original_filename "file.pdf"
|
|
filesize 1024
|
|
key { Discourse.store.temporary_upload_path("file.pdf") }
|
|
end
|