From d773490e8a9daad49a194c4102a61cabe70067ac Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Dec 2022 17:55:17 +0100
Subject: [PATCH] Fix suspension worker crashing on S3-compatible setups
without ACL support (#22487)
---
app/services/suspend_account_service.rb | 5 +++++
app/services/unsuspend_account_service.rb | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index b8dc8d5e09..6856c2c515 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -76,10 +76,15 @@ class SuspendAccountService < BaseService
styles.each do |style|
case Paperclip::Attachment.default_options[:storage]
when :s3
+ # Prevent useless S3 calls if ACLs are disabled
+ next if ENV['S3_PERMISSION'] == ''
+
begin
attachment.s3_object(style).acl.put(acl: 'private')
rescue Aws::S3::Errors::NoSuchKey
Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}"
+ rescue Aws::S3::Errors::NotImplemented => e
+ Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}"
end
when :fog
# Not supported
diff --git a/app/services/unsuspend_account_service.rb b/app/services/unsuspend_account_service.rb
index 39d8a6ba7f..534203dce1 100644
--- a/app/services/unsuspend_account_service.rb
+++ b/app/services/unsuspend_account_service.rb
@@ -73,10 +73,15 @@ class UnsuspendAccountService < BaseService
styles.each do |style|
case Paperclip::Attachment.default_options[:storage]
when :s3
+ # Prevent useless S3 calls if ACLs are disabled
+ next if ENV['S3_PERMISSION'] == ''
+
begin
attachment.s3_object(style).acl.put(acl: Paperclip::Attachment.default_options[:s3_permissions])
rescue Aws::S3::Errors::NoSuchKey
Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}"
+ rescue Aws::S3::Errors::NotImplemented => e
+ Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}"
end
when :fog
# Not supported