Browse Source

Fixed bug that timeline can not be displayed by InvalidURIError (#2947)

master
abcang 7 years ago
committed by Eugen Rochko
parent
commit
08e94d1b19
2 changed files with 9 additions and 0 deletions
  1. +2
    -0
      app/lib/formatter.rb
  2. +7
    -0
      spec/lib/formatter_spec.rb

+ 2
- 0
app/lib/formatter.rb View File

@ -92,6 +92,8 @@ class Formatter
rel: 'nofollow noopener',
}
Twitter::Autolink.send(:link_to_text, entity, link_html(entity[:url]), normalized_url, html_attrs)
rescue Addressable::URI::InvalidURIError
encode(entity[:url])
end
def link_to_mention(entity, mentions)

+ 7
- 0
spec/lib/formatter_spec.rb View File

@ -123,6 +123,13 @@ RSpec.describe Formatter do
expect(subject).to match '<p>&lt;img src=&quot;javascript:alert(&apos;XSS&apos;);&quot;&gt;</p>'
end
end
context 'contains invalid URL' do
let(:local_text) { 'http://www\.google\.com' }
it 'has valid url' do
expect(subject).to eq '<p>http://www\.google\.com</p>'
end
end
end
describe '#reformat' do

Loading…
Cancel
Save