A platform for community discussion. Free, open, simple.
FIX: Don't require S3 ACLs to enable secure uploads (#40596)
Alan Guo Xiang Tanb5773b93b83c
diff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex c22768b4442..a017915d0ee 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -364,7 +364,7 @@ en:page_publishing_requirements: "Page publishing cannot be enabled if secure uploads is enabled."s3_backup_requires_s3_settings: "You cannot use S3 as backup location unless you've provided the '%{setting_name}'."s3_bucket_reused: "You cannot use the same bucket for 's3_upload_bucket' and 's3_backup_bucket'. Choose a different bucket or use a different path for each bucket."- secure_uploads_requirements: "S3 uploads and S3 ACLs must be enabled before enabling secure uploads."+ secure_uploads_requirements: "S3 uploads must be enabled before enabling secure uploads."share_quote_facebook_requirements: "You must set a Facebook app id to enable quote sharing for Facebook."second_factor_cannot_be_enforced_with_disabled_local_login: "You cannot enforce 2FA if local logins are disabled."second_factor_cannot_be_enforced_with_discourse_connect_enabled: "You cannot enforce 2FA if DiscourseConnect is enabled."diff --git a/lib/site_settings/validations.rb b/lib/site_settings/validations.rbindex 143b96b012c..c0278a19cf1 100644--- a/lib/site_settings/validations.rb+++ b/lib/site_settings/validations.rb@@ -168,7 +168,7 @@ module SiteSettings::Validationsenddef validate_secure_uploads(new_val)- if new_val == "t" && (!SiteSetting.Upload.enable_s3_uploads || !SiteSetting.s3_use_acls)+ if new_val == "t" && !SiteSetting.Upload.enable_s3_uploadsvalidate_error :secure_uploads_requirementsendenddiff --git a/spec/lib/site_settings/validations_spec.rb b/spec/lib/site_settings/validations_spec.rbindex d40967cfb1f..91a583d42d2 100644--- a/spec/lib/site_settings/validations_spec.rb+++ b/spec/lib/site_settings/validations_spec.rb@@ -248,46 +248,34 @@ RSpec.describe SiteSettings::Validations doenddescribe "#validate_secure_uploads" do- let(:error_message) { I18n.t("errors.site_settings.secure_uploads_requirements") }-- context "when the new secure uploads value is true" do- context "if site setting for enable_s3_uploads is enabled" do- before { SiteSetting.enable_s3_uploads = true }+ it "allows enabling with ACLs and access control tags disabled" do+ SiteSetting.enable_s3_uploads = true+ SiteSetting.s3_use_acls = false+ SiteSetting.s3_enable_access_control_tags = false- it "should be ok" do- expect { validations.validate_secure_uploads("t") }.not_to raise_error- end- end+ expect { validations.validate_secure_uploads("t") }.not_to raise_error+ end- context "if site setting for enable_s3_uploads is not enabled" do- before { SiteSetting.enable_s3_uploads = false }+ it "raises when S3 uploads are disabled" do+ SiteSetting.enable_s3_uploads = false- it "is not ok" do- expect { validations.validate_secure_uploads("t") }.to raise_error(- Discourse::InvalidParameters,- error_message,- )- end+ expect { validations.validate_secure_uploads("t") }.to raise_error(+ Discourse::InvalidParameters,+ "S3 uploads must be enabled before enabling secure uploads.",+ )+ end- context "if global s3 setting is enabled" do- before { GlobalSetting.stubs(:use_s3?).returns(true) }+ it "allows enabling when S3 uploads are enabled globally" do+ SiteSetting.enable_s3_uploads = false+ GlobalSetting.stubs(:use_s3?).returns(true)- it "should be ok" do- expect { validations.validate_secure_uploads("t") }.not_to raise_error- end- end- end+ expect { validations.validate_secure_uploads("t") }.not_to raise_error+ end- context "if site setting for s3_use_acls is not enabled" do- before { SiteSetting.s3_use_acls = false }+ it "allows disabling when S3 uploads are disabled" do+ SiteSetting.enable_s3_uploads = false- it "is not ok" do- expect { validations.validate_secure_uploads("t") }.to raise_error(- Discourse::InvalidParameters,- error_message,- )- end- end+ expect { validations.validate_secure_uploads("f") }.not_to raise_errorendend