X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fweb_finger%2Fweb_finger.ex;h=019210124584c0901359f91d46eaca6cf05e574b;hb=2fab3c44f5a8fd5c2729d10330dae377ab60abdc;hp=1eb26a89fd19d5b355ac996b4407afee41705b50;hpb=c48c381e909240dcece9f961e4728fa712d089cc;p=akkoma

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 1eb26a89f..019210124 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -1,4 +1,5 @@
 defmodule Pleroma.Web.WebFinger do
+  @httpoison Application.get_env(:pleroma, :httpoison)
 
   alias Pleroma.{Repo, User, XmlBuilder}
   alias Pleroma.Web
@@ -43,7 +44,9 @@ 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: "self", type: "application/activity+json", href: user.ap_id}},
+        {:Link, %{rel: "http://ostatus.org/schema/1.0/subscribe", template: OStatus.remote_follow_path()}}
       ]
     }
     |> XmlBuilder.to_doc
@@ -57,53 +60,70 @@ defmodule Pleroma.Web.WebFinger do
     else
       {:ok, pem} = Salmon.generate_rsa_pem
       info = Map.put(info, "keys", pem)
-      Repo.update(Ecto.Changeset.change(user, info: info))
+      Ecto.Changeset.change(user, info: info)
+      |> User.update_and_set_cache()
     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)
+    ap_id = XML.string_from_xpath(~s{//Link[@rel="self" and @type="application/activity+json"]/@href}, doc)
     data = %{
       "magic_key" => magic_key,
       "topic" => topic,
       "subject" => subject,
-      "salmon" => salmon
+      "salmon" => salmon,
+      "subscribe_address" => subscribe_address,
+      "ap_id" => ap_id
     }
     {:ok, data}
   end
 
-  def finger(account, getter \\ &HTTPoison.get/3) do
+  def get_template_from_xml(body) do
+    xpath = "//Link[@rel='lrdd' and @type='application/xrd+xml']/@template"
+    with doc when doc != :error <- XML.parse_document(body),
+      template when template != nil <- XML.string_from_xpath(xpath, doc) do
+      {:ok, template}
+    end
+  end
+
+  def find_lrdd_template(domain) 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
+      _ ->
+        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
+
+  def finger(account) do
+    account = String.trim_leading(account, "@")
     domain = with [_name, domain] <- String.split(account, "@") do
                domain
              else _e ->
                URI.parse(account).host
              end
-    address = webfinger_address(domain)
-
-    # try https first
-    response = with {:ok, result} <- getter.("https:" <> address, ["Accept": "application/xrd+xml"], [params: [resource: account]]) do
-                 {:ok, result}
-               else _ ->
-                 getter.("http:" <> address, ["Accept": "application/xrd+xml"], [params: [resource: account], follow_redirect: true])
-               end
 
-    with {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response,
-         doc <- XML.parse_document(body),
+    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}
     else
       e ->
-        Logger.debug("Couldn't finger #{account}.")
-        Logger.debug(inspect(e))
+        Logger.debug(fn -> "Couldn't finger #{account}" end)
+        Logger.debug(fn -> inspect(e) end)
         {:error, e}
     end
   end