Guard against nil URLs in Request class (#7284)

Fix #7265
master
Eugen Rochko 7 years ago committed by GitHub
parent 6c40e567aa
commit 965345316f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      app/lib/request.rb
  2. 2
      app/services/activitypub/fetch_featured_collection_service.rb

@ -9,12 +9,15 @@ class Request
include RoutingHelper
def initialize(verb, url, **options)
raise ArgumentError if url.blank?
@verb = verb
@url = Addressable::URI.parse(url).normalize
@options = options.merge(use_proxy? ? Rails.configuration.x.http_client_proxy : { socket_class: Socket })
@headers = {}
raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if block_hidden_service?
set_common_headers!
set_digest! if options.key?(:body)
end

@ -4,6 +4,8 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService
include JsonLdHelper
def call(account)
return if account.featured_collection_url.blank?
@account = account
@json = fetch_resource(@account.featured_collection_url, true)

Loading…
Cancel
Save