Skip to content

A platform for community discussion. Free, open, simple.

FIX: Make links absolute in emails rendered from Markdown

Régis Hanol82181a06d5b3
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index baf28ef2eef..6ee6e086ff6 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -444,6 +444,7 @@ module Email
def to_html
replace_secure_uploads_urls if SiteSetting.secure_uploads?
replace_relative_urls
+ make_all_links_absolute
deduplicate_styles
@fragment.to_html
@@ -481,14 +482,9 @@ module Email
end
def make_all_links_absolute
- site_uri = URI(Discourse.base_url)
@fragment
- .css("a")
- .each do |link|
- link["href"] = "#{site_uri}#{link["href"]}" if URI(link["href"].to_s).host.blank?
- rescue URI::Error
- # leave it
- end
+ .css("a[href]")
+ .each { |link| link["href"] = UrlHelper.absolute_without_cdn(link["href"]) }
end
private
diff --git a/spec/lib/email/styles_spec.rb b/spec/lib/email/styles_spec.rb
index 3e99b2b0fae..8de224f74fb 100644
--- a/spec/lib/email/styles_spec.rb
+++ b/spec/lib/email/styles_spec.rb
@@ -42,6 +42,14 @@ RSpec.describe Email::Styles do
expect(frag.at("img")["src"]).to eq("#{Discourse.base_url}/some-image.png")
end
+ it "converts relative links to absolute links" do
+ frag = basic_fragment("<a href='/u/someone'>someone</a><a href='mailto:[email protected]'>mail</a>")
+
+ expect(frag.css("a").map { |link| link["href"] }).to eq(
+ ["#{Discourse.base_url}/u/someone", "mailto:[email protected]"],
+ )
+ end
+
it "preserves classes and ids" do
raw = '<div class="foo" id="bar"><div class="foo" id="bar"></div></div>'
frag = basic_fragment(raw)