262b974123
There were several issues:
1. With Google Cloud Storage, we can't override the Content-Type with
Response-Content-Type once it is set. Setting the value to
`application/octet-stream` doesn't buy us anything. GCS defaults to
`application/octet-stream`, and AWS uses `binary/octet-stream`. Just remove
this `Content-Type` when we upload new files.
2. CarrierWave and fog-google need to support query parameters:
https://github.com/fog/fog-google/pull/409/files, https://github.com/carrierwaveuploader/carrierwave/pull/2332/files.
CarrierWave has been monkey-patched until an official release.
3. Workhorse also needs to remove the Content-Type header in the request
(ef80978ff8/internal/objectstore/object.go (L66)
),
or we'll get a 403 error when uploading due to signed URLs not matching the headers.
Upgrading to Workhorse 6.1.0 for https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/297
will make Workhorse use the headers that are used by Rails.
Closes #49957
131 lines
3.8 KiB
Ruby
131 lines
3.8 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe SendFileUpload do
|
|
let(:uploader_class) do
|
|
Class.new(GitlabUploader) do
|
|
include ObjectStorage::Concern
|
|
|
|
storage_options Gitlab.config.uploads
|
|
|
|
private
|
|
|
|
# user/:id
|
|
def dynamic_segment
|
|
File.join(model.class.to_s.underscore, model.id.to_s)
|
|
end
|
|
end
|
|
end
|
|
|
|
let(:controller_class) do
|
|
Class.new do
|
|
include SendFileUpload
|
|
end
|
|
end
|
|
|
|
let(:object) { build_stubbed(:user) }
|
|
let(:uploader) { uploader_class.new(object, :file) }
|
|
|
|
describe '#send_upload' do
|
|
let(:controller) { controller_class.new }
|
|
let(:temp_file) { Tempfile.new('test') }
|
|
|
|
subject { controller.send_upload(uploader) }
|
|
|
|
before do
|
|
FileUtils.touch(temp_file)
|
|
end
|
|
|
|
after do
|
|
FileUtils.rm_f(temp_file)
|
|
end
|
|
|
|
context 'when local file is used' do
|
|
before do
|
|
uploader.store!(temp_file)
|
|
end
|
|
|
|
it 'sends a file' do
|
|
expect(controller).to receive(:send_file).with(uploader.path, anything)
|
|
|
|
subject
|
|
end
|
|
end
|
|
|
|
context 'with attachment' do
|
|
let(:send_attachment) { controller.send_upload(uploader, attachment: 'test.js') }
|
|
|
|
it 'sends a file with content-type of text/plain' do
|
|
expected_params = {
|
|
content_type: 'text/plain',
|
|
filename: 'test.js',
|
|
disposition: 'attachment'
|
|
}
|
|
expect(controller).to receive(:send_file).with(uploader.path, expected_params)
|
|
|
|
send_attachment
|
|
end
|
|
|
|
context 'with a proxied file in object storage' do
|
|
before do
|
|
stub_uploads_object_storage(uploader: uploader_class)
|
|
uploader.object_store = ObjectStorage::Store::REMOTE
|
|
uploader.store!(temp_file)
|
|
allow(Gitlab.config.uploads.object_store).to receive(:proxy_download) { true }
|
|
end
|
|
|
|
it 'sends a file with a custom type' do
|
|
headers = double
|
|
expected_headers = %r(response-content-disposition=attachment%3Bfilename%3D%22test.js%22&response-content-type=application/javascript)
|
|
expect(Gitlab::Workhorse).to receive(:send_url).with(expected_headers).and_call_original
|
|
expect(headers).to receive(:store).with(Gitlab::Workhorse::SEND_DATA_HEADER, /^send-url:/)
|
|
|
|
expect(controller).not_to receive(:send_file)
|
|
expect(controller).to receive(:headers) { headers }
|
|
expect(controller).to receive(:head).with(:ok)
|
|
|
|
send_attachment
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when remote file is used' do
|
|
before do
|
|
stub_uploads_object_storage(uploader: uploader_class)
|
|
uploader.object_store = ObjectStorage::Store::REMOTE
|
|
uploader.store!(temp_file)
|
|
end
|
|
|
|
context 'and proxying is enabled' do
|
|
before do
|
|
allow(Gitlab.config.uploads.object_store).to receive(:proxy_download) { true }
|
|
end
|
|
|
|
it 'sends a file' do
|
|
headers = double
|
|
expect(Gitlab::Workhorse).not_to receive(:send_url).with(/response-content-disposition/)
|
|
expect(Gitlab::Workhorse).not_to receive(:send_url).with(/response-content-type/)
|
|
expect(Gitlab::Workhorse).to receive(:send_url).and_call_original
|
|
|
|
expect(headers).to receive(:store).with(Gitlab::Workhorse::SEND_DATA_HEADER, /^send-url:/)
|
|
expect(controller).not_to receive(:send_file)
|
|
expect(controller).to receive(:headers) { headers }
|
|
expect(controller).to receive(:head).with(:ok)
|
|
|
|
subject
|
|
end
|
|
end
|
|
|
|
context 'and proxying is disabled' do
|
|
before do
|
|
allow(Gitlab.config.uploads.object_store).to receive(:proxy_download) { false }
|
|
end
|
|
|
|
it 'sends a file' do
|
|
expect(controller).to receive(:redirect_to).with(/#{uploader.path}/)
|
|
|
|
subject
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|