alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix/fedsocket-useragent' into 'develop' 

Minor Fedsocket improvements

See merge request pleroma/pleroma!3012
This commit is contained in:
feld 2020-09-21 21:06:32 +00:00
parent 59680f27ff 8afdbcdb1c
commit a5c34e3123
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pleroma/web/fed_sockets/outgoing_handler.ex
View File

@ -7,6 +7,7 @@ defmodule Pleroma.Web.FedSockets.OutgoingHandler do
require Logger require Logger
alias Pleroma.Application
alias Pleroma.Web.ActivityPub.InternalFetchActor alias Pleroma.Web.ActivityPub.InternalFetchActor
alias Pleroma.Web.FedSockets alias Pleroma.Web.FedSockets
alias Pleroma.Web.FedSockets.FedRegistry alias Pleroma.Web.FedSockets.FedRegistry
@ -85,9 +86,12 @@ def initiate_connection(uri) do
%{host: host, port: port, path: path} = URI.parse(ws_uri) %{host: host, port: port, path: path} = URI.parse(ws_uri)
with {:ok, conn_pid} <- :gun.open(to_charlist(host), port), with {:ok, conn_pid} <- :gun.open(to_charlist(host), port, %{protocols: [:http]}),
{:ok, _} <- :gun.await_up(conn_pid), {:ok, _} <- :gun.await_up(conn_pid),
reference <- :gun.get(conn_pid, to_charlist(path)), reference <-
:gun.get(conn_pid, to_charlist(path), [
{'user-agent', to_charlist(Application.user_agent())}
]),
{:response, :fin, 204, _} <- :gun.await(conn_pid, reference), {:response, :fin, 204, _} <- :gun.await(conn_pid, reference),
headers <- build_headers(uri), headers <- build_headers(uri),
ref <- :gun.ws_upgrade(conn_pid, to_charlist(path), headers, %{silence_pings: false}) do ref <- :gun.ws_upgrade(conn_pid, to_charlist(path), headers, %{silence_pings: false}) do
@ -132,7 +136,8 @@ defp build_headers(uri) do
{'date', date}, {'date', date},
{'digest', to_charlist(digest)}, {'digest', to_charlist(digest)},
{'content-length', to_charlist("#{shake_size}")}, {'content-length', to_charlist("#{shake_size}")},
{to_charlist("(request-target)"), to_charlist(shake)} {to_charlist("(request-target)"), to_charlist(shake)},
{'user-agent', to_charlist(Application.user_agent())}
] ]
end end