tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sanitizer *not* add no-referrer etc. in local markdown toots if the link is “safe”

Browse Source
This commit is contained in:
Thibaut Girka
2020-03-22 17:56:49 +01:00
committed by ThibG
parent 2c510ee00a
commit 02f1c04fab
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/formatter.rb
View File

@ -59,7 +59,7 @@ class Formatter
html = "RT @#{prepend_reblog} #{html}" if prepend_reblog
html = format_markdown(html) if status.content_type == 'text/markdown'
html = encode_and_link_urls(html, linkable_accounts, keep_html: %w(text/markdown text/html).include?(status.content_type))
html = reformat(html) if %w(text/markdown text/html).include?(status.content_type)
html = reformat(html, true) if %w(text/markdown text/html).include?(status.content_type)
html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
unless %w(text/markdown text/html).include?(status.content_type)
@ -75,8 +75,8 @@ class Formatter
html.delete("\r").delete("\n")
end
def reformat(html)
sanitize(html, Sanitize::Config::MASTODON_STRICT)
def reformat(html, outgoing = false)
sanitize(html, Sanitize::Config::MASTODON_STRICT.merge(outgoing: outgoing))
rescue ArgumentError
''
end

7
app/lib/sanitize_config.rb
View File

@ -60,7 +60,10 @@ class Sanitize
node = env[:node]
rel = (node['rel'] || '').split(' ') & ['tag']
node['rel'] = (['nofollow', 'noopener', 'noreferrer'] + rel).join(' ')
unless env[:config][:outgoing] && TagManager.instance.local_url?(node['href'])
rel += ['nofollow', 'noopener', 'noreferrer']
end
node['rel'] = rel.join(' ')
end
UNSUPPORTED_HREF_TRANSFORMER = lambda do |env|
@ -103,8 +106,8 @@ class Sanitize
transformers: [
CLASS_WHITELIST_TRANSFORMER,
IMG_TAG_TRANSFORMER,
LINK_REL_TRANSFORMER,
UNSUPPORTED_HREF_TRANSFORMER,
LINK_REL_TRANSFORMER,
]
)