From 8a07ddef8f7193adb3eb4b069ef0231e769a0fb9 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 23 Apr 2017 10:38:24 +0200
Subject: Don't break feed if user has no posts.

---
 lib/pleroma/web/ostatus/feed_representer.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/ostatus/feed_representer.ex b/lib/pleroma/web/ostatus/feed_representer.ex
index 749cb10d0..14ac3ebf4 100644
--- a/lib/pleroma/web/ostatus/feed_representer.ex
+++ b/lib/pleroma/web/ostatus/feed_representer.ex
@@ -3,7 +3,7 @@ defmodule Pleroma.Web.OStatus.FeedRepresenter do
   alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
 
   def to_simple_form(user, activities, users) do
-    most_recent_update = List.first(activities).updated_at
+    most_recent_update = (List.first(activities) || user).updated_at
     |> NaiveDateTime.to_iso8601
 
     h = fn(str) -> [to_charlist(str)] end
-- 
cgit v1.2.3


From 4c216cba9cd5fc20e03e1f68a4d347cfbc2a2a0b Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 23 Apr 2017 15:21:58 +0200
Subject: Decode and verify salmons.

---
 lib/pleroma/web/salmon/salmon.ex | 48 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 lib/pleroma/web/salmon/salmon.ex

(limited to 'lib')

diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
new file mode 100644
index 000000000..7f1c63a5f
--- /dev/null
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -0,0 +1,48 @@
+defmodule Pleroma.Web.Salmon do
+  use Bitwise
+
+  def decode_and_validate(magickey, salmon) do
+    {doc, _rest} = :xmerl_scan.string(to_charlist(salmon))
+
+    {:xmlObj, :string, data} = :xmerl_xpath.string('string(//me:data[1])', doc)
+    {:xmlObj, :string, sig} = :xmerl_xpath.string('string(//me:sig[1])', doc)
+    {:xmlObj, :string, alg} = :xmerl_xpath.string('string(//me:alg[1])', doc)
+    {:xmlObj, :string, encoding} = :xmerl_xpath.string('string(//me:encoding[1])', doc)
+    {:xmlObj, :string, type} = :xmerl_xpath.string('string(//me:data[1]/@type)', doc)
+
+
+    {:ok, data} = Base.url_decode64(to_string(data), ignore: :whitespace)
+    {:ok, sig} = Base.url_decode64(to_string(sig), ignore: :whitespace)
+    alg = to_string(alg)
+    encoding = to_string(encoding)
+    type = to_string(type)
+
+    signed_text = [data, type, encoding, alg]
+    |> Enum.map(&Base.url_encode64/1)
+    |> Enum.join(".")
+
+    key = decode_key(magickey)
+
+    verify = :public_key.verify(signed_text, :sha256, sig, key)
+
+    if verify do
+      {:ok, data}
+    else
+      :error
+    end
+  end
+
+  defp decode_key("RSA." <> magickey) do
+    make_integer = fn(bin) ->
+      list = :erlang.binary_to_list(bin)
+      Enum.reduce(list, 0, fn (el, acc) -> (acc <<< 8) ||| el end)
+    end
+
+    [modulus, exponent] = magickey
+    |> String.split(".")
+    |> Enum.map(&Base.url_decode64!/1)
+    |> Enum.map(make_integer)
+
+    {:RSAPublicKey, modulus, exponent}
+  end
+end
-- 
cgit v1.2.3


From 7424310e148a5763776b2c5eb5129b54ec770afe Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 23 Apr 2017 16:35:17 +0200
Subject: Basic key fetching.

---
 lib/pleroma/web/salmon/salmon.ex | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index 7f1c63a5f..3881f2758 100644
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -1,7 +1,7 @@
 defmodule Pleroma.Web.Salmon do
   use Bitwise
 
-  def decode_and_validate(magickey, salmon) do
+  def decode(salmon) do
     {doc, _rest} = :xmerl_scan.string(to_charlist(salmon))
 
     {:xmlObj, :string, data} = :xmerl_xpath.string('string(//me:data[1])', doc)
@@ -17,6 +17,31 @@ defmodule Pleroma.Web.Salmon do
     encoding = to_string(encoding)
     type = to_string(type)
 
+    [data, type, encoding, alg, sig]
+  end
+
+  def fetch_magic_key(salmon) do
+    [data, _, _, _, _] = decode(salmon)
+    {doc, _rest} = :xmerl_scan.string(to_charlist(data))
+    {:xmlObj, :string, uri} = :xmerl_xpath.string('string(//author[1]/uri)', doc)
+
+    uri = to_string(uri)
+    base = URI.parse(uri).host
+
+    # TODO: Find out if this endpoint is mandated by the standard.
+    {:ok, response} = HTTPoison.get(base <> "/.well-known/webfinger", ["Accept": "application/xrd+xml"], [params: [resource: uri]])
+
+    {doc, _rest} = :xmerl_scan.string(to_charlist(response.body))
+
+    {:xmlObj, :string, magickey} = :xmerl_xpath.string('string(//Link[@rel="magic-public-key"]/@href)', doc)
+    "data:application/magic-public-key," <> magickey = to_string(magickey)
+
+    magickey
+  end
+
+  def decode_and_validate(magickey, salmon) do
+    [data, type, encoding, alg, sig] = decode(salmon)
+
     signed_text = [data, type, encoding, alg]
     |> Enum.map(&Base.url_encode64/1)
     |> Enum.join(".")
-- 
cgit v1.2.3