IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Handle storage providers not implementing ACLs (#13675)

Browse Source 
When secure media is enabled or when upload secure status
is updated, we also try and update the upload ACL. However
if the object storage provider does not implement this we
get an Aws::S3::Errors::NotImplemented error. This PR handles
this error so the update_secure_status method does not error
out and still returns whether the secure status changed.
This commit is contained in:
Martin Brennan
2021-07-09 11:31:44 +10:00
committed by GitHub
parent ec537e5ea2
commit 9f275c12ab
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/upload.rb
View File

@@ -361,7 +361,13 @@ class Upload < ActiveRecord::Base
secure_status_did_change = self.secure? != mark_secure
self.update(secure_params(mark_secure, reason, source))
Discourse.store.update_upload_ACL(self) if Discourse.store.external?
if Discourse.store.external?
begin
Discourse.store.update_upload_ACL(self)
rescue Aws::S3::Errors::NotImplemented => err
Discourse.warn_exception(err, message: "The file store object storage provider does not support setting ACLs")
end
end
secure_status_did_change
end