OEmbed support for PreviewCard (#2337)
* OEmbed support for PreviewCard * Improve ProviderDiscovery code failure treatment * Do not crawl links if there is a content warning, since those don't display a link card anyway * Reset db schema * Fresh migrate * Fix rubocop style issues Fix #1681 - return existing access token when applicable instead of creating new * Fix test * Extract http client to helper * Improve oembed controller
This commit is contained in:
parent
be0a01145b
commit
88725d6ce8
22 changed files with 278 additions and 36 deletions
|
@ -1,13 +1,13 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
require 'singleton'
|
||||
require_relative './sanitize_config'
|
||||
|
||||
class Formatter
|
||||
include Singleton
|
||||
include RoutingHelper
|
||||
|
||||
include ActionView::Helpers::TextHelper
|
||||
include ActionView::Helpers::SanitizeHelper
|
||||
|
||||
def format(status)
|
||||
return reformat(status.content) unless status.local?
|
||||
|
@ -23,7 +23,7 @@ class Formatter
|
|||
end
|
||||
|
||||
def reformat(html)
|
||||
sanitize(html, tags: %w(a br p span), attributes: %w(href rel class))
|
||||
sanitize(html, Sanitize::Config::MASTODON_STRICT)
|
||||
end
|
||||
|
||||
def plaintext(status)
|
||||
|
@ -43,6 +43,10 @@ class Formatter
|
|||
html.html_safe # rubocop:disable Rails/OutputSafety
|
||||
end
|
||||
|
||||
def sanitize(html, config)
|
||||
Sanitize.fragment(html, config)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def encode(html)
|
||||
|
|
36
app/lib/provider_discovery.rb
Normal file
36
app/lib/provider_discovery.rb
Normal file
|
@ -0,0 +1,36 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class ProviderDiscovery < OEmbed::ProviderDiscovery
|
||||
include HttpHelper
|
||||
|
||||
class << self
|
||||
def discover_provider(url, options = {})
|
||||
res = http_client.get(url)
|
||||
format = options[:format]
|
||||
|
||||
raise OEmbed::NotFound, url if res.code != 200 || res.mime_type != 'text/html'
|
||||
|
||||
html = Nokogiri::HTML(res.to_s)
|
||||
|
||||
if format.nil? || format == :json
|
||||
provider_endpoint ||= html.at_xpath('//link[@type="application/json+oembed"]')&.attribute('href')&.value
|
||||
format ||= :json if provider_endpoint
|
||||
end
|
||||
|
||||
if format.nil? || format == :xml
|
||||
provider_endpoint ||= html.at_xpath('//link[@type="application/xml+oembed"]')&.attribute('href')&.value
|
||||
format ||= :xml if provider_endpoint
|
||||
end
|
||||
|
||||
begin
|
||||
provider_endpoint = Addressable::URI.parse(provider_endpoint)
|
||||
provider_endpoint.query = nil
|
||||
provider_endpoint = provider_endpoint.to_s
|
||||
rescue Addressable::URI::InvalidURIError
|
||||
raise OEmbed::NotFound, url
|
||||
end
|
||||
|
||||
OEmbed::Provider.new(provider_endpoint, format || OEmbed::Formatter.default)
|
||||
end
|
||||
end
|
||||
end
|
42
app/lib/sanitize_config.rb
Normal file
42
app/lib/sanitize_config.rb
Normal file
|
@ -0,0 +1,42 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Sanitize
|
||||
module Config
|
||||
HTTP_PROTOCOLS ||= ['http', 'https', :relative].freeze
|
||||
|
||||
MASTODON_STRICT ||= freeze_config(
|
||||
elements: %w(p br span a),
|
||||
|
||||
attributes: {
|
||||
'a' => %w(href),
|
||||
'span' => %w(class),
|
||||
},
|
||||
|
||||
protocols: {
|
||||
'a' => { 'href' => HTTP_PROTOCOLS },
|
||||
}
|
||||
)
|
||||
|
||||
MASTODON_OEMBED ||= freeze_config merge(
|
||||
RELAXED,
|
||||
elements: RELAXED[:elements] + %w(audio embed iframe source video),
|
||||
|
||||
attributes: merge(
|
||||
RELAXED[:attributes],
|
||||
'audio' => %w(controls),
|
||||
'embed' => %w(height src type width),
|
||||
'iframe' => %w(allowfullscreen frameborder height scrolling src width),
|
||||
'source' => %w(src type),
|
||||
'video' => %w(controls height loop width),
|
||||
'div' => [:data]
|
||||
),
|
||||
|
||||
protocols: merge(
|
||||
RELAXED[:protocols],
|
||||
'embed' => { 'src' => HTTP_PROTOCOLS },
|
||||
'iframe' => { 'src' => HTTP_PROTOCOLS },
|
||||
'source' => { 'src' => HTTP_PROTOCOLS }
|
||||
)
|
||||
)
|
||||
end
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue