X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fhttp_signatures%2Fhttp_signatures.ex;h=cdc5e1f3f505c78637d1967da6c86613cbc3e2cc;hb=94db9ac4dba6ba02fcae1b9055b532818cf787c7;hp=65a344e0b14b8c7524fb180fbe73ff7a1b7c1af9;hpb=6268b7e0eb400c1b5e227a73e6faee0f1e476db4;p=akkoma

diff --git a/lib/pleroma/web/http_signatures/http_signatures.ex b/lib/pleroma/web/http_signatures/http_signatures.ex
index 65a344e0b..cdc5e1f3f 100644
--- a/lib/pleroma/web/http_signatures/http_signatures.ex
+++ b/lib/pleroma/web/http_signatures/http_signatures.ex
@@ -1,5 +1,8 @@
 # https://tools.ietf.org/html/draft-cavage-http-signatures-08
 defmodule Pleroma.Web.HTTPSignatures do
+  alias Pleroma.User
+  alias Pleroma.Web.ActivityPub.ActivityPub
+
   def split_signature(sig) do
     default = %{"headers" => "date"}
 
@@ -18,7 +21,33 @@ defmodule Pleroma.Web.HTTPSignatures do
   def validate(headers, signature, public_key) do
     sigstring = build_signing_string(headers, signature["headers"])
     {:ok, sig} = Base.decode64(signature["signature"])
-    verify = :public_key.verify(sigstring, :sha256, sig, public_key)
+    :public_key.verify(sigstring, :sha256, sig, public_key)
+  end
+
+  def validate_conn(conn) do
+    # TODO: How to get the right key and see if it is actually valid for that request.
+    # For now, fetch the key for the actor.
+    with actor_id <- conn.params["actor"],
+         {:ok, public_key} <- User.get_public_key_for_ap_id(actor_id) do
+      if validate_conn(conn, public_key) do
+        true
+      else
+        # Fetch user anew and try one more time
+        with actor_id <- conn.params["actor"],
+             {:ok, _user} <- ActivityPub.make_user_from_ap_id(actor_id),
+             {:ok, public_key} <- User.get_public_key_for_ap_id(actor_id) do
+          validate_conn(conn, public_key)
+        end
+      end
+    else
+      _ -> false
+    end
+  end
+
+  def validate_conn(conn, public_key) do
+    headers = Enum.into(conn.req_headers, %{})
+    signature = split_signature(headers["signature"])
+    validate(headers, signature, public_key)
   end
 
   def build_signing_string(headers, used_headers) do
@@ -26,4 +55,22 @@ defmodule Pleroma.Web.HTTPSignatures do
     |> Enum.map(fn (header) -> "#{header}: #{headers[header]}" end)
     |> Enum.join("\n")
   end
+
+  def sign(user, headers) do
+    with {:ok, %{info: %{"keys" => keys}}} <- Pleroma.Web.WebFinger.ensure_keys_present(user),
+         {:ok, private_key, _} = Pleroma.Web.Salmon.keys_from_pem(keys) do
+      sigstring = build_signing_string(headers, Map.keys(headers))
+      signature = :public_key.sign(sigstring, :sha256, private_key)
+      |> Base.encode64()
+
+      [
+        keyId: user.ap_id <> "#main-key",
+        algorithm: "rsa-sha256",
+        headers: Map.keys(headers) |> Enum.join(" "),
+        signature: signature
+      ]
+      |> Enum.map(fn({k, v}) -> "#{k}=\"#{v}\"" end)
+      |> Enum.join(",")
+    end
+  end
 end