github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 12:12:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Add strip_secure_urls method to GroupSmtpMailer

Browse Source 
* this mailer needs some more cleanup and specs;
  this commit just adds the missing method so the
  mailer does not error completely in secure media
  environments
This commit is contained in:
Martin Brennan 2020-07-24 13:54:15 +10:00
parent 80f33b5aaf
commit 0e78cd6e3a
No known key found for this signature in database
GPG Key ID: A08063EEF3EA26A4
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/mailers/group_smtp_mailer.rb
View File

@ -86,6 +86,19 @@ class GroupSmtpMailer < ActionMailer::Base
result
end
def strip_secure_urls(raw)
urls = Set.new
raw.scan(URI.regexp(%w{http https})) { urls << $& }
urls.each do |url|
if (url.start_with?(Discourse.store.s3_upload_host) && FileHelper.is_supported_media?(url))
raw = raw.sub(url, "<p class='secure-media-notice'>#{I18n.t("emails.secure_media_placeholder")}</p>")
end
end
raw
end
def html_override(post, context_posts: nil)
UserNotificationRenderer.render(
template: 'email/notification',