Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

[akkoma] / lib / pleroma / web / web_finger / web_finger.ex

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index da38f662c075315b4f3a34214f14eaa7c6716620..95e717b17859086c3e2dddb7a7561718161e8424 100644 (file)
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -44,7 +44,8 @@ defmodule Pleroma.Web.WebFinger do
         {:Link, %{rel: "http://schemas.google.com/g/2010#updates-from", type: "application/atom+xml", href: OStatus.feed_path(user)}},
         {:Link, %{rel: "http://webfinger.net/rel/profile-page", type: "text/html", href: user.ap_id}},
         {:Link, %{rel: "salmon", href: OStatus.salmon_path(user)}},
-        {:Link, %{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}}
+        {:Link, %{rel: "magic-public-key", href: "data:application/magic-public-key,#{magic_key}"}},
+        {:Link, %{rel: "http://ostatus.org/schema/1.0/subscribe", template: OStatus.remote_follow_path()}}
       ]
     }
     |> XmlBuilder.to_doc
@@ -62,22 +63,19 @@ defmodule Pleroma.Web.WebFinger do
     end
   end
 
-  # FIXME: Make this call the host-meta to find the actual address.
-  defp webfinger_address(domain) do
-    "//#{domain}/.well-known/webfinger"
-  end
-
   defp webfinger_from_xml(doc) do
     magic_key = XML.string_from_xpath(~s{//Link[@rel="magic-public-key"]/@href}, doc)
     "data:application/magic-public-key," <> magic_key = magic_key
     topic = XML.string_from_xpath(~s{//Link[@rel="http://schemas.google.com/g/2010#updates-from"]/@href}, doc)
     subject = XML.string_from_xpath("//Subject", doc)
     salmon = XML.string_from_xpath(~s{//Link[@rel="salmon"]/@href}, doc)
+    subscribe_address = XML.string_from_xpath(~s{//Link[@rel="http://ostatus.org/schema/1.0/subscribe"]/@template}, doc)
     data = %{
       "magic_key" => magic_key,
       "topic" => topic,
       "subject" => subject,
-      "salmon" => salmon
+      "salmon" => salmon,
+      "subscribe_address" => subscribe_address
     }
     {:ok, data}
   end
@@ -91,10 +89,15 @@ defmodule Pleroma.Web.WebFinger do
   end
 
   def find_lrdd_template(domain) do
-    with {:ok, %{status_code: status_code, body: body}} <- @httpoison.get("http://#{domain}/.well-known/host-meta", [], follow_redirect: true) do
+    with {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- @httpoison.get("http://#{domain}/.well-known/host-meta", [], follow_redirect: true) do
       get_template_from_xml(body)
     else
-      e -> {:error, "Can't find lrdd template: #{inspect(e)}"}
+      _ ->
+        with {:ok, %{body: body}} <- @httpoison.get("https://#{domain}/.well-known/host-meta", []) do
+          get_template_from_xml(body)
+        else
+          e -> {:error, "Can't find lrdd template: #{inspect(e)}"}
+        end
     end
   end
 
@@ -105,13 +108,10 @@ defmodule Pleroma.Web.WebFinger do
                URI.parse(account).host
              end
 
-    {:ok, template} = find_lrdd_template(domain)
-
-    address = String.replace(template, "{uri}", URI.encode(account))
-
-    response = @httpoison.get(address, ["Accept": "application/xrd+xml"])
-
-    with {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response,
+    with {:ok, template} <- find_lrdd_template(domain),
+         address <- String.replace(template, "{uri}", URI.encode(account)),
+         response <- @httpoison.get(address, ["Accept": "application/xrd+xml"]),
+         {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response,
          doc when doc != :error<- XML.parse_document(body),
          {:ok, data} <- webfinger_from_xml(doc) do
       {:ok, data}