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
29 lines
1.2 KiB
Ruby
29 lines
1.2 KiB
Ruby
# This monkey patches CarrierWave 1.2.3 to make Google Cloud Storage work with
|
|
# extra query parameters:
|
|
# https://github.com/carrierwaveuploader/carrierwave/pull/2332/files
|
|
module CarrierWave
|
|
module Storage
|
|
class Fog < Abstract
|
|
class File
|
|
def authenticated_url(options = {})
|
|
if %w(AWS Google Rackspace OpenStack).include?(@uploader.fog_credentials[:provider])
|
|
# avoid a get by using local references
|
|
local_directory = connection.directories.new(key: @uploader.fog_directory)
|
|
local_file = local_directory.files.new(key: path)
|
|
expire_at = ::Fog::Time.now + @uploader.fog_authenticated_url_expiration
|
|
case @uploader.fog_credentials[:provider]
|
|
when 'AWS', 'Google'
|
|
local_file.url(expire_at, options)
|
|
when 'Rackspace'
|
|
connection.get_object_https_url(@uploader.fog_directory, path, expire_at, options)
|
|
when 'OpenStack'
|
|
connection.get_object_https_url(@uploader.fog_directory, path, expire_at)
|
|
else
|
|
local_file.url(expire_at)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|