From 77cb260628fda32ffa42c68dbafab21fa6335469 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sat, 22 Apr 2017 12:07:51 +0200 Subject: [PATCH] add basic federation to websub. --- lib/pleroma/web/websub/websub.ex | 42 ++++++++++++++++++++++++++------ test/web/websub/websub_test.exs | 2 +- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex index c7752487c..26a10788a 100644 --- a/lib/pleroma/web/websub/websub.ex +++ b/lib/pleroma/web/websub/websub.ex @@ -1,15 +1,26 @@ defmodule Pleroma.Web.Websub do alias Pleroma.Repo + alias Pleroma.Websub + alias Pleroma.Web.Websub.WebsubServerSubscription + alias Pleroma.Web.OStatus.FeedRepresenter + + import Ecto.Query def verify(subscription, getter \\ &HTTPoison.get/3 ) do challenge = Base.encode16(:crypto.strong_rand_bytes(8)) - lease_seconds = NaiveDateTime.diff(subscription.inserted_at, subscription.valid_until) - with {:ok, response} <- getter.(subscription.callback, [], [params: %{ - "hub.challenge": challenge, - "hub.lease_seconds": lease_seconds, - "hub.topic": subscription.topic, - "hub.mode": "subscribe" - }]), + lease_seconds = NaiveDateTime.diff(subscription.valid_until, subscription.inserted_at) |> to_string + + params = %{ + "hub.challenge": challenge, + "hub.lease_seconds": lease_seconds, + "hub.topic": subscription.topic, + "hub.mode": "subscribe" + } + + url = hd(String.split(subscription.callback, "?")) + query = URI.parse(subscription.callback).query || "" + params = Map.merge(params, URI.decode_query(query)) + with {:ok, response} <- getter.(url, [], [params: params]), ^challenge <- response.body do changeset = Ecto.Changeset.change(subscription, %{state: "active"}) @@ -20,4 +31,21 @@ defmodule Pleroma.Web.Websub do {:error, subscription} end end + + def publish(topic, user, activity) do + query = from sub in WebsubServerSubscription, + where: sub.topic == ^topic and sub.state == "active" + subscriptions = Repo.all(query) + Enum.each(subscriptions, fn(sub) -> + response = FeedRepresenter.to_simple_form(user, [activity], [user]) + |> :xmerl.export_simple(:xmerl_xml) + + signature = :crypto.hmac(:sha, sub.secret, response) |> Base.encode16 + + HTTPoison.post(sub.callback, response, [ + {"Content-Type", "application/atom+xml"}, + {"X-Hub-Signature", "sha1=#{signature}"} + ]) + end) + end end diff --git a/test/web/websub/websub_test.exs b/test/web/websub/websub_test.exs index 93a44fe46..36ea82299 100644 --- a/test/web/websub/websub_test.exs +++ b/test/web/websub/websub_test.exs @@ -15,7 +15,7 @@ defmodule Pleroma.Web.WebsubTest do "hub.mode": "subscribe" } = Keyword.get(options, :params) - assert is_number(seconds) + assert String.to_integer(seconds) > 0 {:ok, %HTTPoison.Response{ status_code: 200,