Unfloyded/Legamunt
0
0
Fork 0
Code Activity

User agent for WebFinger (#7531)

Browse source 
* User agent for WebFinger

* local_domain → web_domain

* 'http' is away accidentally...
This commit is contained in:
MIYAGI Hikaru 2018-05-18 08:47:22 +09:00 • committed by Eugen Rochko
parent 7293b9fc61
commit 919eef3098
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/initializers/http_client_proxy.rb
View file

@ -18,7 +18,8 @@ module Goldfinger
def self.finger(uri, opts = {})
to_hidden = /\.(onion|i2p)(:\d+)?$/.match(uri)
raise Mastodon::HostValidationError, 'Instance does not support hidden service connections' if !Rails.configuration.x.access_to_hidden_service && to_hidden
opts = opts.merge(Rails.configuration.x.http_client_proxy).merge(ssl: !to_hidden)
opts = { ssl: !to_hidden, headers: {} }.merge(Rails.configuration.x.http_client_proxy).merge(opts)
opts[:headers]['User-Agent'] ||= Mastodon::Version.user_agent
Goldfinger::Client.new(uri, opts).finger
end
end