diff options
| -rw-r--r-- | app/lib/sanitize_config.rb | 21 | ||||
| -rw-r--r-- | spec/lib/formatter_spec.rb | 8 |
2 files changed, 28 insertions, 1 deletions
diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb index 9cf9b3db0..f09288fcd 100644 --- a/app/lib/sanitize_config.rb +++ b/app/lib/sanitize_config.rb @@ -4,6 +4,21 @@ class Sanitize module Config HTTP_PROTOCOLS ||= ['http', 'https', :relative].freeze + CLASS_WHITELIST_TRANSFORMER = lambda do |env| + node = env[:node] + class_list = node['class']&.split(' ') + + return unless class_list + + class_list.keep_if do |e| + return true if e =~ /^(h|p|u|dt|e)-/ # microformats classes + return true if e =~ /^(mention|hashtag)$/ # semantic classes + return true if e =~ /^(ellipsis|invisible)$/ # link formatting classes + end + + node['class'] = class_list.join(' ') + end + MASTODON_STRICT ||= freeze_config( elements: %w(p br span a), @@ -21,7 +36,11 @@ class Sanitize protocols: { 'a' => { 'href' => HTTP_PROTOCOLS }, - } + }, + + transformers: [ + CLASS_WHITELIST_TRANSFORMER, + ] ) MASTODON_OEMBED ||= freeze_config merge( diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb index cc32f7fd6..dfe1d8b8f 100644 --- a/spec/lib/formatter_spec.rb +++ b/spec/lib/formatter_spec.rb @@ -204,6 +204,14 @@ RSpec.describe Formatter do is_expected.to_not include '<script>alert("Hello")</script>' end end + + context 'contains malicious classes' do + let(:text) { '<span class="status__content__spoiler-link">Show more</span>' } + + it 'strips malicious classes' do + is_expected.to_not include 'status__content__spoiler-link' + end + end end describe '#plaintext' do |