Change user backups to use expiring URLs for download when possible (#24136)

main^2
Eugen Rochko 2 years ago committed by GitHub
parent edc7ca5920
commit 75e5a6e437
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,27 @@
# frozen_string_literal: true
class BackupsController < ApplicationController
include RoutingHelper
skip_before_action :require_functional!
before_action :authenticate_user!
before_action :set_backup
def download
case Paperclip::Attachment.default_options[:storage]
when :s3
redirect_to @backup.dump.expiring_url(10)
when :fog
redirect_to @backup.dump.expiring_url(Time.now.utc + 10)
when :filesystem
redirect_to full_asset_url(@backup.dump.url)
end
end
private
def set_backup
@backup = current_user.backups.find(params[:id])
end
end

@ -18,6 +18,6 @@
class Backup < ApplicationRecord class Backup < ApplicationRecord
belongs_to :user, inverse_of: :backups belongs_to :user, inverse_of: :backups
has_attached_file :dump has_attached_file :dump, s3_permissions: 'private'
validates_attachment_content_type :dump, content_type: /\Aapplication/ validates_attachment_content_type :dump, content_type: /\Aapplication/
end end

@ -64,6 +64,6 @@
%td= l backup.created_at %td= l backup.created_at
- if backup.processed? - if backup.processed?
%td= number_to_human_size backup.dump_file_size %td= number_to_human_size backup.dump_file_size
%td= table_link_to 'download', t('exports.archive_takeout.download'), backup.dump.url %td= table_link_to 'download', t('exports.archive_takeout.download'), download_backup_url(backup)
- else - else
%td{ colspan: 2 }= t('exports.archive_takeout.in_progress') %td{ colspan: 2 }= t('exports.archive_takeout.in_progress')

@ -55,5 +55,5 @@
%tbody %tbody
%tr %tr
%td.button-primary %td.button-primary
= link_to full_asset_url(@backup.dump.url) do = link_to download_backup_url(@backup) do
%span= t 'exports.archive_takeout.download' %span= t 'exports.archive_takeout.download'

@ -4,4 +4,4 @@
<%= t 'user_mailer.backup_ready.explanation' %> <%= t 'user_mailer.backup_ready.explanation' %>
=> <%= full_asset_url(@backup.dump.url) %> => <%= download_backup_url(@backup) %>

@ -220,6 +220,7 @@ Rails.application.routes.draw do
resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update] resource :statuses_cleanup, controller: :statuses_cleanup, only: [:show, :update]
get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy, format: false get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy, format: false
get '/backups/:id/download', to: 'backups#download', as: :download_backup, format: false
resource :authorize_interaction, only: [:show, :create] resource :authorize_interaction, only: [:show, :create]
resource :share, only: [:show, :create] resource :share, only: [:show, :create]

Loading…
Cancel
Save