paravielfalt/mastodon
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Activity Actions

Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support (#24200)

Browse source
This commit is contained in:
Claire 2023-03-27 17:07:37 +02:00
parent f75fba0531
commit aa37eeadf3
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/backups_controller.rb
View file

@ -13,7 +13,11 @@ class BackupsController < ApplicationController
when :s3 when :s3
redirect_to @backup.dump.expiring_url(10) redirect_to @backup.dump.expiring_url(10)
when :fog when :fog
redirect_to @backup.dump.expiring_url(Time.now.utc + 10) if Paperclip::Attachment.default_options.dig(:storage, :fog_credentials, :openstack_temp_url_key).present?
redirect_to @backup.dump.expiring_url(Time.now.utc + 10)
else
redirect_to full_asset_url(@backup.dump.url)
end
when :filesystem when :filesystem
redirect_to full_asset_url(@backup.dump.url) redirect_to full_asset_url(@backup.dump.url)
end end

2
app/models/backup.rb
View file

@ -17,6 +17,6 @@
class Backup < ApplicationRecord class Backup < ApplicationRecord
belongs_to :user, inverse_of: :backups belongs_to :user, inverse_of: :backups
has_attached_file :dump, s3_permissions: 'private' has_attached_file :dump, s3_permissions: ->(*) { ENV['S3_PERMISSION'] == '' ? nil : 'private' }
do_not_validate_attachment_file_type :dump do_not_validate_attachment_file_type :dump
end end

1
config/initializers/paperclip.rb
View file

@ -124,6 +124,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
openstack_domain_name: ENV.fetch('SWIFT_DOMAIN_NAME') { 'default' }, openstack_domain_name: ENV.fetch('SWIFT_DOMAIN_NAME') { 'default' },
openstack_region: ENV['SWIFT_REGION'], openstack_region: ENV['SWIFT_REGION'],
openstack_cache_ttl: ENV.fetch('SWIFT_CACHE_TTL') { 60 }, openstack_cache_ttl: ENV.fetch('SWIFT_CACHE_TTL') { 60 },
openstack_temp_url_key: ENV['SWIFT_TEMP_URL_KEY'],
}, },
fog_file: { 'Cache-Control' => 'public, max-age=315576000, immutable' }, fog_file: { 'Cache-Control' => 'public, max-age=315576000, immutable' },