about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorMIYAGI Hikaru <hcmiya@users.noreply.github.com>2018-05-18 08:47:22 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-05-18 01:47:22 +0200
commit919eef309820a421d6f5886b8ae811d3924cea97 (patch)
tree0174be003e00cc3addbe3a5e04075eae67c2f7a7 /config
parent7293b9fc6190acd6d2a481c158c718a7a8299c73 (diff)
User agent for WebFinger (#7531)
* User agent for WebFinger

* local_domain → web_domain

* 'http' is away accidentally...
Diffstat (limited to 'config')
-rw-r--r--config/initializers/http_client_proxy.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/http_client_proxy.rb b/config/initializers/http_client_proxy.rb
index f5026d59e..52c595c5d 100644
--- a/config/initializers/http_client_proxy.rb
+++ b/config/initializers/http_client_proxy.rb
@@ -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