treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Guard against nil URLs in Request class (#7284) 

Fix #7265
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2018-05-02 15:44:22 +02:00 committed by GitHub
parent 6c40e567aa
commit 965345316f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/lib/request.rb
View File

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

2
app/services/activitypub/fetch_featured_collection_service.rb
View File

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