X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fwebsub%2Fwebsub_controller.ex;h=6c9164ec8ec3ab7a1dde4b6c8516ee2000c7f6a4;hb=54af9e145a3311c25dd335b0991d74773f5cbd0d;hp=09305c33713eb3f8d699a7e0821eb0ff05d15fa7;hpb=1b9cc721a0d49d786b4864c2b8aceaf49b9ff088;p=akkoma

diff --git a/lib/pleroma/web/websub/websub_controller.ex b/lib/pleroma/web/websub/websub_controller.ex
index 09305c337..6c9164ec8 100644
--- a/lib/pleroma/web/websub/websub_controller.ex
+++ b/lib/pleroma/web/websub/websub_controller.ex
@@ -1,27 +1,15 @@
 defmodule Pleroma.Web.Websub.WebsubController do
   use Pleroma.Web, :controller
-  alias Pleroma.Web.Websub.WebsubServerSubscription
   alias Pleroma.{Repo, User}
-  alias Pleroma.Web.OStatus
+  alias Pleroma.Web.{Websub, Federator}
+  alias Pleroma.Web.Websub.WebsubClientSubscription
+  require Logger
+
   def websub_subscription_request(conn, %{"nickname" => nickname} = params) do
     user = User.get_cached_by_nickname(nickname)
 
-    with {:ok, topic} <- valid_topic(params, user),
-         {:ok, lease_time} <- lease_time(params),
-         secret <- params["hub.secret"]
+    with {:ok, _websub} <- Websub.incoming_subscription_request(user, params)
     do
-      data = %{
-        state: "requested",
-        topic: topic,
-        secret: secret
-      }
-
-      change = Ecto.Changeset.change(%WebsubServerSubscription{}, data)
-      websub = Repo.insert!(change)
-
-      change = Ecto.Changeset.change(websub, %{valid_until: NaiveDateTime.add(websub.inserted_at, lease_time)})
-      websub = Repo.update!(change)
-
       conn
       |> send_resp(202, "Accepted")
     else {:error, reason} ->
@@ -30,19 +18,42 @@ defmodule Pleroma.Web.Websub.WebsubController do
     end
   end
 
-  defp lease_time(%{"hub.lease_seconds" => lease_seconds}) do
-    {:ok, lease_seconds}
-  end
+  # TODO: Extract this into the Websub module
+  def websub_subscription_confirmation(conn, %{"id" => id, "hub.mode" => "subscribe", "hub.challenge" => challenge, "hub.topic" => topic} = params) do
+    Logger.debug("Got websub confirmation")
+    Logger.debug(inspect(params))
+    lease_seconds = if params["hub.lease_seconds"] do
+      String.to_integer(params["hub.lease_seconds"])
+    else
+      # Guess 3 days
+      60 * 60 * 24 * 3
+    end
 
-  defp lease_time(_) do
-    {:ok, 60 * 60 * 24 * 3} # three days
+    with %WebsubClientSubscription{} = websub <- Repo.get_by(WebsubClientSubscription, id: id, topic: topic) do
+      valid_until = NaiveDateTime.add(NaiveDateTime.utc_now, lease_seconds)
+      change = Ecto.Changeset.change(websub, %{state: "accepted", valid_until: valid_until})
+      {:ok, _websub} = Repo.update(change)
+      conn
+      |> send_resp(200, challenge)
+    else _e ->
+      conn
+      |> send_resp(500, "Error")
+    end
   end
 
-  defp valid_topic(%{"hub.topic" => topic}, user) do
-    if topic == OStatus.feed_path(user) do
-      {:ok, topic}
-    else
-      {:error, "Wrong topic requested, expected #{OStatus.feed_path(user)}, got #{topic}"}
+  def websub_incoming(conn, %{"id" => id}) do
+    with "sha1=" <> signature <- hd(get_req_header(conn, "x-hub-signature")),
+         signature <- String.downcase(signature),
+         %WebsubClientSubscription{} = websub <- Repo.get(WebsubClientSubscription, id),
+         {:ok, body, _conn} = read_body(conn),
+         ^signature <- Websub.sign(websub.secret, body) do
+      Federator.enqueue(:incoming_doc, body)
+      conn
+      |> send_resp(200, "OK")
+    else _e ->
+      Logger.debug("Can't handle incoming subscription post")
+      conn
+      |> send_resp(500, "Error")
     end
   end
 end