X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ffederator%2Ffederator.ex;h=ac3d7c1323dcc5e3e9469905753891e899405cc3;hb=675653ceb78e4a64d8375904e555cdd62f064e21;hp=68e5544e7c2d5fdb68e46059e79fc02c7b739a66;hpb=b331cb449a46bbead19fea4fba59762c1a2e3a10;p=akkoma diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex index 68e5544e7..ac3d7c132 100644 --- a/lib/pleroma/web/federator/federator.ex +++ b/lib/pleroma/web/federator/federator.ex @@ -1,37 +1,57 @@ defmodule Pleroma.Web.Federator do use GenServer alias Pleroma.User + alias Pleroma.Activity alias Pleroma.Web.{WebFinger, Websub} + alias Pleroma.Web.Federator.RetryQueue + alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.ActivityPub.Relay + alias Pleroma.Web.ActivityPub.Transmogrifier + alias Pleroma.Web.ActivityPub.Utils + alias Pleroma.Web.OStatus require Logger @websub Application.get_env(:pleroma, :websub) @ostatus Application.get_env(:pleroma, :ostatus) @httpoison Application.get_env(:pleroma, :httpoison) - @max_jobs 10 + @max_jobs 20 + + def init(args) do + {:ok, args} + end def start_link do spawn(fn -> - Process.sleep(1000 * 60 * 1) # 1 minute + # 1 minute + Process.sleep(1000 * 60 * 1) enqueue(:refresh_subscriptions, nil) end) - GenServer.start_link(__MODULE__, %{ - in: {:sets.new(), []}, - out: {:sets.new(), []} - }, name: __MODULE__) + + GenServer.start_link( + __MODULE__, + %{ + in: {:sets.new(), []}, + out: {:sets.new(), []} + }, + name: __MODULE__ + ) end def handle(:refresh_subscriptions, _) do Logger.debug("Federator running refresh subscriptions") Websub.refresh_subscriptions() + spawn(fn -> - Process.sleep(1000 * 60 * 60 * 6) # 6 hours + # 6 hours + Process.sleep(1000 * 60 * 60 * 6) enqueue(:refresh_subscriptions, nil) end) end def handle(:request_subscription, websub) do Logger.debug("Refreshing #{websub.topic}") - with {:ok, websub } <- Websub.request_subscription(websub) do + + with {:ok, websub} <- Websub.request_subscription(websub) do Logger.debug("Successfully refreshed #{websub.topic}") else _e -> Logger.debug("Couldn't refresh #{websub.topic}") @@ -40,58 +60,112 @@ defmodule Pleroma.Web.Federator do def handle(:publish, activity) do Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end) + with actor when not is_nil(actor) <- User.get_cached_by_ap_id(activity.data["actor"]) do {:ok, actor} = WebFinger.ensure_keys_present(actor) - Logger.debug(fn -> "Sending #{activity.data["id"]} out via salmon" end) - Pleroma.Web.Salmon.publish(actor, activity) - Logger.debug(fn -> "Sending #{activity.data["id"]} out via websub" end) - Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity) + if ActivityPub.is_public?(activity) do + if OStatus.is_representable?(activity) do + Logger.info(fn -> "Sending #{activity.data["id"]} out via WebSub" end) + Websub.publish(Pleroma.Web.OStatus.feed_path(actor), actor, activity) + + Logger.info(fn -> "Sending #{activity.data["id"]} out via Salmon" end) + Pleroma.Web.Salmon.publish(actor, activity) + end - Logger.debug(fn -> "Sending #{activity.data["id"]} out via AP" end) + if Keyword.get(Application.get_env(:pleroma, :instance), :allow_relay) do + Logger.info(fn -> "Relaying #{activity.data["id"]} out" end) + Relay.publish(activity) + end + end + + Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end) Pleroma.Web.ActivityPub.ActivityPub.publish(actor, activity) end end def handle(:verify_websub, websub) do - Logger.debug(fn -> "Running websub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" end) + Logger.debug(fn -> + "Running WebSub verification for #{websub.id} (#{websub.topic}, #{websub.callback})" + end) + @websub.verify(websub) end def handle(:incoming_doc, doc) do - Logger.debug("Got document, trying to parse") + Logger.info("Got document, trying to parse") @ostatus.handle_incoming(doc) end - def handle(:publish_single_websub, %{xml: xml, topic: topic, callback: callback, secret: secret}) do - signature = @websub.sign(secret || "", xml) - Logger.debug(fn -> "Pushing #{topic} to #{callback}" end) + def handle(:incoming_ap_doc, params) do + Logger.info("Handling incoming AP activity") + + params = Utils.normalize_params(params) - with {:ok, %{status_code: code}} <- @httpoison.post(callback, xml, [ - {"Content-Type", "application/atom+xml"}, - {"X-Hub-Signature", "sha1=#{signature}"} - ], timeout: 10000, recv_timeout: 20000) do - Logger.debug(fn -> "Pushed to #{callback}, code #{code}" end) - else e -> - Logger.debug(fn -> "Couldn't push to #{callback}, #{inspect(e)}" end) + # NOTE: we use the actor ID to do the containment, this is fine because an + # actor shouldn't be acting on objects outside their own AP server. + with {:ok, _user} <- ap_enabled_actor(params["actor"]), + nil <- Activity.normalize(params["id"]), + :ok <- Transmogrifier.contain_origin_from_id(params["actor"], params), + {:ok, activity} <- Transmogrifier.handle_incoming(params) do + {:ok, activity} + else + %Activity{} -> + Logger.info("Already had #{params["id"]}") + :error + + _e -> + # Just drop those for now + Logger.info("Unhandled activity") + Logger.info(Poison.encode!(params, pretty: 2)) + :error + end + end + + def handle(:publish_single_ap, params) do + case ActivityPub.publish_one(params) do + {:ok, _} -> + :ok + + {:error, _} -> + RetryQueue.enqueue(params, ActivityPub) + end + end + + def handle( + :publish_single_websub, + %{xml: xml, topic: topic, callback: callback, secret: secret} = params + ) do + case Websub.publish_one(params) do + {:ok, _} -> + :ok + + {:error, _} -> + RetryQueue.enqueue(params, Websub) end end def handle(type, _) do Logger.debug(fn -> "Unknown task: #{type}" end) - {:error, "Don't know what do do with this"} + {:error, "Don't know what to do with this"} end - def enqueue(type, payload, priority \\ 1) do - if Mix.env == :test do - handle(type, payload) - else - GenServer.cast(__MODULE__, {:enqueue, type, payload, priority}) + if Mix.env() == :test do + def enqueue(type, payload, priority \\ 1) do + if Pleroma.Config.get([:instance, :federating]) do + handle(type, payload) + end + end + else + def enqueue(type, payload, priority \\ 1) do + if Pleroma.Config.get([:instance, :federating]) do + GenServer.cast(__MODULE__, {:enqueue, type, payload, priority}) + end end end def maybe_start_job(running_jobs, queue) do - if (:sets.size(running_jobs) < @max_jobs) && queue != [] do + if :sets.size(running_jobs) < @max_jobs && queue != [] do {{type, payload}, queue} = queue_pop(queue) {:ok, pid} = Task.start(fn -> handle(type, payload) end) mref = Process.monitor(pid) @@ -101,14 +175,15 @@ defmodule Pleroma.Web.Federator do end end - def handle_cast({:enqueue, type, payload, priority}, state) when type in [:incoming_doc] do + def handle_cast({:enqueue, type, payload, _priority}, state) + when type in [:incoming_doc, :incoming_ap_doc] do %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state i_queue = enqueue_sorted(i_queue, {type, payload}, 1) {i_running_jobs, i_queue} = maybe_start_job(i_running_jobs, i_queue) {:noreply, %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}}} end - def handle_cast({:enqueue, type, payload, priority}, state) do + def handle_cast({:enqueue, type, payload, _priority}, state) do %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state o_queue = enqueue_sorted(o_queue, {type, payload}, 1) {o_running_jobs, o_queue} = maybe_start_job(o_running_jobs, o_queue) @@ -132,10 +207,20 @@ defmodule Pleroma.Web.Federator do def enqueue_sorted(queue, element, priority) do [%{item: element, priority: priority} | queue] - |> Enum.sort_by(fn (%{priority: priority}) -> priority end) + |> Enum.sort_by(fn %{priority: priority} -> priority end) end def queue_pop([%{item: element} | queue]) do {element, queue} end + + def ap_enabled_actor(id) do + user = User.get_by_ap_id(id) + + if User.ap_enabled?(user) do + {:ok, user} + else + ActivityPub.make_user_from_ap_id(id) + end + end end