diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb index 34793ed93b..dfd8b9f917 100644 --- a/app/lib/sanitize_config.rb +++ b/app/lib/sanitize_config.rb @@ -55,7 +55,7 @@ class Sanitize end LINK_REL_TRANSFORMER = lambda do |env| - return unless env[:node_name] == 'a' + return unless env[:node_name] == 'a' and env[:node]['href'] node = env[:node] diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb index d06bea0593..29dde128c9 100644 --- a/app/lib/tag_manager.rb +++ b/app/lib/tag_manager.rb @@ -32,6 +32,7 @@ class TagManager def local_url?(url) uri = Addressable::URI.parse(url).normalize + return false unless uri.host domain = uri.host + (uri.port ? ":#{uri.port}" : '') TagManager.instance.web_domain?(domain) diff --git a/spec/lib/sanitize_config_spec.rb b/spec/lib/sanitize_config_spec.rb index 7370c536b6..28a548c494 100644 --- a/spec/lib/sanitize_config_spec.rb +++ b/spec/lib/sanitize_config_spec.rb @@ -4,15 +4,7 @@ require 'rails_helper' require Rails.root.join('app', 'lib', 'sanitize_config.rb') describe Sanitize::Config do - describe '::MASTODON_STRICT' do - subject { Sanitize::Config::MASTODON_STRICT } - - around do |example| - original_web_domain = Rails.configuration.x.web_domain - example.run - Rails.configuration.x.web_domain = original_web_domain - end - + shared_examples 'common HTML sanitization' do it 'keeps h1' do expect(Sanitize.fragment('

Foo

', subject)).to eq '

Foo

' end @@ -37,13 +29,39 @@ describe Sanitize::Config do expect(Sanitize.fragment('Test', subject)).to eq 'Test' end + it 'removes a with unparsable href' do + expect(Sanitize.fragment('Test', subject)).to eq 'Test' + end + + it 'keeps a with supported scheme and no host' do + expect(Sanitize.fragment('Test', subject)).to eq 'Test' + end + end + + describe '::MASTODON_STRICT' do + subject { Sanitize::Config::MASTODON_STRICT } + + it_behaves_like 'common HTML sanitization' + it 'keeps a with href and rel tag' do expect(Sanitize.fragment('', subject)).to eq 'Test' end + end + + describe '::MASTODON_STRICT with outgoing toots' do + subject { Sanitize::Config::MASTODON_STRICT.merge(outgoing: true) } + + around do |example| + original_web_domain = Rails.configuration.x.web_domain + example.run + Rails.configuration.x.web_domain = original_web_domain + end + + it_behaves_like 'common HTML sanitization' it 'keeps a with href and rel tag, not adding to rel if url is local' do Rails.configuration.x.web_domain = 'domain.test' - expect(Sanitize.fragment('', subject.merge(outgoing: true))).to eq '' + expect(Sanitize.fragment('', subject)).to eq '' end end end