#{I18n.t("emails.secure_media_placeholder")}
" - a.remove - end - end + # strip again, this can be done at a lower level like in the user + # notification template but that may not catch everything + PrettyText.strip_secure_media(@fragment) - @fragment.search('img[src]').each do |img| - if Upload.secure_media_url?(img['src']) - img.add_next_sibling "#{I18n.t("emails.secure_media_placeholder")}
" - img.remove - end - end + style('div.secure-media-notice', 'border: 5px solid #e9e9e9; padding: 5px; display: inline-block;') + style('div.secure-media-notice a', "color: #{SiteSetting.email_link_color}") end def correct_first_body_margin diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 46e3bc58c7e..743b28d351c 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -408,9 +408,25 @@ module PrettyText doc.css("a[href]").each do |a| if Upload.secure_media_url?(a["href"]) target = %w(video audio).include?(a&.parent&.name) ? a.parent : a - target.replace "#{I18n.t("emails.secure_media_placeholder")}
" + next if target.to_s.include?("stripped-secure-view-media") + target.add_next_sibling secure_media_placeholder(doc, a['href']) + target.remove end end + doc.css('img[src]').each do |img| + if Upload.secure_media_url?(img['src']) + img.add_next_sibling secure_media_placeholder(doc, img['src']) + img.remove + end + end + end + + def self.secure_media_placeholder(doc, url) + <<~HTML +
+ #{I18n.t('emails.secure_media_placeholder')} #{I18n.t("emails.view_redacted_media")}.
+
+ HTML
end
def self.format_for_email(html, post = nil)
diff --git a/spec/components/email/sender_spec.rb b/spec/components/email/sender_spec.rb
index 26d4dcffbe9..7525171eb1b 100644
--- a/spec/components/email/sender_spec.rb
+++ b/spec/components/email/sender_spec.rb
@@ -404,6 +404,87 @@ describe Email::Sender do
.to contain_exactly(*[small_pdf, large_pdf, csv_file].map(&:original_filename))
end
+ context "when secure media enabled" do
+ def enable_s3_uploads
+ SiteSetting.enable_s3_uploads = true
+ SiteSetting.s3_upload_bucket = "s3-upload-bucket"
+ SiteSetting.s3_access_key_id = "some key"
+ SiteSetting.s3_secret_access_key = "some secrets3_region key"
+ stub_request(:head, "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/")
+ stub_request(
+ :put,
+ "https://#{SiteSetting.s3_upload_bucket}.s3.amazonaws.com/original/1X/#{image.sha1}.#{image.extension}?acl"
+ )
+ store = FileStore::S3Store.new
+ s3_helper = store.instance_variable_get(:@s3_helper)
+ client = Aws::S3::Client.new(stub_responses: true)
+ s3_helper.stubs(:s3_client).returns(client)
+ Discourse.stubs(:store).returns(store)
+ end
+
+ before do
+ enable_s3_uploads
+ SiteSetting.secure_media = true
+ SiteSetting.login_required = true
+ SiteSetting.email_total_attachment_size_limit_kb = 14_000
+ SiteSetting.secure_media_max_email_embed_image_size_kb = 5_000
+
+ Jobs.run_immediately!
+ Jobs::PullHotlinkedImages.any_instance.expects(:execute)
+ FileStore::S3Store.any_instance.expects(:has_been_uploaded?).returns(true).at_least_once
+ CookedPostProcessor.any_instance.stubs(:get_size).returns([244, 66])
+
+ @secure_image = UploadCreator.new(file_from_fixtures("logo.png", "images"), "logo.png")
+ .create_for(Discourse.system_user.id)
+ @secure_image.update_secure_status(secure_override_value: true)
+ @secure_image.update(access_control_post_id: reply.id)
+ reply.update(raw: reply.raw + "\n" + "#{UploadMarkdown.new(@secure_image).image_markdown}")
+ reply.rebake!
+ end
+
+ it "does not attach images when embedding them is not allowed" do
+ Email::Sender.new(message, :valid_type).send
+ expect(message.attachments.length).to eq(3)
+ end
+
+ context "when embedding secure images in email is allowed" do
+ before do
+ SiteSetting.secure_media_allow_embed_images_in_emails = true
+ end
+
+ it "does not attach images that are not marked as secure" do
+ Email::Sender.new(message, :valid_type).send
+ expect(message.attachments.length).to eq(4)
+ end
+
+ it "does not embed images that are too big" do
+ SiteSetting.secure_media_max_email_embed_image_size_kb = 1
+ Email::Sender.new(message, :valid_type).send
+ expect(message.attachments.length).to eq(3)
+ end
+
+ it "uses the email styles to inline secure images and attaches the secure image upload to the email" do
+ Email::Sender.new(message, :valid_type).send
+ expect(message.attachments.length).to eq(4)
+ expect(message.attachments.map(&:filename))
+ .to contain_exactly(*[small_pdf, large_pdf, csv_file, @secure_image].map(&:original_filename))
+ expect(message.html_part.body).to include("cid:")
+ expect(message.html_part.body).to include("embedded-secure-image")
+ expect(message.attachments.length).to eq(4)
+ end
+ end
+ end
+
+ it "adds only non-image uploads as attachments to the email and leaves the image intact with original source" do
+ SiteSetting.email_total_attachment_size_limit_kb = 10_000
+ Email::Sender.new(message, :valid_type).send
+
+ expect(message.attachments.length).to eq(3)
+ expect(message.attachments.map(&:filename))
+ .to contain_exactly(*[small_pdf, large_pdf, csv_file].map(&:original_filename))
+ expect(message.html_part.body).to include("![](\"#{Discourse.base_url}\/secure-media-uploads/original/1X/testimage.png\")
")
- expect(frag.at('p.secure-media-notice')).to be_present
expect(frag.at('img')).not_to be_present
- expect(frag.at('a')).not_to be_present
+ expect(frag.to_s).to include("Redacted")
end
it "replaces secure images with a placeholder" do
frag = html_fragment("![](\"/secure-media-uploads/original/1X/testimage.png\")
")
- expect(frag.at('p.secure-media-notice')).to be_present
expect(frag.at('img')).not_to be_present
+ expect(frag.to_s).to include("Redacted")
end
it "does not replace topic links with secure-media-uploads in the name" do
frag = html_fragment("Visit Topic")
- expect(frag.at('p.secure-media-notice')).not_to be_present
+ expect(frag.to_s).not_to include("Redacted")
+ end
+ end
+
+ context "inline_secure_images" do
+ let(:attachments) { { 'testimage.png' => stub(url: 'cid:email/test.png') } }
+ fab!(:upload) { Fabricate(:upload, original_filename: 'testimage.png', secure: true, sha1: '123456') }
+
+ def strip_and_inline
+ html = "![](\"#{Discourse.base_url}\/secure-media-uploads/original/1X/123456.png\")
"
+
+ # strip out the secure media
+ styler = Email::Styles.new(html)
+ styler.format_basic
+ styler.format_html
+ html = styler.to_html
+
+ # pass in the attachments to match uploads based on sha + original filename
+ styler = Email::Styles.new(html)
+ styler.inline_secure_images(attachments)
+ @frag = Nokogiri::HTML5.fragment(styler.to_s)
+ end
+
+ it "inlines attachments where stripped-secure-media data attr is present" do
+ strip_and_inline
+ expect(@frag.to_s).to include("cid:email/test.png")
+ expect(@frag.css('[data-stripped-secure-media]')).not_to be_present
+ end
+
+ it "does not inline anything if the upload cannot be found" do
+ upload.update(sha1: 'blah12')
+ strip_and_inline
+
+ expect(@frag.to_s).not_to include("cid:email/test.png")
+ expect(@frag.css('[data-stripped-secure-media]')).to be_present
end
end
end
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 073957026b7..72e22124730 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -928,6 +928,40 @@ describe PrettyText do
expect(md.to_s).to match(I18n.t("emails.secure_media_placeholder"))
expect(md.to_s).not_to match(SiteSetting.Upload.s3_cdn_url)
end
+
+ it "replaces secure media within a link with a placeholder, keeping the url in an attribute" do
+ url = "#{Discourse.base_url}\/secure-media-uploads/original/1X/testimage.png"
+ html = <<~HTML
+
+ HTML
+ md = PrettyText.format_for_email(html, post)
+ expect(md).not_to include('
+ HTML
+ md = PrettyText.format_for_email(html, post)
+ md = PrettyText.format_for_email(md, post)
+
+ expect(md.scan(/stripped-secure-view-media/).length).to eq(1)
+ expect(md.scan(/Redacted/).length).to eq(1)
+ end
+
+ it "replaces secure images with a placeholder, keeping the url in an attribute" do
+ url = "/secure-media-uploads/original/1X/testimage.png"
+ html = <<~HTML
+