mirror of
https://github.com/whippyshou/mastodon
synced 2024-12-16 23:59:01 +09:00
1618b68bfa
* Add Request class with HTTP signature generator Spec: https://tools.ietf.org/html/draft-cavage-http-signatures-06 * Add HTTP signature verification concern * Add test for SignatureVerification concern * Add basic test for Request class * Make PuSH subscribe/unsubscribe requests use new Request class Accidentally fix lease_seconds not being set and sent properly, and change the new minimum subscription duration to 1 day * Make all PuSH workers use new Request class * Make Salmon sender use new Request class * Make FetchLinkService use new Request class * Make FetchAtomService use the new Request class * Make Remotable use the new Request class * Make ResolveRemoteAccountService use the new Request class * Add more tests * Allow +-30 seconds window for signed request to remain valid * Disable time window validation for signed requests, restore 7 days as PuSH subscription duration (which was previous default due to a bug)
36 lines
1.1 KiB
Ruby
36 lines
1.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class ProviderDiscovery < OEmbed::ProviderDiscovery
|
|
class << self
|
|
def discover_provider(url, options = {})
|
|
res = Request.new(:get, url).perform
|
|
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
|
|
|
|
raise OEmbed::NotFound, url if provider_endpoint.nil?
|
|
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)
|
|
end
|
|
end
|
|
end
|