OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Check that twitter:player is valid before using it (#9254) 

Fixes #9251
pull/9257/head
ThibG 2018-11-10 20:42:04 +01:00 committed by Eugen Rochko
parent 3cecf3e5b9
commit 9b89c62d43
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/services/fetch_link_card_service.rb
View File

@ -136,14 +136,15 @@ class FetchLinkCardService < BaseService
detector = CharlockHolmes::EncodingDetector.new detector = CharlockHolmes::EncodingDetector.new
detector.strip_tags = true detector.strip_tags = true
guess = detector.detect(@html, @html_charset) guess = detector.detect(@html, @html_charset)
page = Nokogiri::HTML(@html, nil, guess&.fetch(:encoding, nil)) page = Nokogiri::HTML(@html, nil, guess&.fetch(:encoding, nil))
player_url = meta_property(page, 'twitter:player')
if meta_property(page, 'twitter:player') if player_url && !bad_url?(Addressable::URI.parse(player_url))
@card.type = :video @card.type = :video
@card.width = meta_property(page, 'twitter:player:width') || 0 @card.width = meta_property(page, 'twitter:player:width') || 0
@card.height = meta_property(page, 'twitter:player:height') || 0 @card.height = meta_property(page, 'twitter:player:height') || 0
@card.html = content_tag(:iframe, nil, src: meta_property(page, 'twitter:player'), @card.html = content_tag(:iframe, nil, src: player_url,
width: @card.width, width: @card.width,
height: @card.height, height: @card.height,
allowtransparency: 'true', allowtransparency: 'true',