about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-03-27 17:07:37 +0200
committerGitHub <noreply@github.com>2023-03-27 17:07:37 +0200
commite084b5b82da703dac3ade7480286e847c5c1c2cd (patch)
tree24864f286a8ac574fa32574ec558681f297676d3 /app/controllers
parentddb769f0b84d4bcff22472f236a4ec74c631d0a6 (diff)
Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support (#24200)
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/backups_controller.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/backups_controller.rb b/app/controllers/backups_controller.rb
index 2f4b400b8..0687b62c5 100644
--- a/app/controllers/backups_controller.rb
+++ b/app/controllers/backups_controller.rb
@@ -13,7 +13,11 @@ class BackupsController < ApplicationController
     when :s3
       redirect_to @backup.dump.expiring_url(10)
     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
       redirect_to full_asset_url(@backup.dump.url)
     end